diff options
| author |   rees <rees@openbsd.org> | 2002-03-21 18:08:15 +0000 |
|---|---|---|
| committer | rees <rees@openbsd.org> | 2002-03-21 18:08:15 +0000 |
| commit | ce5c4ec1ef7af77e0d811aebcd320ec2c93ae4f3 (patch) | |
| tree | 5adf32e07ff1450e7a4e8f4cbb44fb60ccc2d303 | |
| parent | getopt returns -1, not EOF. (diff) | |
| download | wireguard-openbsd-ce5c4ec1ef7af77e0d811aebcd320ec2c93ae4f3.tar.xz wireguard-openbsd-ce5c4ec1ef7af77e0d811aebcd320ec2c93ae4f3.zip | |
In sc_put_key(), sc_reader_id should be id.
| -rw-r--r-- | usr.bin/ssh/scard.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.bin/ssh/scard.c b/usr.bin/ssh/scard.c index 28b262580ec..28e95a81d6a 100644 --- a/usr.bin/ssh/scard.c +++ b/usr.bin/ssh/scard.c @@ -24,7 +24,7 @@ #ifdef SMARTCARD #include "includes.h" -RCSID("$OpenBSD: scard.c,v 1.20 2002/03/21 16:57:15 markus Exp $"); +RCSID("$OpenBSD: scard.c,v 1.21 2002/03/21 18:08:15 rees Exp $"); #include <openssl/engine.h> #include <openssl/evp.h> @@ -414,14 +414,13 @@ sc_put_key(Key *prv, const char *id) COPY_RSA_KEY(dmp1, 4); COPY_RSA_KEY(n, 5); len = BN_num_bytes(prv->rsa->n); - fd = sectok_friendly_open(sc_reader_id, STONOWAIT, &sw); + fd = sectok_friendly_open(id, STONOWAIT, &sw); if (fd < 0) { error("sectok_open failed: %s", sectok_get_sw(sw)); goto done; } if (! sectok_cardpresent(fd)) { - error("smartcard in reader %s not present", - sc_reader_id); + error("smartcard in reader %s not present", id); goto done; } ret = sectok_reset(fd, 0, NULL, &sw); |