EVP_add_digest_alias additions to SS_library_init

[openssl.git] / ssl / ssl_algs.c

diff --git a/ssl/ssl_algs.c b/ssl/ssl_algs.c
index 92ec322dae8b46eab03d36f2b4a9be07e27251be..dde8918fe0e3d992a13a7dc9210beafe18a5baab 100644 (file)
--- a/ssl/ssl_algs.c
+++ b/ssl/ssl_algs.c
@@ -57,11 +57,11 @@
  */
 
 #include <stdio.h>
-#include "objects.h"
-#include "lhash.h"
+#include <openssl/objects.h>
+#include <openssl/lhash.h>
 #include "ssl_locl.h"
 
-void SSLeay_add_ssl_algorithms()
+int SSL_library_init(void)
        {
 #ifndef NO_DES
        EVP_add_cipher(EVP_des_cbc());
@@ -71,26 +71,30 @@ void SSLeay_add_ssl_algorithms()
        EVP_add_cipher(EVP_idea_cbc());
 #endif
 #ifndef NO_RC4
-        EVP_add_cipher(EVP_rc4());
+       EVP_add_cipher(EVP_rc4());
 #endif  
 #ifndef NO_RC2
-        EVP_add_cipher(EVP_rc2_cbc());
+       EVP_add_cipher(EVP_rc2_cbc());
 #endif  
 
 #ifndef NO_MD2
-        EVP_add_digest(EVP_md2());
+       EVP_add_digest(EVP_md2());
 #endif
 #ifndef 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 NO_SHA1
+#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_SHA1) && !defined(NO_DSA)
+#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 */
@@ -98,5 +102,6 @@ void SSLeay_add_ssl_algorithms()
        EVP_add_digest(EVP_sha());
        EVP_add_digest(EVP_dss());
 #endif
+       return(1);
        }