From f3512d9ba7e7ee92493cf394610c2ca047a0f637 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sat, 14 Jul 2001 12:14:27 +1000 Subject: [PATCH] - OpenBSD CVS Sync - markus@cvs.openbsd.org 2001/07/04 23:49:27 [ssh-agent.c] handle mutiple adds of the same smartcard key --- ChangeLog | 5 ++++- ssh-agent.c | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index bd9d59726..40bcff435 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,9 @@ - markus@cvs.openbsd.org 2001/07/04 23:39:07 [ssh-agent.c] for smartcards remove both RSA1/2 keys + - markus@cvs.openbsd.org 2001/07/04 23:49:27 + [ssh-agent.c] + handle mutiple adds of the same smartcard key 20010711 - (djm) dirname(3) may modify its argument on glibc and other systems. @@ -5988,4 +5991,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1389 2001/07/14 02:13:49 djm Exp $ +$Id: ChangeLog,v 1.1390 2001/07/14 02:14:27 djm Exp $ diff --git a/ssh-agent.c b/ssh-agent.c index 044710a43..47cc265c2 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 @@ -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 #include @@ -464,6 +464,7 @@ process_add_smartcard_key (SocketEntry *e) 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 @@ process_add_smartcard_key (SocketEntry *e) 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)