diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-04-18 19:21:46 +0200 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-04-18 19:21:46 +0200 |
| commit | 206895afae413df9a3961ce6793ce295babb5920 (patch) | |
| tree | 0b16a8466e9f0f054176ecfb2fa24a6b942fcec6 /drivers/builtin_openssl2/ssl/ssl_algs.c | |
| parent | 336cbfa7b63721757874f0fc5c33ec5dd31c5076 (diff) | |
| parent | e97922f22038e9049ed4c2db5b3736dfaa0edde3 (diff) | |
Merge pull request #4329 from mrezai/openssl-1.0.2g
Update OpenSSL to version 1.0.2g
Diffstat (limited to 'drivers/builtin_openssl2/ssl/ssl_algs.c')
| -rw-r--r-- | drivers/builtin_openssl2/ssl/ssl_algs.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/builtin_openssl2/ssl/ssl_algs.c b/drivers/builtin_openssl2/ssl/ssl_algs.c index 151422ae77..e6f515ff62 100644 --- a/drivers/builtin_openssl2/ssl/ssl_algs.c +++ b/drivers/builtin_openssl2/ssl/ssl_algs.c @@ -95,6 +95,10 @@ int SSL_library_init(void) EVP_add_cipher(EVP_aes_128_cbc_hmac_sha1()); EVP_add_cipher(EVP_aes_256_cbc_hmac_sha1()); # endif +# if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA256) + EVP_add_cipher(EVP_aes_128_cbc_hmac_sha256()); + EVP_add_cipher(EVP_aes_256_cbc_hmac_sha256()); +# endif #endif #ifndef OPENSSL_NO_CAMELLIA |