mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request from ejohnstown/ssh-kdf-inlines

Browse Source 
Build Fixes
This commit is contained in:
David Garske 2023-02-04 10:37:16 -08:00 committed by GitHub
commit 3cdda2adf0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
configure.ac
wolfssl/wolfcrypt
settings.h

10
configure.ac

@ -3956,6 +3956,11 @@ then
AC_MSG_ERROR([please disable dsa if disabling asn.]) AC_MSG_ERROR([please disable dsa if disabling asn.])
fi 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) # No Big Int (ASN, DSA, RSA, DH and ECC need bigint)
if test "$ENABLED_ASN" = "no" && test "$ENABLED_DSA" = "no" && \ if test "$ENABLED_ASN" = "no" && test "$ENABLED_DSA" = "no" && \
test "$ENABLED_DH" = "no" && test "$ENABLED_ECC" = "no" && \ test "$ENABLED_DH" = "no" && test "$ENABLED_ECC" = "no" && \
@ -6289,11 +6294,6 @@ then
AC_MSG_ERROR([please enable psk if disabling asn.]) AC_MSG_ERROR([please enable psk if disabling asn.])
fi 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" if test "$ENABLED_AFALG" = "yes"
then then
# for TLS connections the intermediate hash needs to store buffer # for TLS connections the intermediate hash needs to store buffer

5
wolfssl/wolfcrypt/settings.h

@ -2605,9 +2605,12 @@ extern void uITRON4_free(void *p) ;
#define WOLFSSL_NO_XOR_OPS #define WOLFSSL_NO_XOR_OPS
#endif #endif
#if defined(NO_ASN) && defined(WOLFCRYPT_ONLY) #if defined(NO_ASN) && defined(WOLFCRYPT_ONLY) && !defined(WOLFSSL_WOLFSSH)
#undef WOLFSSL_NO_INT_ENCODE #undef WOLFSSL_NO_INT_ENCODE
#define WOLFSSL_NO_INT_ENCODE #define WOLFSSL_NO_INT_ENCODE
#endif
#if defined(NO_ASN) && defined(WOLFCRYPT_ONLY)
#undef WOLFSSL_NO_INT_DECODE #undef WOLFSSL_NO_INT_DECODE
#define WOLFSSL_NO_INT_DECODE #define WOLFSSL_NO_INT_DECODE
#endif #endif