Skip to content

Commit

Permalink
Change required openssl version to be >= 1.0.1
Browse files Browse the repository at this point in the history
The previous requirement did not make sense.
On system that did not use pgk-config then the library happily linked
against version 1.0.1 as the required functions are present in that
version. If pkg-config was used then suddenly configure would fail with
version 1.0.1 due to the version check.
  • Loading branch information
pabuhler committed Feb 9, 2017
1 parent f9c148d commit 6c949b6
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ if test "$enable_openssl" = "yes"; then
[AC_MSG_RESULT([no])])

if test "x$PKG_CONFIG" != "x"; then
PKG_CHECK_MODULES([crypto], [libcrypto > 1.0.1],
PKG_CHECK_MODULES([crypto], [libcrypto >= 1.0.1],
[CFLAGS="$CFLAGS $crypto_CFLAGS"
LIBS="$crypto_LIBS $LIBS"])
else
Expand All @@ -236,11 +236,11 @@ if test "$enable_openssl" = "yes"; then
fi

AC_SEARCH_LIBS([EVP_EncryptInit], [crypto],
[], [AC_MSG_FAILURE([can't find openssl >1.0.1 crypto lib])])
[], [AC_MSG_FAILURE([can't find openssl >= 1.0.1 crypto lib])])
AC_SEARCH_LIBS([EVP_aes_128_ctr], [crypto],
[], [AC_MSG_FAILURE([can't find openssl >1.0.1 crypto lib])])
[], [AC_MSG_FAILURE([can't find openssl >= 1.0.1 crypto lib])])
AC_SEARCH_LIBS([EVP_aes_128_gcm], [crypto],
[], [AC_MSG_FAILURE([can't find openssl >1.0.1 crypto lib])])
[], [AC_MSG_FAILURE([can't find openssl >= 1.0.1 crypto lib])])

AC_DEFINE([OPENSSL], [1], [Define this to use OpenSSL crypto.])
AES_ICM_OBJS="crypto/cipher/aes_icm_ossl.o crypto/cipher/aes_gcm_ossl.o"
Expand Down

0 comments on commit 6c949b6

Please sign in to comment.