#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"
#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
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));