summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--scard.c3
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c41b167b2..0cf72829b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
120010928
2 - (djm) OpenBSD CVS sync:
3 - djm@cvs.openbsd.org 2001/09/28 09:49:31
4 [scard.c]
5 Fix segv when smartcard communication error occurs during key load.
6 ok markus@
7
120010927 820010927
2 - (stevesk) session.c: declare do_pre_login() before use 9 - (stevesk) session.c: declare do_pre_login() before use
3 wayned@users.sourceforge.net 10 wayned@users.sourceforge.net
@@ -6573,4 +6580,4 @@
6573 - Wrote replacements for strlcpy and mkdtemp 6580 - Wrote replacements for strlcpy and mkdtemp
6574 - Released 1.0pre1 6581 - Released 1.0pre1
6575 6582
6576$Id: ChangeLog,v 1.1564 2001/09/27 19:50:26 stevesk Exp $ 6583$Id: ChangeLog,v 1.1565 2001/09/28 09:51:54 djm Exp $
diff --git a/scard.c b/scard.c
index f67f7e7ef..251e5d30a 100644
--- a/scard.c
+++ b/scard.c
@@ -24,7 +24,7 @@
24 24
25#include "includes.h" 25#include "includes.h"
26#ifdef SMARTCARD 26#ifdef SMARTCARD
27RCSID("$OpenBSD: scard.c,v 1.14 2001/09/17 20:22:14 markus Exp $"); 27RCSID("$OpenBSD: scard.c,v 1.15 2001/09/28 09:49:31 djm Exp $");
28 28
29#include <openssl/engine.h> 29#include <openssl/engine.h>
30#include <sectok.h> 30#include <sectok.h>
@@ -123,6 +123,7 @@ sc_read_pubkey(Key * k)
123 int len, sw, status = -1; 123 int len, sw, status = -1;
124 124
125 len = sw = 0; 125 len = sw = 0;
126 n = NULL;
126 127
127 if (sc_fd < 0) { 128 if (sc_fd < 0) {
128 status = sc_init(); 129 status = sc_init();