diff options
| author | Tjerk Meesters <datibbaw@php.net> | 2015-06-26 06:03:29 +0800 |
|---|---|---|
| committer | Tjerk Meesters <datibbaw@php.net> | 2015-06-26 06:03:29 +0800 |
| commit | 03a670eaaa2b89f7b98b62908502ac5736dac2eb (patch) | |
| tree | 159bb4b666648a0dcf46b363f16dacb0c9b93c42 /ext/openssl/php_openssl.h | |
| parent | 7ceb47477dbaac39d4ee42c3070463e229d2f090 (diff) | |
| parent | 2ff3dafccfa4fd0bc031d5165f84593d092148d2 (diff) | |
| download | php-git-03a670eaaa2b89f7b98b62908502ac5736dac2eb.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed #69882: OpenSSL error "key values mismatch" after openssl_pkcs12_read with extra certs
Diffstat (limited to 'ext/openssl/php_openssl.h')
| -rw-r--r-- | ext/openssl/php_openssl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/openssl/php_openssl.h b/ext/openssl/php_openssl.h index 804e5cf25a..5ff2353777 100644 --- a/ext/openssl/php_openssl.h +++ b/ext/openssl/php_openssl.h @@ -32,6 +32,8 @@ extern zend_module_entry openssl_module_entry; #define OPENSSL_RAW_DATA 1 #define OPENSSL_ZERO_PADDING 2 +#define OPENSSL_ERROR_X509_PRIVATE_KEY_VALUES_MISMATCH 0x0B080074 + /* Used for client-initiated handshake renegotiation DoS protection*/ #define OPENSSL_DEFAULT_RENEG_LIMIT 2 #define OPENSSL_DEFAULT_RENEG_WINDOW 300 |