diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-12-27 18:03:36 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-12-27 18:03:36 +0000 |
| commit | 5e9540f77dc5fba67ee69e5a38b79ced28f42368 (patch) | |
| tree | 50533775987fba291d7fe43813005a3119606816 | |
| parent | 213844de497086e512da2d2d94b1705abd985c5a (diff) | |
| download | php-git-5e9540f77dc5fba67ee69e5a38b79ced28f42368.tar.gz | |
Add AES CCM ciphers when linked with OpenSSL 1.0.1
These ciphers are not added by OpenSSL_add_all_algorithms in 1.0.1
| -rw-r--r-- | ext/openssl/openssl.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 5877b9ffaf..c2ea6e27a5 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -1172,6 +1172,12 @@ PHP_MINIT_FUNCTION(openssl) OpenSSL_add_all_digests(); OpenSSL_add_all_algorithms(); +#if !defined(OPENSSL_NO_AES) && defined(EVP_CIPH_CCM_MODE) && OPENSSL_VERSION_NUMBER < 0x100020000 + EVP_add_cipher(EVP_aes_128_ccm()); + EVP_add_cipher(EVP_aes_192_ccm()); + EVP_add_cipher(EVP_aes_256_ccm()); +#endif + SSL_load_error_strings(); /* register a resource id number with OpenSSL so that we can map SSL -> stream structures in |