Revert "Disable MDC2 by default."
authorRich Salz <rsalz@openssl.org>
Tue, 1 Nov 2016 14:28:16 +0000 (10:28 -0400)
committerRich Salz <rsalz@openssl.org>
Tue, 1 Nov 2016 14:43:05 +0000 (10:43 -0400)
This reverts commit ca1574cec20589885000d039eed3a9375fb29a0d.
Not suitabled for a minor release as it breaks the ABI.

Reviewed-by: Richard Levitte <levitte@openssl.org>
.travis.yml
CHANGES
Configure
INSTALL

index 6336a6fc7bf5fb1c7a4934ee893e36f61e91a7a6..d044309b2968d05636a9de34a8b2bd718c12713c 100644 (file)
@@ -28,7 +28,7 @@ compiler:
 
 env:
     - CONFIG_OPTS="" DESTDIR="_install"
 
 env:
     - CONFIG_OPTS="" DESTDIR="_install"
-    - CONFIG_OPTS="--debug no-shared enable-crypto-mdebug enable-rc5 enable-md2 enable-mdc2"
+    - CONFIG_OPTS="--debug no-shared enable-crypto-mdebug enable-rc5 enable-md2"
     - CONFIG_OPTS="no-pic --strict-warnings" BUILDONLY="yes"
     - CONFIG_OPTS="no-engine no-shared --strict-warnings" BUILDONLY="yes"
     - CONFIG_OPTS="no-stdio --strict-warnings" BUILDONLY="yes"
     - CONFIG_OPTS="no-pic --strict-warnings" BUILDONLY="yes"
     - CONFIG_OPTS="no-engine no-shared --strict-warnings" BUILDONLY="yes"
     - CONFIG_OPTS="no-stdio --strict-warnings" BUILDONLY="yes"
@@ -37,7 +37,7 @@ matrix:
     include:
         - os: linux
           compiler: gcc
     include:
         - os: linux
           compiler: gcc
-          env: CONFIG_OPTS="--debug --coverage no-asm enable-rc5 enable-md2 enable-mdc2 enable-ec_nistp_64_gcc_128 enable-ssl3 enable-ssl3-method enable-nextprotoneg enable-weak-ssl-ciphers" COVERALLS="yes"
+          env: CONFIG_OPTS="--debug --coverage no-asm enable-rc5 enable-md2 enable-ec_nistp_64_gcc_128 enable-ssl3 enable-ssl3-method enable-nextprotoneg enable-weak-ssl-ciphers" COVERALLS="yes"
         - os: linux
           compiler: clang-3.6
           env: CONFIG_OPTS="enable-msan"
         - os: linux
           compiler: clang-3.6
           env: CONFIG_OPTS="enable-msan"
@@ -46,10 +46,10 @@ matrix:
           env: CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 enable-ssl3 enable-ssl3-method enable-nextprotoneg -fno-sanitize=alignment"
         - os: linux
           compiler: clang-3.6
           env: CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 enable-ssl3 enable-ssl3-method enable-nextprotoneg -fno-sanitize=alignment"
         - os: linux
           compiler: clang-3.6
-          env: CONFIG_OPTS="no-asm enable-asan enable-rc5 enable-md2 enable-mdc2"
+          env: CONFIG_OPTS="no-asm enable-asan enable-rc5 enable-md2"
         - os: linux
           compiler: gcc-5
         - os: linux
           compiler: gcc-5
-          env: CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 enable-mdc2 -DPEDANTIC"
+          env: CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 -DPEDANTIC"
         - os: linux
           compiler: i686-w64-mingw32-gcc
           env: CONFIG_OPTS="no-stdio" BUILDONLY="yes"
         - os: linux
           compiler: i686-w64-mingw32-gcc
           env: CONFIG_OPTS="no-stdio" BUILDONLY="yes"
diff --git a/CHANGES b/CHANGES
index 17d444f2889ae793dae68fe5b69c1d0c5e2ea356..dfff36f7611c517e1126f8a4f98746f7374ce91a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,8 +4,7 @@
 
  Changes between 1.1.0a and 1.1.1 [xx XXX xxxx]
 
 
  Changes between 1.1.0a and 1.1.1 [xx XXX xxxx]
 
-  *) MDC2 is now disabled by default.
-     [Rich Salz]
+  *)
 
   *) 'openssl passwd' can now produce SHA256 and SHA512 based output,
      using the algorithm defined in
 
   *) 'openssl passwd' can now produce SHA256 and SHA512 based output,
      using the algorithm defined in
index 7eb1769f7b7a45153b4ae63ff2eb7c70f8fd3654..2da2a1a8c3af8cb2ed972763a20207b84af493c8 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -433,7 +433,6 @@ our %disabled = ( # "what"         => "comment"
                  "fuzz-afl"            => "default",
                  "heartbeats"          => "default",
                  "md2"                 => "default",
                  "fuzz-afl"            => "default",
                  "heartbeats"          => "default",
                  "md2"                 => "default",
-                 "mdc2"                => "default",
                   "msan"                => "default",
                  "rc5"                 => "default",
                  "sctp"                => "default",
                   "msan"                => "default",
                  "rc5"                 => "default",
                  "sctp"                => "default",
diff --git a/INSTALL b/INSTALL
index 2fd80d821512501dfa26ee548df16683c1438e3d..44b3a1ca2112df350f638b403f708a11c53b6686 100644 (file)
--- a/INSTALL
+++ b/INSTALL
 
   enable-<alg>
                    Build with support for the specified algorithm, where <alg>
 
   enable-<alg>
                    Build with support for the specified algorithm, where <alg>
-                   is one of: md2, mdc2, or rc5.
+                   is one of: md2 or rc5.
 
   no-<alg>
                    Build without support for the specified algorithm, where
                    <alg> is one of: bf, blake2, camellia, cast, chacha, cmac,
 
   no-<alg>
                    Build without support for the specified algorithm, where
                    <alg> is one of: bf, blake2, camellia, cast, chacha, cmac,
-                   des, dh, dsa, ecdh, ecdsa, idea, md4, ocb, poly1305,
+                   des, dh, dsa, ecdh, ecdsa, idea, md4, mdc2, ocb, poly1305,
                    rc2, rc4, rmd160, scrypt, seed or whirlpool. The "ripemd"
                    algorithm is deprecated and if used is synonymous with rmd160.
 
                    rc2, rc4, rmd160, scrypt, seed or whirlpool. The "ripemd"
                    algorithm is deprecated and if used is synonymous with rmd160.