The branch master has been updated
via ca1574cec20589885000d039eed3a9375fb29a0d (commit)
from be1f4812111aa76f12db91d9059ead3b43314b4c (commit)
- Log -----------------------------------------------------------------
commit ca1574cec20589885000d039eed3a9375fb29a0d
Author: Rich Salz <rs...@openssl.org>
Date: Mon Oct 31 12:48:16 2016 -0400
Disable MDC2 by default.
Reviewed-by: Tim Hudson <t...@openssl.org>
Reviewed-by: Matt Caswell <m...@openssl.org>
-----------------------------------------------------------------------
Summary of changes:
.travis.yml | 8 ++++----
CHANGES | 3 ++-
Configure | 1 +
INSTALL | 4 ++--
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index d044309..6336a6f 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"
+ - CONFIG_OPTS="--debug no-shared enable-crypto-mdebug enable-rc5
enable-md2 enable-mdc2"
- 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-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-mdc2 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"
+ env: CONFIG_OPTS="no-asm enable-asan enable-rc5 enable-md2
enable-mdc2"
- os: linux
compiler: gcc-5
- env: CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2
-DPEDANTIC"
+ env: CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2
enable-mdc2 -DPEDANTIC"
- os: linux
compiler: i686-w64-mingw32-gcc
env: CONFIG_OPTS="no-stdio" BUILDONLY="yes"
diff --git a/CHANGES b/CHANGES
index dfff36f..17d444f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,7 +4,8 @@
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 2da2a1a..7eb1769 100755
--- a/Configure
+++ b/Configure
@@ -433,6 +433,7 @@ 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 44b3a1c..2fd80d8 100644
--- a/INSTALL
+++ b/INSTALL
@@ -474,12 +474,12 @@
enable-<alg>
Build with support for the specified algorithm, where <alg>
- is one of: md2 or rc5.
+ is one of: md2, mdc2, or rc5.
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, mdc2, ocb, poly1305,
+ des, dh, dsa, ecdh, ecdsa, idea, md4, ocb, poly1305,
rc2, rc4, rmd160, scrypt, seed or whirlpool. The "ripemd"
algorithm is deprecated and if used is synonymous with
rmd160.
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
