diff options
author | Colin Watson <cjwatson@debian.org> | 2005-01-04 13:07:27 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-01-04 13:07:27 +0000 |
commit | fd0f611b70a83d80fe8793af785542ee5541b7cd (patch) | |
tree | bededd22bb7eeec52e20083237ab7e4113445a16 /scard.c | |
parent | c44fe9a5b9d3db96a7249b04d915f17e4a3a3b04 (diff) | |
parent | ebd2ce335af5861020c79fddb1ae35c03bf036cf (diff) |
Merge 3.9p1 to the trunk.
Diffstat (limited to 'scard.c')
-rw-r--r-- | scard.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -24,7 +24,7 @@ | |||
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | #if defined(SMARTCARD) && defined(USE_SECTOK) | 26 | #if defined(SMARTCARD) && defined(USE_SECTOK) |
27 | RCSID("$OpenBSD: scard.c,v 1.28 2003/06/12 19:12:02 markus Exp $"); | 27 | RCSID("$OpenBSD: scard.c,v 1.29 2004/05/08 00:21:31 djm Exp $"); |
28 | 28 | ||
29 | #include <openssl/evp.h> | 29 | #include <openssl/evp.h> |
30 | #include <sectok.h> | 30 | #include <sectok.h> |
@@ -32,7 +32,7 @@ RCSID("$OpenBSD: scard.c,v 1.28 2003/06/12 19:12:02 markus Exp $"); | |||
32 | #include "key.h" | 32 | #include "key.h" |
33 | #include "log.h" | 33 | #include "log.h" |
34 | #include "xmalloc.h" | 34 | #include "xmalloc.h" |
35 | #include "readpass.h" | 35 | #include "misc.h" |
36 | #include "scard.h" | 36 | #include "scard.h" |
37 | 37 | ||
38 | #if OPENSSL_VERSION_NUMBER < 0x00907000L | 38 | #if OPENSSL_VERSION_NUMBER < 0x00907000L |