You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by rj...@apache.org on 2016/02/14 15:25:01 UTC
svn commit: r1730344 - /apr/apr/trunk/build/crypto.m4
Author: rjung
Date: Sun Feb 14 14:25:01 2016
New Revision: 1730344
URL: http://svn.apache.org/viewvc?rev=1730344&view=rev
Log:
r1728963 introduced the use of
EVP_CIPHER_CTX_new() and EVP_CIPHER_CTX_free()
in apr crypto. These OpenSSL functions have only
been added in 0.9.8b. Since apr trunk is expected
to have even higher OpenSSL version requirements
at GA time, check for the function during configure.
The removed check for BN_new was only there to
check for a working crypto lib. We didn't actually
use BN_new.
In apr-util 1.5.x where we still support 0.9.8
even before 0.9.8b, I added a definition for
EVP_CIPHER_CTX_new() and EVP_CIPHER_CTX_free()
in r1730342.
Modified:
apr/apr/trunk/build/crypto.m4
Modified: apr/apr/trunk/build/crypto.m4
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/crypto.m4?rev=1730344&r1=1730343&r2=1730344&view=diff
==============================================================================
--- apr/apr/trunk/build/crypto.m4 (original)
+++ apr/apr/trunk/build/crypto.m4 Sun Feb 14 14:25:01 2016
@@ -90,7 +90,7 @@ AC_DEFUN([APU_CHECK_CRYPTO_OPENSSL], [
[
if test "$withval" = "yes"; then
AC_CHECK_HEADERS(openssl/x509.h, [openssl_have_headers=1])
- AC_CHECK_LIB(crypto, BN_new, AC_CHECK_LIB(ssl, SSL_accept, [openssl_have_libs=1],,-lcrypto))
+ AC_CHECK_LIB(crypto, EVP_CIPHER_CTX_new, AC_CHECK_LIB(ssl, SSL_accept, [openssl_have_libs=1],,-lcrypto))
if test "$openssl_have_headers" != "0" && test "$openssl_have_libs" != "0"; then
apu_have_openssl=1
fi
@@ -106,7 +106,7 @@ AC_DEFUN([APU_CHECK_CRYPTO_OPENSSL], [
AC_MSG_NOTICE(checking for openssl in $withval)
AC_CHECK_HEADERS(openssl/x509.h, [openssl_have_headers=1])
- AC_CHECK_LIB(crypto, BN_new, AC_CHECK_LIB(ssl, SSL_accept, [openssl_have_libs=1],,-lcrypto))
+ AC_CHECK_LIB(crypto, EVP_CIPHER_CTX_new, AC_CHECK_LIB(ssl, SSL_accept, [openssl_have_libs=1],,-lcrypto))
if test "$openssl_have_headers" != "0" && test "$openssl_have_libs" != "0"; then
apu_have_openssl=1
APR_ADDTO(LDFLAGS, [-L$withval/lib])
@@ -115,7 +115,7 @@ AC_DEFUN([APU_CHECK_CRYPTO_OPENSSL], [
if test "$apu_have_openssl" != "1"; then
AC_CHECK_HEADERS(openssl/x509.h, [openssl_have_headers=1])
- AC_CHECK_LIB(crypto, BN_new, AC_CHECK_LIB(ssl, SSL_accept, [openssl_have_libs=1],,-lcrypto))
+ AC_CHECK_LIB(crypto, EVP_CIPHER_CTX_new, AC_CHECK_LIB(ssl, SSL_accept, [openssl_have_libs=1],,-lcrypto))
if test "$openssl_have_headers" != "0" && test "$openssl_have_libs" != "0"; then
apu_have_openssl=1
APR_ADDTO(LDFLAGS, [-L$withval/lib])