diff --git a/configure.ac b/configure.ac index add30560c..a9ba3263b 100644 --- a/configure.ac +++ b/configure.ac @@ -3956,6 +3956,11 @@ then AC_MSG_ERROR([please disable dsa if disabling asn.]) fi +if test "x$ENABLED_ECC" != "xno" && test "x$ENABLED_ASN" = "xno" +then + AC_MSG_ERROR([please disable ecc if disabling asn.]) +fi + # No Big Int (ASN, DSA, RSA, DH and ECC need bigint) if test "$ENABLED_ASN" = "no" && test "$ENABLED_DSA" = "no" && \ test "$ENABLED_DH" = "no" && test "$ENABLED_ECC" = "no" && \ @@ -6289,11 +6294,6 @@ then AC_MSG_ERROR([please enable psk if disabling asn.]) fi - if test "x$ENABLED_ECC" != "xno" && test "x$ENABLED_ASN" = "xno" - then - AC_MSG_ERROR([please disable ecc if disabling asn.]) - fi - if test "$ENABLED_AFALG" = "yes" then # for TLS connections the intermediate hash needs to store buffer diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h index 702d5b36d..8bb3d87f7 100644 --- a/wolfssl/wolfcrypt/settings.h +++ b/wolfssl/wolfcrypt/settings.h @@ -2605,9 +2605,12 @@ extern void uITRON4_free(void *p) ; #define WOLFSSL_NO_XOR_OPS #endif -#if defined(NO_ASN) && defined(WOLFCRYPT_ONLY) +#if defined(NO_ASN) && defined(WOLFCRYPT_ONLY) && !defined(WOLFSSL_WOLFSSH) #undef WOLFSSL_NO_INT_ENCODE #define WOLFSSL_NO_INT_ENCODE +#endif + +#if defined(NO_ASN) && defined(WOLFCRYPT_ONLY) #undef WOLFSSL_NO_INT_DECODE #define WOLFSSL_NO_INT_DECODE #endif