提交 42e22c7c 编写于 作者: R Rich Salz

Revert "Disable MDC2 by default."

This reverts commit ca1574ce.
Not suitabled for a minor release as it breaks the ABI.
Reviewed-by: NRichard Levitte <levitte@openssl.org>
上级 f46661de
...@@ -28,7 +28,7 @@ compiler: ...@@ -28,7 +28,7 @@ compiler:
env: env:
- CONFIG_OPTS="" DESTDIR="_install" - 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-pic --strict-warnings" BUILDONLY="yes"
- CONFIG_OPTS="no-engine no-shared --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-stdio --strict-warnings" BUILDONLY="yes"
...@@ -37,7 +37,7 @@ matrix: ...@@ -37,7 +37,7 @@ matrix:
include: include:
- os: linux - os: linux
compiler: gcc 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 - os: linux
compiler: clang-3.6 compiler: clang-3.6
env: CONFIG_OPTS="enable-msan" env: CONFIG_OPTS="enable-msan"
...@@ -46,10 +46,10 @@ matrix: ...@@ -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" env: CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 enable-ssl3 enable-ssl3-method enable-nextprotoneg -fno-sanitize=alignment"
- os: linux - os: linux
compiler: clang-3.6 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 - os: linux
compiler: gcc-5 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 - os: linux
compiler: i686-w64-mingw32-gcc compiler: i686-w64-mingw32-gcc
env: CONFIG_OPTS="no-stdio" BUILDONLY="yes" env: CONFIG_OPTS="no-stdio" BUILDONLY="yes"
......
...@@ -4,8 +4,7 @@ ...@@ -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, *) 'openssl passwd' can now produce SHA256 and SHA512 based output,
using the algorithm defined in using the algorithm defined in
......
...@@ -433,7 +433,6 @@ our %disabled = ( # "what" => "comment" ...@@ -433,7 +433,6 @@ our %disabled = ( # "what" => "comment"
"fuzz-afl" => "default", "fuzz-afl" => "default",
"heartbeats" => "default", "heartbeats" => "default",
"md2" => "default", "md2" => "default",
"mdc2" => "default",
"msan" => "default", "msan" => "default",
"rc5" => "default", "rc5" => "default",
"sctp" => "default", "sctp" => "default",
......
...@@ -474,12 +474,12 @@ ...@@ -474,12 +474,12 @@
enable-<alg> enable-<alg>
Build with support for the specified algorithm, where <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> no-<alg>
Build without support for the specified algorithm, where Build without support for the specified algorithm, where
<alg> is one of: bf, blake2, camellia, cast, chacha, cmac, <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" rc2, rc4, rmd160, scrypt, seed or whirlpool. The "ripemd"
algorithm is deprecated and if used is synonymous with rmd160. algorithm is deprecated and if used is synonymous with rmd160.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册