automatically use no-mdc2 if no-des is requested.

diff --git a/Configure b/Configure
index 30927aeed7bca6f60b33e9e6dcb4f4f35d5f02c9..e16ad081ccd7832cdc32561afcde11bc9e45ecb5 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -364,6 +364,12 @@ foreach (@ARGV)
                $algo =~ tr/[a-z]/[A-Z]/;
                $flags .= "-DNO_$algo ";
                $depflags .= "-DNO_$algo ";
                $algo =~ tr/[a-z]/[A-Z]/;
                $flags .= "-DNO_$algo ";
                $depflags .= "-DNO_$algo ";

+               if ($algo eq "DES")
+                       {
+                       $options .= " no-mdc2";
+                       $flags .= "-DNO_MDC2 ";
+                       $depflags .= "-DNO_MDC2 ";
+                       }

                }
        elsif (/^386$/)
                { $processor=386; }
                }
        elsif (/^386$/)
                { $processor=386; }

diff --git a/crypto/objects/Makefile.ssl b/crypto/objects/Makefile.ssl
index a3a15c13c1f73f57aa79abaf1adb123f8f93989f..01bff3ece5f0b8fa49489afe7cbc0df72eb1d679 100644 (file)
--- a/crypto/objects/Makefile.ssl
+++ b/crypto/objects/Makefile.ssl
@@ -93,7 +93,7 @@ obj_dat.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 obj_dat.o: ../../include/openssl/lhash.h ../../include/openssl/objects.h
 obj_dat.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 obj_dat.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 obj_dat.o: ../../include/openssl/lhash.h ../../include/openssl/objects.h
 obj_dat.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 obj_dat.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

-obj_dat.o: ../cryptlib.h obj_dat.h
+obj_dat.o: ../cryptlib.h

 obj_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 obj_err.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
 obj_err.o: ../../include/openssl/err.h ../../include/openssl/objects.h
 obj_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 obj_err.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
 obj_err.o: ../../include/openssl/err.h ../../include/openssl/objects.h