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

remove pkcs7 requirement of x963kdf when ecc is disabled

Browse Source
This commit is contained in:
Jacob Barthelmeh 2018-03-19 10:08:46 -06:00
parent 465f1d491f
commit 467608b6c9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -3957,7 +3957,7 @@ then
ENABLED_AESKEYWRAP="yes"
AM_CFLAGS="$AM_CFLAGS -DHAVE_AES_KEYWRAP -DWOLFSSL_AES_DIRECT"
fi
if test "x$ENABLED_X963KDF" = "xno"
if test "x$ENABLED_X963KDF" = "xno" && test "$ENABLED_ECC" = "yes"
then
ENABLED_X963KDF="yes"
AM_CFLAGS="$AM_CFLAGS -DHAVE_X963_KDF"

2
wolfssl/wolfcrypt/settings.h
View File

@ -1564,7 +1564,7 @@ extern void uITRON4_free(void *p) ;
#ifndef HAVE_AES_KEYWRAP
#error PKCS7 requires AES key wrap please define HAVE_AES_KEYWRAP
#endif
#ifndef HAVE_X963_KDF
#if defined(HAVE_ECC) && !defined(HAVE_X963_KDF)
#error PKCS7 requires X963 KDF please define HAVE_X963_KDF
#endif
#endif