diff options
| author | Ben Lindstrom <mouring@eviladmin.org> | 2001-08-06 21:35:51 +0000 |
|---|---|---|
| committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-08-06 21:35:51 +0000 |
| commit | f7db3bb64caf8d7822a18d6fd4c0480df7d0086d (patch) | |
| tree | 3167ed1f115185df591dc1c28c8aa33476194cbb /ssh-agent.c | |
| parent | 3ab1dfa2a654b6764eaa121f7111e94c35175894 (diff) | |
| download | openssh-git-f7db3bb64caf8d7822a18d6fd4c0480df7d0086d.tar.gz | |
- markus@cvs.openbsd.org 2001/08/01 22:03:33
[authfd.c authfd.h readconf.c readconf.h scard.c scard.h ssh-add.c
ssh-agent.c ssh.c]
use strings instead of ints for smartcard reader ids
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 46a1199b..1df3ccd1 100644 --- a/ssh-agent.c +++ b/ssh-agent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-agent.c,v 1.68 2001/07/20 14:46:11 markus Exp $ */ +/* $OpenBSD: ssh-agent.c,v 1.69 2001/08/01 22:03:33 markus Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -36,7 +36,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-agent.c,v 1.68 2001/07/20 14:46:11 markus Exp $"); +RCSID("$OpenBSD: ssh-agent.c,v 1.69 2001/08/01 22:03:33 markus Exp $"); #include <openssl/evp.h> #include <openssl/md5.h> @@ -451,12 +451,13 @@ process_add_smartcard_key (SocketEntry *e) { Idtab *tab; Key *n = NULL, *k = NULL; + char *sc_reader_id = NULL; int success = 0; - int sc_reader_num = 0; - sc_reader_num = buffer_get_int(&e->input); + sc_reader_id = buffer_get_string(&e->input, NULL); + k = sc_get_key(sc_reader_id); + xfree(sc_reader_id); - k = sc_get_key(sc_reader_num); if (k == NULL) { error("sc_get_pubkey failed"); goto send; @@ -510,11 +511,13 @@ process_remove_smartcard_key(SocketEntry *e) Key *k = NULL, *private; int idx; int success = 0; - int sc_reader_num = 0; + char *sc_reader_id = NULL; - sc_reader_num = buffer_get_int(&e->input); + sc_reader_id = buffer_get_string(&e->input, NULL); + k = sc_get_key(sc_reader_id); + xfree(sc_reader_id); - if ((k = sc_get_key(sc_reader_num)) == NULL) { + if (k == NULL) { error("sc_get_pubkey failed"); } else { k->type = KEY_RSA1; |