]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Don't disable -lcrypto if all hashes are provided by libc
authorJoerg Sonnenberger <joerg@bec.de>
Tue, 4 Sep 2018 13:50:17 +0000 (15:50 +0200)
committerGrzegorz Antoniak <ga@anadoxin.org>
Sat, 8 Sep 2018 05:22:39 +0000 (07:22 +0200)
Since libarchive contains AES support nowadays, libcrypto will be needed
even if all hashes are provided otherwise.

configure.ac

index 0820717f12b7ebe75960a55df5b0469720d46d5e..17d6641888bf2cfa70554db6cc137a8506611dfa 100644 (file)
@@ -1153,12 +1153,7 @@ if test "x$with_openssl" != "xno"; then
     CRYPTO_CHECK(SHA256, OPENSSL, sha256)
     CRYPTO_CHECK(SHA384, OPENSSL, sha384)
     CRYPTO_CHECK(SHA512, OPENSSL, sha512)
-    if test "x$found_OPENSSL" != "xyes"; then
-      LIBS=$saved_LIBS
-    else
-      AC_CHECK_FUNCS([PKCS5_PBKDF2_HMAC_SHA1])
-    fi
-    AC_CHECK_LIB(crypto,EVP_CIPHER_CTX_init)
+    AC_CHECK_FUNCS([PKCS5_PBKDF2_HMAC_SHA1])
 fi
 
 # Probe libmd AFTER OpenSSL/libcrypto.