[build] fix openssl version detection when not using pkg-config

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>

diff --git a/configure.ac b/configure.ac
index a8135114e09fdd12de7848076051d8338b584f4a..561a0d49c1045c704ccb42927f2ebf6d78e8b4d1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -122,19 +122,13 @@ AC_ARG_ENABLE([crypto-all],
        [ enable_crypto_all="yes" ])
 
 KNET_OPTION_DEFINES([nss],[crypto],[PKG_CHECK_MODULES([nss], [nss])])
-KNET_OPTION_DEFINES([openssl],[crypto],[
-       PKG_CHECK_MODULES([openssl],[libcrypto < 1.1],
-                         [AC_DEFINE_UNQUOTED([BUILDCRYPTOOPENSSL10], [1], [openssl 1.0 crypto])],
-                         [PKG_CHECK_MODULES([openssl],[libcrypto >= 1.1],
-                                            [AC_DEFINE_UNQUOTED([BUILDCRYPTOOPENSSL11], [1], [openssl 1.1 crypto])])])
-])
+KNET_OPTION_DEFINES([openssl],[crypto],[PKG_CHECK_MODULES([openssl],[libcrypto])])
 
 AC_ARG_ENABLE([compress-all],
        [AS_HELP_STRING([--disable-compress-all],[disable libknet all compress modules support])],,
        [ enable_compress_all="yes" ])
 
 KNET_OPTION_DEFINES([zstd],[compress],[PKG_CHECK_MODULES([libzstd], [libzstd])])
-
 KNET_OPTION_DEFINES([zlib],[compress],[PKG_CHECK_MODULES([zlib], [zlib])])
 KNET_OPTION_DEFINES([lz4],[compress],[PKG_CHECK_MODULES([liblz4], [liblz4])])
 KNET_OPTION_DEFINES([lzo2],[compress],[

diff --git a/libknet/crypto_openssl.c b/libknet/crypto_openssl.c
index 65714984c355c501a03dcca850b1f2dc358976ca..6df4a331c1758372b15b2230b19c076ff35ad1a1 100644 (file)
--- a/libknet/crypto_openssl.c
+++ b/libknet/crypto_openssl.c
@@ -50,7 +50,7 @@ static int openssl_is_init = 0;
  * crypt/decrypt functions openssl1.0
  */
 
-#ifdef BUILDCRYPTOOPENSSL10
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
 static int encrypt_openssl(
        knet_handle_t knet_h,
        const struct iovec *iov,
@@ -150,9 +150,7 @@ out:
        EVP_CIPHER_CTX_cleanup(&ctx);
        return err;
 }
-#endif
-
-#ifdef BUILDCRYPTOOPENSSL11
+#else /* (OPENSSL_VERSION_NUMBER < 0x10100000L) */
 static int encrypt_openssl(
        knet_handle_t knet_h,
        const struct iovec *iov,
@@ -386,7 +384,7 @@ static int opensslcrypto_authenticate_and_decrypt (
        return 0;
 }
 
-#ifdef BUILDCRYPTOOPENSSL10
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
 static pthread_mutex_t *openssl_internal_lock;
 
 static void openssl_internal_locking_callback(int mode, int type, char *file, int line)
@@ -476,7 +474,7 @@ static void opensslcrypto_fini(
                crypto_instance->model_instance = NULL;
        }
 
-#ifdef BUILDCRYPTOOPENSSL10
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
        ERR_free_strings();
 #endif
 
@@ -497,7 +495,7 @@ static int opensslcrypto_init(
                  knet_handle_crypto_cfg->crypto_hash_type);
 
        if (!openssl_is_init) {
-#ifdef BUILDCRYPTOOPENSSL10
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
                ERR_load_crypto_strings();
                OPENSSL_add_all_algorithms_noconf();
                if (openssl_internal_lock_setup() < 0) {
@@ -505,8 +503,7 @@ static int opensslcrypto_init(
                        errno = EAGAIN;
                        return -1;
                }
-#endif
-#ifdef BUILDCRYPTOOPENSSL11
+#else
                if (!OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
                                         | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)) {
                        log_err(knet_h, KNET_SUB_OPENSSLCRYPTO, "Unable to init openssl");