Attachment 440 Details for Bug 684 – patch to remove duplicate identity file keys

[patch] patch to remove duplicate identity file keys

dup-key.patch (text/plain), 1019 bytes, created by Mike Delaney on 2003-09-20 22:15:03 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Mike Delaney

Created: 2003-09-20 22:15:03 AEST

Size: 1019 bytes

patch

obsolete

>--- sshconnect2.c.orig	2003-09-20 01:45:43.000000000 -0700
>+++ sshconnect2.c	2003-09-20 05:18:35.000000000 -0700
>@@ -990,7 +990,7 @@
> 	Key *key;
> 	AuthenticationConnection *ac;
> 	char *comment;
>-	int i, found;
>+	int i, j, found;
> 
> 	TAILQ_INIT(&agent);	/* keys from the agent */
> 	TAILQ_INIT(&files);	/* keys from the config file */
>@@ -1003,6 +1003,23 @@
> 		if (key && key->type == KEY_RSA1)
> 			continue;
> 		options.identity_keys[i] = NULL;
>+
>+		/* Duplicate keys here can cause problems in 
>+		 * input_userauth_pk_ok() if the key is also 
>+		 * in the agent.  
>+		 */
>+		for (j = 0; j < options.num_identity_files; j++) {
>+			if(key && key_equal(key, options.identity_keys[j])) {
>+				debug2("key %s (%p) duplicate of %s (%p). Cleared.",
>+					options.identity_files[j],
>+					options.identity_keys[j],
>+					options.identity_files[i], key);
>+
>+				key_free(options.identity_keys[j]);
>+				options.identity_keys[j] = NULL;
>+			}
>+		}
>+
> 		id = xmalloc(sizeof(*id));
> 		memset(id, 0, sizeof(*id));
> 		id->key = key;

Actions: View | Diff

Attachments on bug 684: 440 | 441