Update of linux-ppc. Contributed by MATSUURA Takanori

[openssl.git] / ssl / ssl_algs.c

diff --git a/ssl/ssl_algs.c b/ssl/ssl_algs.c
index a91ee6d22e4581c429a47c8e1a447d730a806727..549c3e8d5e9873c7e6daee0d83d9b0979d81b87f 100644 (file)
--- a/ssl/ssl_algs.c
+++ b/ssl/ssl_algs.c
@@ -63,6 +63,7 @@
 
 int SSL_library_init(void)
        {
+
 #ifndef NO_DES
        EVP_add_cipher(EVP_des_cbc());
        EVP_add_cipher(EVP_des_ede3_cbc());
@@ -75,8 +76,12 @@ int SSL_library_init(void)
 #endif  
 #ifndef NO_RC2
        EVP_add_cipher(EVP_rc2_cbc());
-#endif  
-
+#endif
+#ifndef NO_AES
+       EVP_add_cipher(EVP_aes_128_cbc());
+       EVP_add_cipher(EVP_aes_192_cbc());
+       EVP_add_cipher(EVP_aes_256_cbc());
+#endif
 #ifndef NO_MD2
        EVP_add_digest(EVP_md2());
 #endif
@@ -88,11 +93,14 @@ int SSL_library_init(void)
 #ifndef NO_SHA
        EVP_add_digest(EVP_sha1()); /* RSA with sha1 */
        EVP_add_digest_alias(SN_sha1,"ssl3-sha1");
+       EVP_add_digest_alias(SN_sha1WithRSAEncryption,SN_sha1WithRSA);
 #endif
 #if !defined(NO_SHA) && !defined(NO_DSA)
        EVP_add_digest(EVP_dss1()); /* DSA with sha1 */
+       EVP_add_digest_alias(SN_dsaWithSHA1,SN_dsaWithSHA1_2);
+       EVP_add_digest_alias(SN_dsaWithSHA1,"DSS1");
+       EVP_add_digest_alias(SN_dsaWithSHA1,"dss1");
 #endif
-
        /* If you want support for phased out ciphers, add the following */
 #if 0
        EVP_add_digest(EVP_sha());