Delete MD2 from algorithm tables and default compilation.
authorDr. Stephen Henson <steve@openssl.org>
Wed, 8 Jul 2009 08:50:53 +0000 (08:50 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Wed, 8 Jul 2009 08:50:53 +0000 (08:50 +0000)
Configure
crypto/evp/c_alld.c
ssl/ssl_algs.c

index 3123631..aa0ea83 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -660,7 +660,8 @@ my $perl;
 my %disabled = ( # "what"         => "comment" [or special keyword "experimental"]
                 "gmp"            => "default",
                  "jpake"          => "experimental",
 my %disabled = ( # "what"         => "comment" [or special keyword "experimental"]
                 "gmp"            => "default",
                  "jpake"          => "experimental",
-                 "mdc2"           => "default",
+                 "md2"            => "default",
+                "mdc2"           => "default",
                  "rc5"            => "default",
                 "rfc3779"        => "default",
                  "shared"         => "default",
                  "rc5"            => "default",
                 "rfc3779"        => "default",
                  "shared"         => "default",
@@ -672,8 +673,7 @@ my @experimental = ();
 
 # This is what $depflags will look like with the above defaults
 # (we need this to see if we should advise the user to run "make depend"):
 
 # This is what $depflags will look like with the above defaults
 # (we need this to see if we should advise the user to run "make depend"):
-my $default_depflags = " -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_STORE";
-
+my $default_depflags = " -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_STORE";
 
 # Explicit "no-..." options will be collected in %disabled along with the defaults.
 # To remove something from %disabled, use "enable-foo" (unless it's experimental).
 
 # Explicit "no-..." options will be collected in %disabled along with the defaults.
 # To remove something from %disabled, use "enable-foo" (unless it's experimental).
index aa565a6..311e1fe 100644 (file)
@@ -64,9 +64,6 @@
 
 void OpenSSL_add_all_digests(void)
        {
 
 void OpenSSL_add_all_digests(void)
        {
-#ifndef OPENSSL_NO_MD2
-       EVP_add_digest(EVP_md2());
-#endif
 #ifndef OPENSSL_NO_MD4
        EVP_add_digest(EVP_md4());
 #endif
 #ifndef OPENSSL_NO_MD4
        EVP_add_digest(EVP_md4());
 #endif
index bd68999..640f6cf 100644 (file)
@@ -91,9 +91,6 @@ int SSL_library_init(void)
        EVP_add_cipher(EVP_seed_cbc());
 #endif
   
        EVP_add_cipher(EVP_seed_cbc());
 #endif
   
-#ifndef OPENSSL_NO_MD2
-       EVP_add_digest(EVP_md2());
-#endif
 #ifndef OPENSSL_NO_MD5
        EVP_add_digest(EVP_md5());
        EVP_add_digest_alias(SN_md5,"ssl2-md5");
 #ifndef OPENSSL_NO_MD5
        EVP_add_digest(EVP_md5());
        EVP_add_digest_alias(SN_md5,"ssl2-md5");