RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (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@
This commit is contained in:
Damien Miller 2001-09-28 19:51:54 +10:00
parent a0957d6898
commit 3ff36d6ce2
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -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 20010927
- (stevesk) session.c: declare do_pre_login() before use - (stevesk) session.c: declare do_pre_login() before use
wayned@users.sourceforge.net wayned@users.sourceforge.net
@ -6573,4 +6580,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - 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 $

3
scard.c
View File

@ -24,7 +24,7 @@
#include "includes.h" #include "includes.h"
#ifdef SMARTCARD #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 <openssl/engine.h>
#include <sectok.h> #include <sectok.h>
@ -123,6 +123,7 @@ sc_read_pubkey(Key * k)
int len, sw, status = -1; int len, sw, status = -1;
len = sw = 0; len = sw = 0;
n = NULL;
if (sc_fd < 0) { if (sc_fd < 0) {
status = sc_init(); status = sc_init();