diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | scard.c | 3 |
2 files changed, 6 insertions, 2 deletions
@@ -84,6 +84,9 @@ | |||
84 | [sftp-int.c sftp-server.c] | 84 | [sftp-int.c sftp-server.c] |
85 | avoid paths beginning with "//"; <vinschen@redhat.com> | 85 | avoid paths beginning with "//"; <vinschen@redhat.com> |
86 | ok markus@ | 86 | ok markus@ |
87 | - jakob@cvs.openbsd.org 2001/07/31 12:53:34 | ||
88 | [scard.c] | ||
89 | close smartcard connection if card is missing | ||
87 | 90 | ||
88 | 20010803 | 91 | 20010803 |
89 | - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on | 92 | - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on |
@@ -6194,4 +6197,4 @@ | |||
6194 | - Wrote replacements for strlcpy and mkdtemp | 6197 | - Wrote replacements for strlcpy and mkdtemp |
6195 | - Released 1.0pre1 | 6198 | - Released 1.0pre1 |
6196 | 6199 | ||
6197 | $Id: ChangeLog,v 1.1447 2001/08/06 21:30:53 mouring Exp $ | 6200 | $Id: ChangeLog,v 1.1448 2001/08/06 21:33:44 mouring Exp $ |
@@ -24,7 +24,7 @@ | |||
24 | 24 | ||
25 | #ifdef SMARTCARD | 25 | #ifdef SMARTCARD |
26 | #include "includes.h" | 26 | #include "includes.h" |
27 | RCSID("$OpenBSD: scard.c,v 1.9 2001/07/31 08:41:10 jakob Exp $"); | 27 | RCSID("$OpenBSD: scard.c,v 1.10 2001/07/31 12:53:34 jakob Exp $"); |
28 | 28 | ||
29 | #include <openssl/engine.h> | 29 | #include <openssl/engine.h> |
30 | #include <sectok.h> | 30 | #include <sectok.h> |
@@ -64,6 +64,7 @@ sc_open(void) | |||
64 | if (! sectok_cardpresent(sc_fd)) { | 64 | if (! sectok_cardpresent(sc_fd)) { |
65 | debug("smartcard in reader %d not present, skipping", | 65 | debug("smartcard in reader %d not present, skipping", |
66 | sc_reader_num); | 66 | sc_reader_num); |
67 | sc_close(); | ||
67 | return SCARD_ERROR_NOCARD; | 68 | return SCARD_ERROR_NOCARD; |
68 | } | 69 | } |
69 | if (sectok_reset(sc_fd, 0, NULL, &sw) <= 0) { | 70 | if (sectok_reset(sc_fd, 0, NULL, &sw) <= 0) { |