From 42e22c7c4f16d647fc586264c1cd30a18801e3d0 Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Tue, 1 Nov 2016 10:28:16 -0400 Subject: [PATCH] Revert "Disable MDC2 by default." This reverts commit ca1574cec20589885000d039eed3a9375fb29a0d. Not suitabled for a minor release as it breaks the ABI. Reviewed-by: Richard Levitte --- .travis.yml | 8 ++++---- CHANGES | 3 +-- Configure | 1 - INSTALL | 4 ++-- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6336a6fc7b..d044309b29 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ compiler: 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" @@ -37,7 +37,7 @@ matrix: 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" @@ -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-asan enable-rc5 enable-md2 enable-mdc2" + env: CONFIG_OPTS="no-asm enable-asan enable-rc5 enable-md2" - 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" diff --git a/CHANGES b/CHANGES index 17d444f288..dfff36f761 100644 --- a/CHANGES +++ b/CHANGES @@ -4,8 +4,7 @@ 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 diff --git a/Configure b/Configure index 7eb1769f7b..2da2a1a8c3 100755 --- a/Configure +++ b/Configure @@ -433,7 +433,6 @@ our %disabled = ( # "what" => "comment" "fuzz-afl" => "default", "heartbeats" => "default", "md2" => "default", - "mdc2" => "default", "msan" => "default", "rc5" => "default", "sctp" => "default", diff --git a/INSTALL b/INSTALL index 2fd80d8215..44b3a1ca21 100644 --- a/INSTALL +++ b/INSTALL @@ -474,12 +474,12 @@ enable- Build with support for the specified algorithm, where - is one of: md2, mdc2, or rc5. + is one of: md2 or rc5. no- Build without support for the specified algorithm, where 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. -- 2.25.1