Commit 4e9de7aa authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

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.
parent fc007d02

Configure

+3 −3
Original line number Diff line number Diff line
@@ -660,6 +660,7 @@ my $perl; 
my %disabled = ( # "what"         => "comment" [or special keyword "experimental"]

		 "gmp"		  => "default",

                 "jpake"          => "experimental",

                 "md2"            => "default",

		 "mdc2"           => "default",

                 "rc5"            => "default",

		 "rfc3779"	  => "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).

crypto/evp/c_alld.c

+0 −3
Original line number Diff line number Diff line
@@ -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

ssl/ssl_algs.c

+0 −3
Original line number Diff line number Diff line
@@ -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");