X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=ssl%2Fssl_algs.c;h=c4bf75040ae268b023a6a4ec8876ec7c7b54bd14;hp=faa7e82d18cb6013e9fff5690f72370a6d2b6af5;hb=995207bedcc58f2fa1bd7c460ee530b92c7dfbfe;hpb=eb47b2fb1365252db96ef244b46e3866ffa43330

diff --git a/ssl/ssl_algs.c b/ssl/ssl_algs.c
index faa7e82d18..c4bf75040a 100644
--- a/ssl/ssl_algs.c
+++ b/ssl/ssl_algs.c
@@ -94,6 +94,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
 	EVP_add_cipher(EVP_camellia_128_cbc());
@@ -106,7 +110,6 @@ int SSL_library_init(void)
   
 #ifndef OPENSSL_NO_MD5
 	EVP_add_digest(EVP_md5());
-	EVP_add_digest_alias(SN_md5,"ssl2-md5");
 	EVP_add_digest_alias(SN_md5,"ssl3-md5");
 #endif
 #ifndef OPENSSL_NO_SHA