Browse Source
php7: major upgrade to 7.4.1
- remove obsolete patches and update other ones - filter support is now available as an extension module - php7-mod-hash: this extension is now part of the core binary and cannot be built as an extension module anymore - php7-mod-gd: - do not use bundled libgd, but rely on external one - this also obsoletes dependencies and configuration options - php7-mod-zip: requires external libzip now Signed-off-by: Michael Heimpold <mhei@heimpold.de>lilik-openwrt-22.03
Michael Heimpold
5 years ago
17 changed files with 149 additions and 754 deletions
Split View
Diff Options
-
+53 -84lang/php7/Makefile
-
+19 -21lang/php7/patches/0013-Add-support-for-use-of-the-system-timezone-database.patch
-
+0 -19lang/php7/patches/0016-dont-gitclean-in-build.patch
-
+2 -2lang/php7/patches/0032-Use-system-timezone.patch
-
+21 -21lang/php7/patches/0041-Add-patch-to-remove-build-timestamps-from-generated-.patch
-
+1 -1lang/php7/patches/0042-Remove-W3C-validation-icon-to-not-expose-the-reader-.patch
-
+8 -8lang/php7/patches/0050-remove-build-timestamps.patch
-
+0 -11lang/php7/patches/1000-fix_membar_producer_link_error_gcc3x.patch
-
+26 -134lang/php7/patches/1001-ext-opcache-fix-detection-of-shm-mmap.patch
-
+0 -14lang/php7/patches/1002-gd-iconv.patch
-
+0 -27lang/php7/patches/1003-Fix-dl-cross-compiling-issue.patch
-
+2 -2lang/php7/patches/1004-disable-phar-command.patch
-
+0 -178lang/php7/patches/1006-multiline-syslog.patch
-
+0 -17lang/php7/patches/1010-pcrelib-NativeMIPS.patch
-
+17 -0lang/php7/patches/1010-zend-alloc-mm-alignment.patch
-
+0 -46lang/php7/patches/1012-php_iconv_string-null-out-pointer.patch
-
+0 -169lang/php7/patches/1020-openssl-deprecated.patch
+ 53
- 84
lang/php7/Makefile
View File
+ 19
- 21
lang/php7/patches/0013-Add-support-for-use-of-the-system-timezone-database.patch
View File
+ 0
- 19
lang/php7/patches/0016-dont-gitclean-in-build.patch
View File
| @ -1,19 +0,0 @@ | |||
| From: Debian PHP Maintainers <pkg-php-maint@lists.alioth.debian.org> | |||
| Date: Sat, 2 May 2015 10:26:53 +0200 | |||
| Subject: dont-gitclean-in-build | |||
| --- | |||
| build/build.mk | 1 - | |||
| 1 file changed, 1 deletion(-) | |||
| diff --git a/build/build.mk b/build/build.mk | |||
| index 9452984..b964def 100644 | |||
| --- a/build/build.mk | |||
| +++ b/build/build.mk | |||
| @@ -63,6 +63,5 @@ gitclean-work: | |||
| @if (test ! -f '.git/info/exclude' || grep -s "git-ls-files" .git/info/exclude); then \ | |||
| (echo "Rebuild .git/info/exclude" && echo '*.o' > .git/info/exclude && git svn propget svn:ignore | grep -v config.nice >> .git/info/exclude); \ | |||
| fi; \ | |||
| - git clean -X -f -d; | |||
| .PHONY: $(ALWAYS) snapshot | |||
+ 2
- 2
lang/php7/patches/0032-Use-system-timezone.patch
View File
+ 21
- 21
lang/php7/patches/0041-Add-patch-to-remove-build-timestamps-from-generated-.patch
View File
+ 1
- 1
lang/php7/patches/0042-Remove-W3C-validation-icon-to-not-expose-the-reader-.patch
View File
+ 8
- 8
lang/php7/patches/0050-remove-build-timestamps.patch
View File
+ 0
- 11
lang/php7/patches/1000-fix_membar_producer_link_error_gcc3x.patch
View File
| @ -1,11 +0,0 @@ | |||
| --- a/ext/standard/php_crypt_r.c | |||
| +++ b/ext/standard/php_crypt_r.c | |||
| @@ -96,6 +96,8 @@ void _crypt_extended_init_r(void) | |||
| InterlockedIncrement(&initialized); | |||
| #elif defined(HAVE_SYNC_FETCH_AND_ADD) | |||
| __sync_fetch_and_add(&initialized, 1); | |||
| +#elif (defined(__GNUC__) && (__GNUC__ == 3)) | |||
| + initialized = 1; | |||
| #elif defined(HAVE_ATOMIC_H) /* Solaris 10 defines atomic API within */ | |||
| membar_producer(); | |||
| atomic_add_int(&initialized, 1); | |||
+ 26
- 134
lang/php7/patches/1001-ext-opcache-fix-detection-of-shm-mmap.patch
View File
+ 0
- 14
lang/php7/patches/1002-gd-iconv.patch
View File
| @ -1,14 +0,0 @@ | |||
| --- a/ext/gd/libgd/gdkanji.c | |||
| +++ b/ext/gd/libgd/gdkanji.c | |||
| @@ -9,6 +9,11 @@ | |||
| #include "gdhelpers.h" | |||
| #include <stdarg.h> | |||
| + | |||
| +/* force usage of internal conversation routine */ | |||
| +#undef HAVE_ICONV_H | |||
| +#undef HAVE_ICONV | |||
| + | |||
| #if defined(HAVE_ICONV_H) || defined(HAVE_ICONV) | |||
| #include <iconv.h> | |||
| #ifdef HAVE_ERRNO_H | |||
+ 0
- 27
lang/php7/patches/1003-Fix-dl-cross-compiling-issue.patch
View File
| @ -1,27 +0,0 @@ | |||
| --- a/configure.ac | |||
| +++ b/configure.ac | |||
| @@ -422,7 +422,10 @@ PHP_CHECK_FUNC(gethostname, nsl) | |||
| PHP_CHECK_FUNC(gethostbyaddr, nsl) | |||
| PHP_CHECK_FUNC(yp_get_default_domain, nsl) | |||
| -PHP_CHECK_FUNC(dlopen, dl) | |||
| +PHP_ADD_LIBRARY(dl) | |||
| +PHP_DEF_HAVE(dlopen) | |||
| +PHP_DEF_HAVE(libdl) | |||
| +ac_cv_func_dlopen=yes | |||
| if test "$ac_cv_func_dlopen" = "yes"; then | |||
| AC_DEFINE(HAVE_LIBDL, 1, [ ]) | |||
| fi | |||
| --- a/ext/fileinfo/config.m4 | |||
| +++ b/ext/fileinfo/config.m4 | |||
| @@ -46,6 +46,10 @@ int main(void) | |||
| AC_MSG_RESULT(no) | |||
| AC_MSG_NOTICE(using libmagic strcasestr implementation) | |||
| libmagic_sources="$libmagic_sources libmagic/strcasestr.c" | |||
| + ],[ | |||
| + dnl cross-compiling; assume not present | |||
| + AC_MSG_NOTICE(using libmagic strcasestr implementation) | |||
| + libmagic_sources="$libmagic_sources libmagic/strcasestr.c" | |||
| ]) | |||
| PHP_NEW_EXTENSION(fileinfo, fileinfo.c $libmagic_sources, $ext_shared,,-I@ext_srcdir@/libmagic) | |||
+ 2
- 2
lang/php7/patches/1004-disable-phar-command.patch
View File
+ 0
- 178
lang/php7/patches/1006-multiline-syslog.patch
View File
| @ -1,178 +0,0 @@ | |||
| commit f11d40ef88f640fe4764d2731d3061472aefe556 | |||
| Author: Philip Prindeville <philipp@redfish-solutions.com> | |||
| Date: Wed Aug 9 20:55:25 2017 -0600 | |||
| Turn php_syslog() into wrapper for syslog and split lines | |||
| diff --git a/Zend/zend_smart_string.h b/Zend/zend_smart_string.h | |||
| index 2282202..12d755e 100644 | |||
| --- a/Zend/zend_smart_string.h | |||
| +++ b/Zend/zend_smart_string.h | |||
| @@ -136,6 +136,10 @@ static zend_always_inline void smart_string_setl(smart_string *dest, char *src, | |||
| dest->c = src; | |||
| } | |||
| +static zend_always_inline void smart_string_reset(smart_string *str) { | |||
| + str->len = 0; | |||
| +} | |||
| + | |||
| #endif | |||
| /* | |||
| diff --git a/configure.ac b/configure.ac | |||
| index cb95d86..a63354f 100644 | |||
| --- a/configure.ac | |||
| +++ b/configure.ac | |||
| @@ -1478,7 +1478,7 @@ PHP_ADD_SOURCES(main, main.c snprintf.c spprintf.c php_sprintf.c \ | |||
| php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \ | |||
| strlcat.c explicit_bzero.c mergesort.c reentrancy.c php_variables.c php_ticks.c \ | |||
| network.c php_open_temporary_file.c \ | |||
| - output.c getopt.c, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) | |||
| + output.c getopt.c php_syslog.c, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) | |||
| PHP_ADD_SOURCES_X(main, fastcgi.c, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1, PHP_FASTCGI_OBJS, no) | |||
| diff --git a/main/php_syslog.c b/main/php_syslog.c | |||
| new file mode 100644 | |||
| index 0000000..c351951 | |||
| --- /dev/null | |||
| +++ b/main/php_syslog.c | |||
| @@ -0,0 +1,81 @@ | |||
| +/* | |||
| + +----------------------------------------------------------------------+ | |||
| + | PHP Version 7 | | |||
| + +----------------------------------------------------------------------+ | |||
| + | Copyright (c) 2017 The PHP Group | | |||
| + +----------------------------------------------------------------------+ | |||
| + | This source file is subject to version 3.01 of the PHP license, | | |||
| + | that is bundled with this package in the file LICENSE, and is | | |||
| + | available through the world-wide-web at the following url: | | |||
| + | http://www.php.net/license/3_01.txt | | |||
| + | If you did not receive a copy of the PHP license and are unable to | | |||
| + | obtain it through the world-wide-web, please send a note to | | |||
| + | license@php.net so we can mail you a copy immediately. | | |||
| + +----------------------------------------------------------------------+ | |||
| + | Author: Philip Prindeville <philipp@redfish-solutions.com> | | |||
| + +----------------------------------------------------------------------+ | |||
| +*/ | |||
| + | |||
| +/* $Id$ */ | |||
| + | |||
| +#include <stdio.h> | |||
| +#include <string.h> | |||
| +#include <assert.h> | |||
| +#include <stdlib.h> | |||
| +#include "php.h" | |||
| +#include "php_syslog.h" | |||
| + | |||
| +#include "zend.h" | |||
| +#include "zend_smart_string.h" | |||
| + | |||
| +/* | |||
| + * The SCO OpenServer 5 Development System (not the UDK) | |||
| + * defines syslog to std_syslog. | |||
| + */ | |||
| + | |||
| +#ifdef HAVE_STD_SYSLOG | |||
| +#define syslog std_syslog | |||
| +#endif | |||
| + | |||
| +PHPAPI void php_syslog(int priority, const char *format, ...) /* {{{ */ | |||
| +{ | |||
| + const char *ptr; | |||
| + unsigned char c; | |||
| + smart_string fbuf = {0}; | |||
| + smart_string sbuf = {0}; | |||
| + va_list args; | |||
| + | |||
| + va_start(args, format); | |||
| + zend_printf_to_smart_string(&fbuf, format, args); | |||
| + smart_string_0(&fbuf); | |||
| + va_end(args); | |||
| + | |||
| + for (ptr = fbuf.c; ; ++ptr) { | |||
| + c = *ptr; | |||
| + if (c == '\0') { | |||
| + syslog(priority, "%.*s", (int)sbuf.len, sbuf.c); | |||
| + break; | |||
| + } | |||
| + | |||
| + if (c != '\n') | |||
| + smart_string_appendc(&sbuf, c); | |||
| + else { | |||
| + syslog(priority, "%.*s", (int)sbuf.len, sbuf.c); | |||
| + smart_string_reset(&sbuf); | |||
| + } | |||
| + } | |||
| + | |||
| + smart_string_free(&fbuf); | |||
| + smart_string_free(&sbuf); | |||
| +} | |||
| + | |||
| +/* }}} */ | |||
| + | |||
| +/* | |||
| + * Local variables: | |||
| + * tab-width: 4 | |||
| + * c-basic-offset: 4 | |||
| + * End: | |||
| + * vim600: sw=4 ts=4 fdm=marker | |||
| + * vim<600: sw=4 ts=4 | |||
| + */ | |||
| diff --git a/main/php_syslog.h b/main/php_syslog.h | |||
| index be68cc4..4c4ca4e 100644 | |||
| --- a/main/php_syslog.h | |||
| +++ b/main/php_syslog.h | |||
| @@ -21,6 +21,8 @@ | |||
| #ifndef PHP_SYSLOG_H | |||
| #define PHP_SYSLOG_H | |||
| +#include "php.h" | |||
| + | |||
| #ifdef PHP_WIN32 | |||
| #include "win32/syslog.h" | |||
| #else | |||
| @@ -30,26 +32,12 @@ | |||
| #endif | |||
| #endif | |||
| -/* | |||
| - * The SCO OpenServer 5 Development System (not the UDK) | |||
| - * defines syslog to std_syslog. | |||
| - */ | |||
| - | |||
| -#ifdef syslog | |||
| - | |||
| -#ifdef HAVE_STD_SYSLOG | |||
| -#define php_syslog std_syslog | |||
| -#endif | |||
| - | |||
| -#undef syslog | |||
| +BEGIN_EXTERN_C() | |||
| +PHPAPI void php_syslog(int, const char *format, ...); | |||
| +END_EXTERN_C() | |||
| #endif | |||
| -#ifndef php_syslog | |||
| -#define php_syslog syslog | |||
| -#endif | |||
| - | |||
| -#endif | |||
| /* | |||
| * Local variables: | |||
| * tab-width: 4 | |||
| diff --git a/win32/build/config.w32 b/win32/build/config.w32 | |||
| index 6cbb18b..71cf491 100644 | |||
| --- a/win32/build/config.w32 | |||
| +++ b/win32/build/config.w32 | |||
| @@ -241,7 +241,8 @@ ADD_FLAG("CFLAGS_BD_ZEND", "/D ZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); | |||
| ADD_SOURCES("main", "main.c snprintf.c spprintf.c getopt.c fopen_wrappers.c \ | |||
| php_scandir.c php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \ | |||
| strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c network.c \ | |||
| - php_open_temporary_file.c output.c internal_functions.c php_sprintf.c"); | |||
| + php_open_temporary_file.c output.c internal_functions.c php_sprintf.c \ | |||
| + php_syslog.c"); | |||
| ADD_FLAG("CFLAGS_BD_MAIN", "/D ZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); | |||
| AC_DEFINE('HAVE_STRNLEN', 1); | |||
+ 0
- 17
lang/php7/patches/1010-pcrelib-NativeMIPS.patch
View File
| @ -1,17 +0,0 @@ | |||
| --- a/ext/pcre/pcrelib/sljit/sljitNativeMIPS_common.c 2017-11-28 02:22:57.000000000 -0700 | |||
| +++ b/ext/pcre/pcrelib/sljit/sljitNativeMIPS_common.c 2017-12-29 17:35:44.231934114 -0700 | |||
| @@ -498,12 +498,13 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_gen | |||
| SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_has_cpu_feature(sljit_s32 feature_type) | |||
| { | |||
| + sljit_sw fir = 0; | |||
| + | |||
| switch (feature_type) { | |||
| case SLJIT_HAS_FPU: | |||
| #ifdef SLJIT_IS_FPU_AVAILABLE | |||
| return SLJIT_IS_FPU_AVAILABLE; | |||
| #elif defined(__GNUC__) | |||
| - sljit_sw fir; | |||
| asm ("cfc1 %0, $0" : "=r"(fir)); | |||
| return (fir >> 22) & 0x1; | |||
| #else | |||
+ 17
- 0
lang/php7/patches/1010-zend-alloc-mm-alignment.patch
View File
| @ -0,0 +1,17 @@ | |||
| --- a/Zend/zend_alloc.h | |||
| +++ b/Zend/zend_alloc.h | |||
| @@ -27,12 +27,12 @@ | |||
| #include "zend.h" | |||
| #ifndef ZEND_MM_ALIGNMENT | |||
| -# define ZEND_MM_ALIGNMENT ((size_t) 8) | |||
| +# define ZEND_MM_ALIGNMENT (8) | |||
| # define ZEND_MM_ALIGNMENT_LOG2 Z_L(3) | |||
| #elif ZEND_MM_ALIGNMENT < 4 | |||
| # undef ZEND_MM_ALIGNMENT | |||
| # undef ZEND_MM_ALIGNMENT_LOG2 | |||
| -# define ZEND_MM_ALIGNMENT ((size_t) 4) | |||
| +# define ZEND_MM_ALIGNMENT (4) | |||
| # define ZEND_MM_ALIGNMENT_LOG2 Z_L(2) | |||
| #endif | |||
+ 0
- 46
lang/php7/patches/1012-php_iconv_string-null-out-pointer.patch
View File
| @ -1,46 +0,0 @@ | |||
| commit 3763c8f1645983b5abc37c60597e1ecc1bf89019 | |||
| Author: Philip Prindeville <philipp@redfish-solutions.com> | |||
| Date: Thu Jan 25 14:18:00 2018 -0700 | |||
| Always free out_buf in php_iconv_string() | |||
| diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c | |||
| index 4289242..807bb14 100644 | |||
| --- a/ext/iconv/iconv.c | |||
| +++ b/ext/iconv/iconv.c | |||
| @@ -699,6 +699,7 @@ PHP_ICONV_API php_iconv_err_t php_iconv_string(const char *in_p, size_t in_len, | |||
| iconv_close(cd); | |||
| if (result == (size_t)(-1)) { | |||
| + zend_string_free(out_buf); | |||
| switch (errno) { | |||
| case EINVAL: | |||
| retval = PHP_ICONV_ERR_ILLEGAL_CHAR; | |||
| @@ -715,7 +716,6 @@ PHP_ICONV_API php_iconv_err_t php_iconv_string(const char *in_p, size_t in_len, | |||
| default: | |||
| /* other error */ | |||
| - zend_string_free(out_buf); | |||
| return PHP_ICONV_ERR_UNKNOWN; | |||
| } | |||
| } | |||
| @@ -988,9 +988,6 @@ static php_iconv_err_t _php_iconv_strpos(size_t *pretval, | |||
| err = php_iconv_string(ndl, ndl_nbytes, &ndl_buf, GENERIC_SUPERSET_NAME, enc); | |||
| if (err != PHP_ICONV_ERR_SUCCESS) { | |||
| - if (ndl_buf != NULL) { | |||
| - zend_string_free(ndl_buf); | |||
| - } | |||
| return err; | |||
| } | |||
| @@ -2494,9 +2491,6 @@ PHP_NAMED_FUNCTION(php_if_iconv) | |||
| if (err == PHP_ICONV_ERR_SUCCESS && out_buffer != NULL) { | |||
| RETVAL_STR(out_buffer); | |||
| } else { | |||
| - if (out_buffer != NULL) { | |||
| - zend_string_free(out_buffer); | |||
| - } | |||
| RETURN_FALSE; | |||
| } | |||
| } | |||
+ 0
- 169
lang/php7/patches/1020-openssl-deprecated.patch
View File
| @ -1,169 +0,0 @@ | |||
| --- a/ext/ftp/php_ftp.c | |||
| +++ b/ext/ftp/php_ftp.c | |||
| @@ -320,12 +320,14 @@ static void ftp_destructor_ftpbuf(zend_resource *rsrc) | |||
| PHP_MINIT_FUNCTION(ftp) | |||
| { | |||
| #ifdef HAVE_FTP_SSL | |||
| +#if OPENSSL_VERSION_NUMBER < 0x10100000L | |||
| SSL_library_init(); | |||
| OpenSSL_add_all_ciphers(); | |||
| OpenSSL_add_all_digests(); | |||
| OpenSSL_add_all_algorithms(); | |||
| SSL_load_error_strings(); | |||
| +#endif | |||
| #endif | |||
| le_ftpbuf = zend_register_list_destructors_ex(ftp_destructor_ftpbuf, NULL, le_ftpbuf_name, module_number); | |||
| --- a/ext/openssl/openssl.c | |||
| +++ b/ext/openssl/openssl.c | |||
| @@ -683,6 +683,12 @@ static const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *asn1) | |||
| return M_ASN1_STRING_data(asn1); | |||
| } | |||
| +#define OpenSSL_version OpenSSL_version | |||
| +#define OPENSSL_VERSION OPENSSL_VERSION | |||
| +#define X509_getm_notBefore X509_get_notBefore | |||
| +#define X509_getm_notAfter X509_get_notAfter | |||
| +#define EVP_CIPHER_CTX_reset EVP_CIPHER_CTX_cleanup | |||
| + | |||
| #if PHP_OPENSSL_API_VERSION < 0x10002 | |||
| static int X509_get_signature_nid(const X509 *x) | |||
| @@ -1587,7 +1593,7 @@ PHP_MINFO_FUNCTION(openssl) | |||
| { | |||
| php_info_print_table_start(); | |||
| php_info_print_table_row(2, "OpenSSL support", "enabled"); | |||
| - php_info_print_table_row(2, "OpenSSL Library Version", SSLeay_version(SSLEAY_VERSION)); | |||
| + php_info_print_table_row(2, "OpenSSL Library Version", OpenSSL_version(OPENSSL_VERSION)); | |||
| php_info_print_table_row(2, "OpenSSL Header Version", OPENSSL_VERSION_TEXT); | |||
| php_info_print_table_row(2, "Openssl default config", default_ssl_conf_filename); | |||
| php_info_print_table_end(); | |||
| @@ -2364,11 +2370,11 @@ PHP_FUNCTION(openssl_x509_parse) | |||
| add_assoc_string(return_value, "serialNumberHex", hex_serial); | |||
| OPENSSL_free(hex_serial); | |||
| - php_openssl_add_assoc_asn1_string(return_value, "validFrom", X509_get_notBefore(cert)); | |||
| - php_openssl_add_assoc_asn1_string(return_value, "validTo", X509_get_notAfter(cert)); | |||
| + php_openssl_add_assoc_asn1_string(return_value, "validFrom", X509_getm_notBefore(cert)); | |||
| + php_openssl_add_assoc_asn1_string(return_value, "validTo", X509_getm_notAfter(cert)); | |||
| - add_assoc_long(return_value, "validFrom_time_t", php_openssl_asn1_time_to_time_t(X509_get_notBefore(cert))); | |||
| - add_assoc_long(return_value, "validTo_time_t", php_openssl_asn1_time_to_time_t(X509_get_notAfter(cert))); | |||
| + add_assoc_long(return_value, "validFrom_time_t", php_openssl_asn1_time_to_time_t(X509_getm_notBefore(cert))); | |||
| + add_assoc_long(return_value, "validTo_time_t", php_openssl_asn1_time_to_time_t(X509_getm_notAfter(cert))); | |||
| tmpstr = (char *)X509_alias_get0(cert, NULL); | |||
| if (tmpstr) { | |||
| @@ -3459,8 +3465,8 @@ PHP_FUNCTION(openssl_csr_sign) | |||
| php_openssl_store_errors(); | |||
| goto cleanup; | |||
| } | |||
| - X509_gmtime_adj(X509_get_notBefore(new_cert), 0); | |||
| - X509_gmtime_adj(X509_get_notAfter(new_cert), 60*60*24*(long)num_days); | |||
| + X509_gmtime_adj(X509_getm_notBefore(new_cert), 0); | |||
| + X509_gmtime_adj(X509_getm_notAfter(new_cert), 60*60*24*(long)num_days); | |||
| i = X509_set_pubkey(new_cert, key); | |||
| if (!i) { | |||
| php_openssl_store_errors(); | |||
| @@ -6092,7 +6098,7 @@ PHP_FUNCTION(openssl_seal) | |||
| /* allocate one byte extra to make room for \0 */ | |||
| buf = emalloc(data_len + EVP_CIPHER_CTX_block_size(ctx)); | |||
| - EVP_CIPHER_CTX_cleanup(ctx); | |||
| + EVP_CIPHER_CTX_reset(ctx); | |||
| if (EVP_SealInit(ctx, cipher, eks, eksl, &iv_buf[0], pkeys, nkeys) <= 0 || | |||
| !EVP_SealUpdate(ctx, buf, &len1, (unsigned char *)data, (int)data_len) || | |||
| @@ -6645,7 +6651,7 @@ PHP_FUNCTION(openssl_encrypt) | |||
| if (free_iv) { | |||
| efree(iv); | |||
| } | |||
| - EVP_CIPHER_CTX_cleanup(cipher_ctx); | |||
| + EVP_CIPHER_CTX_reset(cipher_ctx); | |||
| EVP_CIPHER_CTX_free(cipher_ctx); | |||
| } | |||
| /* }}} */ | |||
| @@ -6732,7 +6738,7 @@ PHP_FUNCTION(openssl_decrypt) | |||
| if (base64_str) { | |||
| zend_string_release(base64_str); | |||
| } | |||
| - EVP_CIPHER_CTX_cleanup(cipher_ctx); | |||
| + EVP_CIPHER_CTX_reset(cipher_ctx); | |||
| EVP_CIPHER_CTX_free(cipher_ctx); | |||
| } | |||
| /* }}} */ | |||
| --- a/ext/openssl/xp_ssl.c | |||
| +++ b/ext/openssl/xp_ssl.c | |||
| @@ -56,8 +56,21 @@ | |||
| #define HAVE_SSL3 1 | |||
| #endif | |||
| +#if PHP_OPENSSL_API_VERSION >= 0x10100 | |||
| +#define HAVE_TLS 1 | |||
| +#endif | |||
| + | |||
| +#if PHP_OPENSSL_API_VERSION < 0x10100 | |||
| +#define HAVE_TLS1 1 | |||
| +#endif | |||
| + | |||
| +#if PHP_OPENSSL_API_VERSION < 0x10100 | |||
| #define HAVE_TLS11 1 | |||
| +#endif | |||
| + | |||
| +#if PHP_OPENSSL_API_VERSION < 0x10100 | |||
| #define HAVE_TLS12 1 | |||
| +#endif | |||
| #ifndef OPENSSL_NO_ECDH | |||
| #define HAVE_ECDH 1 | |||
| @@ -78,9 +91,10 @@ | |||
| #define STREAM_CRYPTO_IS_CLIENT (1<<0) | |||
| #define STREAM_CRYPTO_METHOD_SSLv2 (1<<1) | |||
| #define STREAM_CRYPTO_METHOD_SSLv3 (1<<2) | |||
| -#define STREAM_CRYPTO_METHOD_TLSv1_0 (1<<3) | |||
| -#define STREAM_CRYPTO_METHOD_TLSv1_1 (1<<4) | |||
| -#define STREAM_CRYPTO_METHOD_TLSv1_2 (1<<5) | |||
| +#define STREAM_CRYPTO_METHOD_TLS (1<<3) | |||
| +#define STREAM_CRYPTO_METHOD_TLSv1_0 (1<<4) | |||
| +#define STREAM_CRYPTO_METHOD_TLSv1_1 (1<<5) | |||
| +#define STREAM_CRYPTO_METHOD_TLSv1_2 (1<<6) | |||
| /* Simplify ssl context option retrieval */ | |||
| #define GET_VER_OPT(name) \ | |||
| @@ -968,9 +982,23 @@ static const SSL_METHOD *php_openssl_select_crypto_method(zend_long method_value | |||
| php_error_docref(NULL, E_WARNING, | |||
| "SSLv3 unavailable in the OpenSSL library against which PHP is linked"); | |||
| return NULL; | |||
| +#endif | |||
| + } else if (method_value == STREAM_CRYPTO_METHOD_TLS) { | |||
| +#ifdef HAVE_TLS | |||
| + return is_client ? TLS_client_method() : TLS_server_method(); | |||
| +#else | |||
| + php_error_docref(NULL, E_WARNING, | |||
| + "TLS unavailable in the OpenSSL library against which PHP is linked"); | |||
| + return NULL; | |||
| #endif | |||
| } else if (method_value == STREAM_CRYPTO_METHOD_TLSv1_0) { | |||
| +#ifdef HAVE_TLS1 | |||
| return is_client ? TLSv1_client_method() : TLSv1_server_method(); | |||
| +#else | |||
| + php_error_docref(NULL, E_WARNING, | |||
| + "TLSv1 unavailable in the OpenSSL library against which PHP is linked"); | |||
| + return NULL; | |||
| +#endif | |||
| } else if (method_value == STREAM_CRYPTO_METHOD_TLSv1_1) { | |||
| #ifdef HAVE_TLS11 | |||
| return is_client ? TLSv1_1_client_method() : TLSv1_1_server_method(); | |||
| @@ -1022,9 +1050,11 @@ static int php_openssl_get_crypto_method_ctx_flags(int method_flags) /* {{{ */ | |||
| ssl_ctx_options |= SSL_OP_NO_SSLv3; | |||
| } | |||
| #endif | |||
| +#ifdef HAVE_TLS1 | |||
| if (!(method_flags & STREAM_CRYPTO_METHOD_TLSv1_0)) { | |||
| ssl_ctx_options |= SSL_OP_NO_TLSv1; | |||
| } | |||
| +#endif | |||
| #ifdef HAVE_TLS11 | |||
| if (!(method_flags & STREAM_CRYPTO_METHOD_TLSv1_1)) { | |||
| ssl_ctx_options |= SSL_OP_NO_TLSv1_1; | |||