com php-src: Require at least OpenSSL version 0.9.8: NEWS acinclude.m4 ext/openssl/config0.m4 ext/openssl/openssl.c

Commit: 6a813634052710f3f4bf6e2e03ca1b6c7be3bcee Author: Jakub Zelenka <bukka@php.net> Sun, 20 Sep 2015 13:01:15 +0100 Parents: 76783a26d207d7a60af7294e371e324a10a82fd4 Branches: PHP-7.0 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6a813634052710f3f4bf6e2e03ca1b6c7be3bcee Log: Require at least OpenSSL version 0.9.8 Changed paths: M NEWS M acinclude.m4 M ext/openssl/config0.m4 M ext/openssl/openssl.c Diff: diff --git a/NEWS b/NEWS index eeeadbc..88cbaaa 100644 --- a/NEWS +++ b/NEWS @@ -8,6 +8,9 @@ PHP NEWS . Fixed bug #70481 (Memory leak in auto_global_copy_ctor() in ZTS build). (Laruence) +- OpenSSL + . Require at least OpenSSL version 0.9.8. (Jakub Zelenka) + - Session: . Fixed bug #70529 (Session read causes "String is not zero-terminated" error). (Yasuo) diff --git a/acinclude.m4 b/acinclude.m4 index 027af60..ff2fad6 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2334,13 +2334,13 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[ dnl If pkg-config is found try using it if test "$PHP_OPENSSL_DIR" = "yes" && test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then - if $PKG_CONFIG --atleast-version=0..9.6 openssl; then + if $PKG_CONFIG --atleast-version=0.9.8 openssl; then found_openssl=yes OPENSSL_LIBS=$PKG_CONFIG --libs openssl OPENSSL_INCS=$PKG_CONFIG --cflags-only-I openssl OPENSSL_INCDIR=$PKG_CONFIG --variable=includedir openssl else - AC_MSG_ERROR([OpenSSL version 0.9.6 or greater required.]) + AC_MSG_ERROR([OpenSSL version 0.9.8 or greater required.]) fi if test -n "$OPENSSL_LIBS"; then @@ -2381,13 +2381,13 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[ AC_MSG_CHECKING([for OpenSSL version]) AC_EGREP_CPP(yes,[ #include <openssl/opensslv.h> -#if OPENSSL_VERSION_NUMBER >= 0x0090600fL +#if OPENSSL_VERSION_NUMBER >= 0x0090800fL yes #endif ],[ - AC_MSG_RESULT([>= 0.9.6]) + AC_MSG_RESULT([>= 0.9.8]) ],[ - AC_MSG_ERROR([OpenSSL version 0.9.6 or greater required.]) + AC_MSG_ERROR([OpenSSL version 0.9.8 or greater required.]) ]) CPPFLAGS=$old_CPPFLAGS diff --git a/ext/openssl/config0.m4 b/ext/openssl/config0.m4 index a9484b4..01fc89b 100644 --- a/ext/openssl/config0.m4 +++ b/ext/openssl/config0.m4 @@ -3,7 +3,7 @@ dnl $Id$ dnl PHP_ARG_WITH(openssl, for OpenSSL support, -[ --with-openssl[=DIR] Include OpenSSL support (requires OpenSSL >= 0.9.6)]) +[ --with-openssl[=DIR] Include OpenSSL support (requires OpenSSL >= 0.9.8)]) PHP_ARG_WITH(kerberos, for Kerberos support, [ --with-kerberos[=DIR] OPENSSL: Include Kerberos support], no, no) @@ -19,8 +19,6 @@ if test "$PHP_OPENSSL" != "no"; then PHP_SETUP_KERBEROS(OPENSSL_SHARED_LIBADD) fi - AC_CHECK_LIB(ssl, DSA_get_default_method, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later])) - AC_CHECK_LIB(crypto, X509_free, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later])) AC_CHECK_FUNCS([RAND_egd]) PHP_SETUP_OPENSSL(OPENSSL_SHARED_LIBADD, diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 818b90e...e0adce8 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -3420,7 +3420,7 @@ static EVP_PKEY * php_openssl_generate_private_key(struct php_x509_request * req } } break; -#if !defined(NO_DSA) && defined(HAVE_DSA_DEFAULT_METHOD) +#if !defined(NO_DSA) case OPENSSL_KEYTYPE_DSA: { DSA *dsaparam = NULL;