From 8d6017566c99387fa52d6f5a09af2be5407acf29 Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Sat, 6 Apr 2002 18:19:38 +0000 Subject: [PATCH] =?UTF-8?q?=20-=20(bal)=20Slight=20update=20to=20OpenSC=20?= =?UTF-8?q?support.=20=20Better=20version=20checking.=20patch=20=20=20=20b?= =?UTF-8?q?y=20Juha=20Yrj=C3=B6l=C3=A4=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ChangeLog | 5 +++-- scard-opensc.c | 2 +- 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 @@ [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ä 20020405 - (bal) Patch for OpenSC SmartCard library; ok markus@; patch by @@ -8178,4 +8179,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.2028 2002/04/06 04:16:45 mouring Exp $ +$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 @@ #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