summaryrefslogtreecommitdiffstats
path: root/crypto/evp
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2014-02-02 00:05:02 +0100
committerAndy Polyakov <appro@openssl.org>2014-02-02 00:05:02 +0100
commit9071b36d9a6fdb855304653e3a857c035eb05760 (patch)
tree1404dcc82c149fdffc34e12d872be1f1b7d29f1b /crypto/evp
parenteb6af20d2e8e3219876a1eb290dc6f1d5d25b436 (diff)
Add AES-NI+SHA256 stitch registrations (from master).
Diffstat (limited to 'crypto/evp')
-rw-r--r--crypto/evp/c_allc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/crypto/evp/c_allc.c b/crypto/evp/c_allc.c
index e8718f4357..4cfe5a9835 100644
--- a/crypto/evp/c_allc.c
+++ b/crypto/evp/c_allc.c
@@ -206,6 +206,10 @@ void OpenSSL_add_all_ciphers(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