diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2002-04-06 18:19:38 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2002-04-06 18:19:38 +0000 |
commit | 8d6017566c99387fa52d6f5a09af2be5407acf29 (patch) | |
tree | fa0d492a6efaf2f93e8d6d0f1354526b2fcbabf1 | |
parent | 06e9515eb898a335be246759b3059f2e7a4da698 (diff) |
- (bal) Slight update to OpenSC support. Better version checking. patch
by Juha Yrjölä <jyrjola@cc.hut.fi>
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | scard-opensc.c | 2 |
2 files changed, 4 insertions, 3 deletions
@@ -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 | ||
12 | 20020405 | 13 | 20020405 |
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 |