Commit 42e22c7c authored by Rich Salz's avatar Rich Salz
Browse files

Revert "Disable MDC2 by default." 



This reverts commit ca1574ce.
Not suitabled for a minor release as it breaks the ABI.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent f46661de

.travis.yml

+4 −4
Original line number Diff line number Diff line
@@ -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"

CHANGES

+1 −2
Original line number Diff line number Diff line
@@ -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

































Configure



+0
−1






























Original line number
Diff line number
Diff line








@@ -433,7 +433,6 @@ our %disabled = ( # "what"         => "comment"













		  "fuzz-afl"		=> "default",















		  "heartbeats"          => "default",















		  "md2"                 => "default",













		  "mdc2"                => "default",















                  "msan"                => "default",















		  "rc5"                 => "default",















		  "sctp"                => "default",

































INSTALL



+2
−2






























Original line number
Diff line number
Diff line








@@ -474,12 +474,12 @@





























  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,













                   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.