tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- OpenBSD CVS Sync 

- markus@cvs.openbsd.org 2001/07/04 23:49:27
     [ssh-agent.c]
     handle mutiple adds of the same smartcard key
This commit is contained in:
Damien Miller 2001-07-14 12:14:27 +10:00
parent 8d4bf17036
commit f3512d9ba7
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -13,6 +13,9 @@
- markus@cvs.openbsd.org 2001/07/04 23:39:07 - markus@cvs.openbsd.org 2001/07/04 23:39:07
[ssh-agent.c] [ssh-agent.c]
for smartcards remove both RSA1/2 keys 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 20010711
- (djm) dirname(3) may modify its argument on glibc and other systems. - (djm) dirname(3) may modify its argument on glibc and other systems.
@ -5988,4 +5991,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - 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 $

6
ssh-agent.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -36,7 +36,7 @@
*/ */
#include "includes.h" #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/evp.h>
#include <openssl/md5.h> #include <openssl/md5.h>
@ -464,6 +464,7 @@ process_add_smartcard_key (SocketEntry *e)
success = 1; success = 1;
tab = idtab_lookup(1); tab = idtab_lookup(1);
k->type = KEY_RSA1;
if (lookup_private_key(k, NULL, 1) == NULL) { if (lookup_private_key(k, NULL, 1) == NULL) {
if (tab->nentries == 0) if (tab->nentries == 0)
tab->identities = xmalloc(sizeof(Identity)); tab->identities = xmalloc(sizeof(Identity));
@ -479,6 +480,7 @@ process_add_smartcard_key (SocketEntry *e)
xstrdup("rsa1 smartcard"); xstrdup("rsa1 smartcard");
tab->nentries++; tab->nentries++;
} }
k->type = KEY_RSA;
tab = idtab_lookup(2); tab = idtab_lookup(2);
if (lookup_private_key(k, NULL, 2) == NULL) { if (lookup_private_key(k, NULL, 2) == NULL) {
if (tab->nentries == 0) if (tab->nentries == 0)