diff options
Diffstat (limited to 'ssh-agent.c')
-rw-r--r-- | ssh-agent.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/ssh-agent.c b/ssh-agent.c index 46a1199b1..1df3ccd11 100644 --- a/ssh-agent.c +++ b/ssh-agent.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-agent.c,v 1.68 2001/07/20 14:46:11 markus Exp $ */ | 1 | /* $OpenBSD: ssh-agent.c,v 1.69 2001/08/01 22:03:33 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -36,7 +36,7 @@ | |||
36 | */ | 36 | */ |
37 | 37 | ||
38 | #include "includes.h" | 38 | #include "includes.h" |
39 | RCSID("$OpenBSD: ssh-agent.c,v 1.68 2001/07/20 14:46:11 markus Exp $"); | 39 | RCSID("$OpenBSD: ssh-agent.c,v 1.69 2001/08/01 22:03:33 markus Exp $"); |
40 | 40 | ||
41 | #include <openssl/evp.h> | 41 | #include <openssl/evp.h> |
42 | #include <openssl/md5.h> | 42 | #include <openssl/md5.h> |
@@ -451,12 +451,13 @@ process_add_smartcard_key (SocketEntry *e) | |||
451 | { | 451 | { |
452 | Idtab *tab; | 452 | Idtab *tab; |
453 | Key *n = NULL, *k = NULL; | 453 | Key *n = NULL, *k = NULL; |
454 | char *sc_reader_id = NULL; | ||
454 | int success = 0; | 455 | int success = 0; |
455 | int sc_reader_num = 0; | ||
456 | 456 | ||
457 | sc_reader_num = buffer_get_int(&e->input); | 457 | sc_reader_id = buffer_get_string(&e->input, NULL); |
458 | k = sc_get_key(sc_reader_id); | ||
459 | xfree(sc_reader_id); | ||
458 | 460 | ||
459 | k = sc_get_key(sc_reader_num); | ||
460 | if (k == NULL) { | 461 | if (k == NULL) { |
461 | error("sc_get_pubkey failed"); | 462 | error("sc_get_pubkey failed"); |
462 | goto send; | 463 | goto send; |
@@ -510,11 +511,13 @@ process_remove_smartcard_key(SocketEntry *e) | |||
510 | Key *k = NULL, *private; | 511 | Key *k = NULL, *private; |
511 | int idx; | 512 | int idx; |
512 | int success = 0; | 513 | int success = 0; |
513 | int sc_reader_num = 0; | 514 | char *sc_reader_id = NULL; |
514 | 515 | ||
515 | sc_reader_num = buffer_get_int(&e->input); | 516 | sc_reader_id = buffer_get_string(&e->input, NULL); |
517 | k = sc_get_key(sc_reader_id); | ||
518 | xfree(sc_reader_id); | ||
516 | 519 | ||
517 | if ((k = sc_get_key(sc_reader_num)) == NULL) { | 520 | if (k == NULL) { |
518 | error("sc_get_pubkey failed"); | 521 | error("sc_get_pubkey failed"); |
519 | } else { | 522 | } else { |
520 | k->type = KEY_RSA1; | 523 | k->type = KEY_RSA1; |