diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-10-12 11:53:22 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-10-12 11:53:22 +0200 |
| commit | da60849fa19e17199fb4c3f464bb5a01598f054d (patch) | |
| tree | 3858bcef612b4a53c3399ed1c064d3a3dbdc0800 /ext/openssl/openssl.c | |
| parent | 66ecee624318d1e06c5f94b0bbeac20a65d5c7aa (diff) | |
| parent | 1e53e14bc31aec98a408e517c7c8493ef4bf80cd (diff) | |
| download | php-git-da60849fa19e17199fb4c3f464bb5a01598f054d.tar.gz | |
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Add missing X509 purpose constants
Diffstat (limited to 'ext/openssl/openssl.c')
| -rw-r--r-- | ext/openssl/openssl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index abaf88f15a..c14bedf862 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -1175,9 +1175,9 @@ 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); -#endif + 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); /* digest algorithm constants */ REGISTER_LONG_CONSTANT("OPENSSL_ALGO_SHA1", OPENSSL_ALGO_SHA1, CONST_CS|CONST_PERSISTENT); |