diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2001-07-04 23:39:08 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2001-07-04 23:39:08 +0000 |
| commit | 85e99694cb0848b55bd2e9dde19a75cd5ed4e404 (patch) | |
| tree | e6af33acea550899fbf595cf007a317bba39633f /usr.bin | |
| parent | 4288d39525bc135ea716f7d105a0dac8a6a961f3 (diff) | |
for smartcards remove both RSA1/2 keys
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/ssh-agent.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/ssh/ssh-agent.c b/usr.bin/ssh/ssh-agent.c index 7f3325f63e3..f0089899b51 100644 --- a/usr.bin/ssh/ssh-agent.c +++ b/usr.bin/ssh/ssh-agent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-agent.c,v 1.62 2001/07/04 23:13:10 markus Exp $ */ +/* $OpenBSD: ssh-agent.c,v 1.63 2001/07/04 23:39:07 markus Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -36,7 +36,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-agent.c,v 1.62 2001/07/04 23:13:10 markus Exp $"); +RCSID("$OpenBSD: ssh-agent.c,v 1.63 2001/07/04 23:39:07 markus Exp $"); #include <openssl/evp.h> #include <openssl/md5.h> @@ -511,6 +511,7 @@ process_remove_smartcard_key(SocketEntry *e) if ((k = sc_get_key(sc_reader_num)) == NULL) { error("sc_get_pubkey failed"); } else { + k->type = KEY_RSA1; private = lookup_private_key(k, &idx, 1); if (private != NULL) { Idtab *tab = idtab_lookup(1); @@ -521,6 +522,7 @@ process_remove_smartcard_key(SocketEntry *e) tab->nentries--; success = 1; } + k->type = KEY_RSA; private = lookup_private_key(k, &idx, 2); if (private != NULL) { Idtab *tab = idtab_lookup(2); @@ -532,7 +534,6 @@ process_remove_smartcard_key(SocketEntry *e) success = 1; } key_free(k); - sc_close(); } buffer_put_int(&e->output, 1); |