From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 8 Jul 2009 08:49:17 +0000 (+0000)
Subject: Delete MD2 from algorithm tables as in 0.9.8-stable. However since this is
X-Git-Tag: OpenSSL-fips-2_0-rc1~1604
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4e9de7aa3a12712d08b014af49a8ea54e9187cec;p=oweals%2Fopenssl.git

Delete MD2 from algorithm tables as in 0.9.8-stable. However since this is
a new branch we can also disable it by default.
---

diff --git a/Configure b/Configure
index 13d2f294b6..24753273c5 100755
--- a/Configure
+++ b/Configure
@@ -660,7 +660,8 @@ my $perl;
 my %disabled = ( # "what"         => "comment" [or special keyword "experimental"]
 		 "gmp"		  => "default",
                  "jpake"          => "experimental",
-                 "mdc2"           => "default",
+                 "md2"            => "default",
+		 "mdc2"           => "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"):
-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).
diff --git a/crypto/evp/c_alld.c b/crypto/evp/c_alld.c
index aa565a652d..311e1fe2f8 100644
--- a/crypto/evp/c_alld.c
+++ b/crypto/evp/c_alld.c
@@ -64,9 +64,6 @@
 
 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
diff --git a/ssl/ssl_algs.c b/ssl/ssl_algs.c
index bd68999a5a..640f6cff5c 100644
--- a/ssl/ssl_algs.c
+++ b/ssl/ssl_algs.c
@@ -91,9 +91,6 @@ int SSL_library_init(void)
 	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");