- (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@
diff --git a/ChangeLog b/ChangeLog
index c41b167..0cf7282 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@
+
20010927
- (stevesk) session.c: declare do_pre_login() before use
wayned@users.sourceforge.net
@@ -6573,4 +6580,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1564 2001/09/27 19:50:26 stevesk Exp $
+$Id: ChangeLog,v 1.1565 2001/09/28 09:51:54 djm Exp $
diff --git a/scard.c b/scard.c
index f67f7e7..251e5d3 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 @@
int len, sw, status = -1;
len = sw = 0;
+ n = NULL;
if (sc_fd < 0) {
status = sc_init();