Mercurial > hg > orthanc

diff Core/Pkcs11.cpp @ 3723:cc6d4edfe8fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix pkcs11 compilation
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 05 Mar 2020 21:13:37 +0100
parents 94f4a18a79cc
children
line wrap: on
line diff
--- a/Core/Pkcs11.cpp	Thu Mar 05 19:48:19 2020 +0100
+++ b/Core/Pkcs11.cpp	Thu Mar 05 21:13:37 2020 +0100
@@ -213,10 +213,11 @@
           !ENGINE_set_load_privkey_function(engine, EngineLoadPrivateKey) ||
 
           !ENGINE_set_RSA(engine, PKCS11_get_rsa_method()) ||
+
+#if OPENSSL_VERSION_NUMBER < 0x10100000L // OpenSSL 1.0.2
           !ENGINE_set_ECDSA(engine, PKCS11_get_ecdsa_method()) ||
           !ENGINE_set_ECDH(engine, PKCS11_get_ecdh_method()) ||
-
-#if OPENSSL_VERSION_NUMBER  >= 0x10100002L
+#else
           !ENGINE_set_EC(engine, PKCS11_get_ec_key_method()) ||
 #endif