projects / packages / php.git / blame
| Commit | Line | Data |
|---|---|---|
| 6a9cce28 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 | ||
| 78dd4571 AM |
13 | --- php-7.2.34/ext/openssl/xp_ssl.c.orig 2020-09-30 07:15:53.000000000 +0200 |
| 14 | +++ php-7.2.34/ext/openssl/xp_ssl.c 2022-03-29 15:28:35.726548949 +0200 | |
| 15 | @@ -1014,6 +1014,10 @@ static int php_openssl_get_crypto_method | |
| 16 | { | |
| 17 | int ssl_ctx_options = SSL_OP_ALL; | |
| 18 | ||
| 19 | +#ifdef SSL_OP_IGNORE_UNEXPECTED_EOF | |
| 20 | + ssl_ctx_options |= SSL_OP_IGNORE_UNEXPECTED_EOF; | |
| 21 | +#endif | |
| 22 | + | |
| 23 | #ifdef SSL_OP_NO_SSLv2 | |
| 24 | ssl_ctx_options |= SSL_OP_NO_SSLv2; | |
| 25 | #endif | |
| 26 | @@ -1261,6 +1265,10 @@ static int php_openssl_set_server_specif | |
| 27 | zval *zv; | |
| 28 | long ssl_ctx_options = SSL_CTX_get_options(ctx); | |
| 29 | ||
| 30 | +#ifdef SSL_OP_IGNORE_UNEXPECTED_EOF | |
| 31 | + ssl_ctx_options |= SSL_OP_IGNORE_UNEXPECTED_EOF; | |
| 32 | +#endif | |
| 33 | + | |
| 34 | #if defined(HAVE_ECDH) && PHP_OPENSSL_API_VERSION < 0x10100 | |
| 35 | if (php_openssl_set_server_ecdh_curve(stream, ctx) == FAILURE) { | |
| 36 | return FAILURE; |