Use OPENSSL_VERSION_NUMBER for version detection.

bareos · Nov 1, 2013 · c16e47f · c16e47f
1 parent 2735a59
commit c16e47f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/autoconf/configure.in b/autoconf/configure.in
@@ -1100,7 +1100,6 @@ if test "x$support_crypto" != "xno" -o "x$support_tls" != "xno"; then
 
       if test "$have_openssl" = "yes"; then
          AC_DEFINE(HAVE_OPENSSL, 1, [Define to 1 if OpenSSL library is available])
-         AC_CHECK_LIB(crypto, EVP_PKEY_encrypt_old, AC_DEFINE(HAVE_OPENSSLv1, 1, [Set if have OpenSSL version 1.x]))
       fi
 
       if test "$support_crypto" != "no" -a "$have_openssl" = "yes"; then

diff --git a/src/lib/crypto_openssl.c b/src/lib/crypto_openssl.c
@@ -46,7 +46,7 @@
 /*
  * For OpenSSL version 1.x, EVP_PKEY_encrypt no longer exists. It was not an official API.
  */
-#ifdef HAVE_OPENSSLv1
+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
 #define EVP_PKEY_encrypt EVP_PKEY_encrypt_old
 #define EVP_PKEY_decrypt EVP_PKEY_decrypt_old
 #endif

diff --git a/src/lib/tls_openssl.c b/src/lib/tls_openssl.c
@@ -385,7 +385,7 @@ bool tls_postconnect_verify_host(JCR *jcr, TLS_CONNECTION *tls, const char *host
          extname = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext)));
 
          if (bstrcmp(extname, "subjectAltName")) {
-#ifdef HAVE_OPENSSLv1
+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
             const X509V3_EXT_METHOD *method;
 #else
             X509V3_EXT_METHOD *method;