Attachment 326 Details for Bug 591 – changes to openbsd.

[patch] changes to openbsd.

X1 (text/plain), 2.17 KB, created by Markus Friedl on 2003-06-13 05:13:39 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Friedl

Created: 2003-06-13 05:13:39 AEST

Size: 2.17 KB

patch

obsolete

>Index: scard.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/scard.c,v
>retrieving revision 1.27
>retrieving revision 1.28
>diff -u -IOpenBSD -r1.27 -r1.28
>--- scard.c	8 Apr 2003 20:21:29 -0000	1.27
>+++ scard.c	12 Jun 2003 19:12:02 -0000	1.28
>@@ -554,4 +554,11 @@
> 		sectok_close(fd);
> 	return (status);
> }
>+
>+char *
>+sc_get_key_label(Key *key)
>+{
>+	return xstrdup("smartcard key");
>+}
>+
> #endif /* SMARTCARD */
>Index: scard.h
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/scard.h,v
>retrieving revision 1.11
>retrieving revision 1.12
>diff -u -IOpenBSD -r1.11 -r1.12
>--- scard.h	30 Jun 2002 21:59:45 -0000	1.11
>+++ scard.h	12 Jun 2003 19:12:03 -0000	1.12
>@@ -36,5 +36,6 @@
> Key	**sc_get_keys(const char *, const char *);
> void	 sc_close(void);
> int	 sc_put_key(Key *, const char *);
>+char	*sc_get_key_label(Key *);
> 
> #endif
>Index: ssh-agent.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/ssh-agent.c,v
>retrieving revision 1.110
>retrieving revision 1.111
>diff -u -IOpenBSD -r1.110 -r1.111
>--- ssh-agent.c	11 Jun 2003 11:18:38 -0000	1.110
>+++ ssh-agent.c	12 Jun 2003 19:12:03 -0000	1.111
>@@ -614,7 +614,7 @@
> 		if (lookup_identity(k, version) == NULL) {
> 			id = xmalloc(sizeof(Identity));
> 			id->key = k;
>-			id->comment = xstrdup("smartcard key");
>+			id->comment = sc_get_key_label(k);
> 			id->death = death;
> 			id->confirm = confirm;
> 			TAILQ_INSERT_TAIL(&tab->idlist, id, next);
>Index: ssh.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/ssh.c,v
>retrieving revision 1.193
>retrieving revision 1.194
>diff -u -IOpenBSD -r1.193 -r1.194
>--- ssh.c	15 May 2003 13:52:10 -0000	1.193
>+++ ssh.c	12 Jun 2003 19:12:03 -0000	1.194
>@@ -1160,7 +1160,7 @@
> 			    sizeof(Key *) * (SSH_MAX_IDENTITY_FILES - 1));
> 			options.num_identity_files++;
> 			options.identity_keys[0] = keys[i];
>-			options.identity_files[0] = xstrdup("smartcard key");;
>+			options.identity_files[0] = sc_get_key_label(keys[i]);
> 		}
> 		if (options.num_identity_files > SSH_MAX_IDENTITY_FILES)
> 			options.num_identity_files = SSH_MAX_IDENTITY_FILES;

Actions: View | Diff

Attachments on bug 591: 325 | 326 | 329 | 330