From 69ac13c2e990c118f5a0fb7f67650351e4a6d7d6 Mon Sep 17 00:00:00 2001 From: John Safranek Date: Thu, 15 Oct 2020 11:37:31 -0700 Subject: [PATCH] wolfSSH Update Originally, wolfSSH required some algorithms to be enabled in wolfCrypt to work correctly. wolfSSH is now more flexible with how wolfCrypt is configured, and these combinations do not have to be restricted. --- configure.ac | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index a022b86ae..41bac3db6 100644 --- a/configure.ac +++ b/configure.ac @@ -5485,13 +5485,7 @@ AS_IF([test "x$ENABLED_NULL_CIPHER" = "xno" && \ # This will let you know if you enabled wolfSSH but have any of the prereqs # disabled. Some of these options, disabling them adds things to the FLAGS and # you need to check and add items in two places depending on the option. -AS_IF([test "x$ENABLED_WOLFSSH" = "xyes"], - [AS_IF([test "x$ENABLED_WPAS" = "xno"],[AM_CFLAGS="-DWOLFSSL_PUBLIC_MP $AM_CFLAGS"]) - AS_IF([test "x$ENABLED_AESGCM" = "xno"],[AC_MSG_ERROR([cannot enable wolfSSH with AES-GCM disabled])]) - AS_IF([test "x$ENABLED_ECC" = "xno"],[AC_MSG_ERROR([cannot enable wolfSSH with ECC disabled])]) - AS_IF([test "x$ENABLED_SHA" = "xno"],[AC_MSG_ERROR([cannot enable wolfSSH with SHA-1 disabled])]) - AS_IF([test "x$ENABLED_SHA512" = "xno"],[AC_MSG_ERROR([cannot enable wolfSSH with SHA-512/384 disabled])]) - ]) +AS_IF([test "x$ENABLED_WOLFSSH" = "xyes"],[AS_IF([test "x$ENABLED_WPAS" = "xno"],[AM_CFLAGS="-DWOLFSSL_PUBLIC_MP $AM_CFLAGS"])]) if test "x$ENABLED_OPENSSLCOEXIST" = "xyes"; then if test "x$ENABLED_OPENSSLALL" = "xyes"; then