- (bal) Slight update to OpenSC support. Better version checking. patch

   by Juha Yrjölä <jyrjola@cc.hut.fi>

diff --git a/ChangeLog b/ChangeLog
index 4c337d90895d89f8b0ea5eba8ed43f50b3a20a2c..e1470da0ead57c92e4f9f5279b50863e12386467 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,7 +7,8 @@
      [sftp-client.c]
      Fix occasional corruption on upload due to bad reuse of request id, spotted
      by chombier@mac.com; ok markus@
-
+ - (bal) Slight update to OpenSC support.  Better version checking. patch
+   by Juha Yrjölä <jyrjola@cc.hut.fi> 
 
 20020405
  - (bal) Patch for OpenSC SmartCard library; ok markus@; patch by

diff --git a/scard-opensc.c b/scard-opensc.c
index 2a18bebd671a76ab867b7701d9246ac24021d0cd..ff59b29c49d15afcebe49c9144fc5183a7174618 100644 (file)
--- a/scard-opensc.c
+++ b/scard-opensc.c
@@ -38,7 +38,7 @@
 #include "readpass.h"
 #include "scard.h"
 
-#if OPENSSL_VERSION_NUMBER >= 0x00907000L
+#if OPENSSL_VERSION_NUMBER < 0x00907000L && defined(CRYPTO_LOCK_ENGINE)
 #define USE_ENGINE
 #define RSA_get_default_method RSA_get_default_openssl_method
 #else