projects / packages / php.git / blame
| Commit | Line | Data |
|---|---|---|
| f0fc7beb AM |
1 | --- php-5.3.29/ext/openssl/openssl.c~ 2021-10-23 19:18:21.000000000 +0200 |
| 2 | +++ php-5.3.29/ext/openssl/openssl.c 2021-10-23 19:19:01.483125024 +0200 | |
| 3 | @@ -1044,7 +1044,9 @@ PHP_MINIT_FUNCTION(openssl) | |
| 4 | REGISTER_LONG_CONSTANT("PKCS7_NOSIGS", PKCS7_NOSIGS, CONST_CS|CONST_PERSISTENT); | |
| 5 | ||
| 6 | REGISTER_LONG_CONSTANT("OPENSSL_PKCS1_PADDING", RSA_PKCS1_PADDING, CONST_CS|CONST_PERSISTENT); | |
| 7 | +#ifdef RSA_SSLV23_PADDING | |
| 8 | REGISTER_LONG_CONSTANT("OPENSSL_SSLV23_PADDING", RSA_SSLV23_PADDING, CONST_CS|CONST_PERSISTENT); | |
| 9 | +#endif | |
| 10 | REGISTER_LONG_CONSTANT("OPENSSL_NO_PADDING", RSA_NO_PADDING, CONST_CS|CONST_PERSISTENT); | |
| 11 | REGISTER_LONG_CONSTANT("OPENSSL_PKCS1_OAEP_PADDING", RSA_PKCS1_OAEP_PADDING, CONST_CS|CONST_PERSISTENT); | |
| 12 | ||
| 2bac0a58 AM |
13 | --- php-7.0.33/ext/openssl/xp_ssl.c~ 2018-12-04 18:22:59.000000000 +0100 |
| 14 | +++ php-7.0.33/ext/openssl/xp_ssl.c 2022-03-29 16:07:39.443215599 +0200 | |
| 15 | @@ -1268,6 +1268,10 @@ static int set_server_specific_opts(php_ | |
| 16 | zval *zv; | |
| 17 | long ssl_ctx_options = SSL_CTX_get_options(ctx); | |
| 18 | ||
| 19 | +#ifdef SSL_OP_IGNORE_UNEXPECTED_EOF | |
| 20 | + ssl_ctx_options |= SSL_OP_IGNORE_UNEXPECTED_EOF; | |
| 21 | +#endif | |
| 22 | + | |
| 23 | #if defined(HAVE_ECDH) && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)) | |
| 24 | if (set_server_ecdh_curve(stream, ctx) == FAILURE) { | |
| 25 | return FAILURE; | |
| 26 | @@ -1558,6 +1562,10 @@ int php_openssl_setup_crypto(php_stream | |
| 27 | return FAILURE; | |
| 28 | } | |
| 29 | ||
| 30 | +#ifdef SSL_OP_IGNORE_UNEXPECTED_EOF | |
| 31 | + ssl_ctx_options |= SSL_OP_IGNORE_UNEXPECTED_EOF; | |
| 32 | +#endif | |
| 33 | + | |
| 34 | #if OPENSSL_VERSION_NUMBER >= 0x0090806fL | |
| 35 | if (GET_VER_OPT("no_ticket") && zend_is_true(val)) { | |
| 36 | ssl_ctx_options |= SSL_OP_NO_TICKET; |