aboutsummaryrefslogtreecommitdiffstats
path: root/community/php7/libressl-2.7.patch
diff options
context:
space:
mode:
Diffstat (limited to 'community/php7/libressl-2.7.patch')
-rw-r--r--community/php7/libressl-2.7.patch85
1 files changed, 0 insertions, 85 deletions
diff --git a/community/php7/libressl-2.7.patch b/community/php7/libressl-2.7.patch
deleted file mode 100644
index 4ba31ac93a..0000000000
--- a/community/php7/libressl-2.7.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
-index 524192a..9c126a2 100644
---- a/ext/openssl/openssl.c
-+++ b/ext/openssl/openssl.c
-@@ -566,7 +566,7 @@ ZEND_GET_MODULE(openssl)
- #endif
-
- /* {{{ OpenSSL compatibility functions and macros */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- #define EVP_PKEY_get0_RSA(_pkey) _pkey->pkey.rsa
- #define EVP_PKEY_get0_DH(_pkey) _pkey->pkey.dh
- #define EVP_PKEY_get0_DSA(_pkey) _pkey->pkey.dsa
-@@ -683,7 +683,7 @@ static const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *asn1)
- return M_ASN1_STRING_data(asn1);
- }
-
--#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined (LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10002000L
-
- static int X509_get_signature_nid(const X509 *x)
- {
-@@ -1243,7 +1243,7 @@ static void php_openssl_dispose_config(struct php_x509_request * req) /* {{{ */
- }
- /* }}} */
-
--#if defined(PHP_WIN32) || (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER))
-+#if defined(PHP_WIN32) || (OPENSSL_VERSION_NUMBER >= 0x10100000L)
- #define PHP_OPENSSL_RAND_ADD_TIME() ((void) 0)
- #else
- #define PHP_OPENSSL_RAND_ADD_TIME() php_openssl_rand_add_timeval()
-@@ -1330,7 +1330,7 @@ static EVP_MD * php_openssl_get_evp_md_from_algo(zend_long algo) { /* {{{ */
- mdtype = (EVP_MD *) EVP_md2();
- break;
- #endif
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- case OPENSSL_ALGO_DSS1:
- mdtype = (EVP_MD *) EVP_dss1();
- break;
-@@ -1418,7 +1418,7 @@ PHP_MINIT_FUNCTION(openssl)
- le_x509 = zend_register_list_destructors_ex(php_openssl_x509_free, NULL, "OpenSSL X.509", module_number);
- le_csr = zend_register_list_destructors_ex(php_openssl_csr_free, NULL, "OpenSSL X.509 CSR", module_number);
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- OPENSSL_config(NULL);
- SSL_library_init();
- OpenSSL_add_all_ciphers();
-@@ -1461,7 +1461,7 @@ PHP_MINIT_FUNCTION(openssl)
- #ifdef HAVE_OPENSSL_MD2_H
- REGISTER_LONG_CONSTANT("OPENSSL_ALGO_MD2", OPENSSL_ALGO_MD2, CONST_CS|CONST_PERSISTENT);
- #endif
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- REGISTER_LONG_CONSTANT("OPENSSL_ALGO_DSS1", OPENSSL_ALGO_DSS1, CONST_CS|CONST_PERSISTENT);
- #endif
- REGISTER_LONG_CONSTANT("OPENSSL_ALGO_SHA224", OPENSSL_ALGO_SHA224, CONST_CS|CONST_PERSISTENT);
-@@ -1599,7 +1599,7 @@ PHP_MINFO_FUNCTION(openssl)
- */
- PHP_MSHUTDOWN_FUNCTION(openssl)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- EVP_cleanup();
-
- /* prevent accessing locking callback from unloaded extension */
-@@ -3644,7 +3644,7 @@ PHP_FUNCTION(openssl_csr_get_public_key)
- RETURN_FALSE;
- }
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
- /* Due to changes in OpenSSL 1.1 related to locking when decoding CSR,
- * the pub key is not changed after assigning. It means if we pass
- * a private key, it will be returned including the private part.
-@@ -3655,7 +3655,7 @@ PHP_FUNCTION(openssl_csr_get_public_key)
- /* Retrieve the public key from the CSR */
- tpubkey = X509_REQ_get_pubkey(csr);
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
- /* We need to free the CSR as it was duplicated */
- X509_REQ_free(csr);
- #endif