summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--scard-opensc.c2
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ad22e4485..8264489bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,7 +7,8 @@
7 [sftp-client.c] 7 [sftp-client.c]
8 Fix occasional corruption on upload due to bad reuse of request id, spotted 8 Fix occasional corruption on upload due to bad reuse of request id, spotted
9 by chombier@mac.com; ok markus@ 9 by chombier@mac.com; ok markus@
10 10 - (bal) Slight update to OpenSC support. Better version checking. patch
11 by Juha Yrjölä <jyrjola@cc.hut.fi>
11 12
1220020405 1320020405
13 - (bal) Patch for OpenSC SmartCard library; ok markus@; patch by 14 - (bal) Patch for OpenSC SmartCard library; ok markus@; patch by
@@ -8178,4 +8179,4 @@
8178 - Wrote replacements for strlcpy and mkdtemp 8179 - Wrote replacements for strlcpy and mkdtemp
8179 - Released 1.0pre1 8180 - Released 1.0pre1
8180 8181
8181$Id: ChangeLog,v 1.2028 2002/04/06 04:16:45 mouring Exp $ 8182$Id: ChangeLog,v 1.2029 2002/04/06 18:19:38 mouring Exp $
diff --git a/scard-opensc.c b/scard-opensc.c
index 2a18bebd6..ff59b29c4 100644
--- a/scard-opensc.c
+++ b/scard-opensc.c
@@ -38,7 +38,7 @@
38#include "readpass.h" 38#include "readpass.h"
39#include "scard.h" 39#include "scard.h"
40 40
41#if OPENSSL_VERSION_NUMBER >= 0x00907000L 41#if OPENSSL_VERSION_NUMBER < 0x00907000L && defined(CRYPTO_LOCK_ENGINE)
42#define USE_ENGINE 42#define USE_ENGINE
43#define RSA_get_default_method RSA_get_default_openssl_method 43#define RSA_get_default_method RSA_get_default_openssl_method
44#else 44#else