summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2001-09-28 19:53:07 +1000
committerDamien Miller <djm@mindrot.org>2001-09-28 19:53:07 +1000
commit4577765cd4f9dc08f7beb15d5854fdf60ba20f2c (patch)
tree60122230eb929dc5cd27e89d8979b0497b278d17
parentd6a9433ef429c029fc8cb069f53f95c292f7ab6e (diff)
- (djm) OpenBSD CVS sync:
- djm@cvs.openbsd.org 2001/09/28 09:49:31 [scard.c] Fix segv when smartcard communication error occurs during key load. ok markus@
-rw-r--r--ChangeLog9
-rw-r--r--scard.c3
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 09b9f73c..1e029612 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+20010928
+ - (djm) OpenBSD CVS sync:
+ - djm@cvs.openbsd.org 2001/09/28 09:49:31
+ [scard.c]
+ Fix segv when smartcard communication error occurs during key load.
+ ok markus@
+
20010926
- (djm) Disable AC_SYS_LARGEFILE, it breaks on several systems
@@ -6572,4 +6579,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1559.2.3 2001/09/25 22:39:36 djm Exp $
+$Id: ChangeLog,v 1.1559.2.4 2001/09/28 09:53:07 djm Exp $
diff --git a/scard.c b/scard.c
index f67f7e7e..251e5d30 100644
--- a/scard.c
+++ b/scard.c
@@ -24,7 +24,7 @@
#include "includes.h"
#ifdef SMARTCARD
-RCSID("$OpenBSD: scard.c,v 1.14 2001/09/17 20:22:14 markus Exp $");
+RCSID("$OpenBSD: scard.c,v 1.15 2001/09/28 09:49:31 djm Exp $");
#include <openssl/engine.h>
#include <sectok.h>
@@ -123,6 +123,7 @@ sc_read_pubkey(Key * k)
int len, sw, status = -1;
len = sw = 0;
+ n = NULL;
if (sc_fd < 0) {
status = sc_init();