commit f3512d9ba7e7ee92493cf394610c2ca047a0f637
author Damien Miller <djm@mindrot.org> Sat Jul 14 12:14:27 2001 +1000
committer Damien Miller <djm@mindrot.org> Sat Jul 14 12:14:27 2001 +1000
tree 0c7d12ca7e90784963b320e1d16e226a0ab5f2e3
parent 8d4bf17036562678cb54653c3167d95f68ac9f09

 - OpenBSD CVS Sync
   - markus@cvs.openbsd.org 2001/07/04 23:49:27
     [ssh-agent.c]
     handle mutiple adds of the same smartcard key

ssh-agent.c

diff --git a/ssh-agent.c b/ssh-agent.c
index 044710a..47cc265 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ssh-agent.c,v 1.63 2001/07/04 23:39:07 markus Exp $	*/
+/*	$OpenBSD: ssh-agent.c,v 1.64 2001/07/04 23:49:27 markus Exp $	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -36,7 +36,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-agent.c,v 1.63 2001/07/04 23:39:07 markus Exp $");
+RCSID("$OpenBSD: ssh-agent.c,v 1.64 2001/07/04 23:49:27 markus Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/md5.h>
@@ -464,6 +464,7 @@
 	success = 1;
 
 	tab = idtab_lookup(1);
+	k->type = KEY_RSA1;
 	if (lookup_private_key(k, NULL, 1) == NULL) {
 		if (tab->nentries == 0)
 			tab->identities = xmalloc(sizeof(Identity));
@@ -479,6 +480,7 @@
 		    xstrdup("rsa1 smartcard");
 		tab->nentries++;
 	}
+	k->type = KEY_RSA;
 	tab = idtab_lookup(2);
 	if (lookup_private_key(k, NULL, 2) == NULL) {
 		if (tab->nentries == 0)