From: Nikita Popov <nikita.ppv@gmail.com>
Date: Mon, 12 Oct 2020 10:56:21 +0000 (+0200)
Subject: Merge branch 'PHP-7.4' into PHP-8.0
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2cd2ca8884d064643d1e7d667f86959956a14a00;p=php

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Revert "Add missing X509 purpose constants"
---

2cd2ca8884d064643d1e7d667f86959956a14a00
diff --cc ext/openssl/openssl.c
index c14bedf862,84a74bd1ca..abaf88f15a
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@@ -1175,11 -1483,11 +1175,11 @@@ PHP_MINIT_FUNCTION(openssl
  	REGISTER_LONG_CONSTANT("X509_PURPOSE_SMIME_SIGN", X509_PURPOSE_SMIME_SIGN, CONST_CS|CONST_PERSISTENT);
  	REGISTER_LONG_CONSTANT("X509_PURPOSE_SMIME_ENCRYPT", X509_PURPOSE_SMIME_ENCRYPT, CONST_CS|CONST_PERSISTENT);
  	REGISTER_LONG_CONSTANT("X509_PURPOSE_CRL_SIGN", X509_PURPOSE_CRL_SIGN, CONST_CS|CONST_PERSISTENT);
+ #ifdef X509_PURPOSE_ANY
  	REGISTER_LONG_CONSTANT("X509_PURPOSE_ANY", X509_PURPOSE_ANY, CONST_CS|CONST_PERSISTENT);
- 	REGISTER_LONG_CONSTANT("X509_PURPOSE_OCSP_HELPER", X509_PURPOSE_OCSP_HELPER, CONST_CS|CONST_PERSISTENT);
- 	REGISTER_LONG_CONSTANT("X509_PURPOSE_TIMESTAMP_SIGN", X509_PURPOSE_TIMESTAMP_SIGN, CONST_CS|CONST_PERSISTENT);
+ #endif
  
 -	/* signature algorithm constants */
 +	/* digest algorithm constants */
  	REGISTER_LONG_CONSTANT("OPENSSL_ALGO_SHA1", OPENSSL_ALGO_SHA1, CONST_CS|CONST_PERSISTENT);
  	REGISTER_LONG_CONSTANT("OPENSSL_ALGO_MD5", OPENSSL_ALGO_MD5, CONST_CS|CONST_PERSISTENT);
  	REGISTER_LONG_CONSTANT("OPENSSL_ALGO_MD4", OPENSSL_ALGO_MD4, CONST_CS|CONST_PERSISTENT);