From 0ee7d7cc1710baca26c2a0928daa1dc427d89324 Mon Sep 17 00:00:00 2001 From: John Safranek Date: Thu, 15 Sep 2016 12:19:32 -0700 Subject: [PATCH] 1. Add DES3 enable to full commit test. 2. Added DES3 to the list of FIPS prereqs. --- commit-tests.sh | 2 +- configure.ac | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/commit-tests.sh b/commit-tests.sh index d7a95af48..74ef1fa6a 100755 --- a/commit-tests.sh +++ b/commit-tests.sh @@ -23,7 +23,7 @@ RESULT=$? # make sure full config is ok echo -e "\n\nTesting full config as well...\n\n" -./configure --enable-opensslextra --enable-dh --enable-ecc --enable-dtls --enable-aesgcm --enable-aesccm --enable-hc128 --enable-sniffer --enable-psk --enable-rabbit --enable-camellia --enable-sha512 --enable-crl --enable-ocsp --enable-savesession --enable-savecert --enable-atomicuser --enable-pkcallbacks --enable-scep; +./configure --enable-opensslextra --enable-des3 --enable-dh --enable-ecc --enable-dtls --enable-aesgcm --enable-aesccm --enable-hc128 --enable-sniffer --enable-psk --enable-rabbit --enable-camellia --enable-sha512 --enable-crl --enable-ocsp --enable-savesession --enable-savecert --enable-atomicuser --enable-pkcallbacks --enable-scep; RESULT=$? [ $RESULT -ne 0 ] && echo -e "\n\nFull config ./configure failed" && exit 1 diff --git a/configure.ac b/configure.ac index d2707f6f5..d356c1c04 100644 --- a/configure.ac +++ b/configure.ac @@ -1491,6 +1491,11 @@ then AM_CFLAGS="$AM_CFLAGS -DHAVE_AESGCM" AM_CONDITIONAL([BUILD_SHA512], [test "x$ENABLED_SHA512" = "xyes"]) fi + # requires DES3 + if test "x$ENABLED_DES3" = "xno" + then + ENABLED_DES3="yes" + fi AM_CFLAGS="$AM_CFLAGS -DHAVE_FIPS" fi