- (djm) Bug #461: ssh-copy-id fails with no arguments. Patch from

[openssh.git] / scard-opensc.c

diff --git a/scard-opensc.c b/scard-opensc.c
index 2a18bebd671a76ab867b7701d9246ac24021d0cd..dd21de39ab296ed4b3a3a969f6b74352fb63349e 100644 (file)
--- a/scard-opensc.c
+++ b/scard-opensc.c
@@ -29,8 +29,8 @@
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 
-#include <opensc.h>
-#include <opensc-pkcs15.h>
+#include <opensc/opensc.h>
+#include <opensc/pkcs15.h>
 
 #include "key.h"
 #include "log.h"
@@ -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
@@ -173,7 +173,7 @@ sc_private_decrypt(int flen, u_char *from, u_char *to, RSA *rsa,
        r = sc_prkey_op_init(rsa, &key_obj);
        if (r)
                return -1;
-       r = sc_pkcs15_decipher(p15card, key_obj, from, flen, to, flen);
+       r = sc_pkcs15_decipher(p15card, key_obj, 0, from, flen, to, flen);
        sc_unlock(card);
        if (r < 0) {
                error("sc_pkcs15_decipher() failed: %s", sc_strerror(r));