Skip to content

Commit 0116864

Browse files
committed
Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0: Revert "Make build work with newer OpenSSL" [ci skip] Next release will be 8.0.28 [ci skip] Prepare for PHP 8.0.27 GA
2 parents 1f715f5 + 255e08a commit 0116864

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

ext/openssl/openssl.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1320,9 +1320,7 @@ PHP_MINIT_FUNCTION(openssl)
13201320
REGISTER_LONG_CONSTANT("OPENSSL_CMS_NOSIGS", CMS_NOSIGS, CONST_CS|CONST_PERSISTENT);
13211321

13221322
REGISTER_LONG_CONSTANT("OPENSSL_PKCS1_PADDING", RSA_PKCS1_PADDING, CONST_CS|CONST_PERSISTENT);
1323-
#ifdef RSA_SSLV23_PADDING
13241323
REGISTER_LONG_CONSTANT("OPENSSL_SSLV23_PADDING", RSA_SSLV23_PADDING, CONST_CS|CONST_PERSISTENT);
1325-
#endif
13261324
REGISTER_LONG_CONSTANT("OPENSSL_NO_PADDING", RSA_NO_PADDING, CONST_CS|CONST_PERSISTENT);
13271325
REGISTER_LONG_CONSTANT("OPENSSL_PKCS1_OAEP_PADDING", RSA_PKCS1_OAEP_PADDING, CONST_CS|CONST_PERSISTENT);
13281326

0 commit comments

Comments
 (0)