Merge pull request #1702 from ejohnstown/fips-ecc

FIPS build and ECC fixes
This commit is contained in:
David Garske
2018-07-19 13:56:03 -07:00
committed by GitHub
2 changed files with 2 additions and 2 deletions

View File

@ -161,7 +161,7 @@ linuxv2)
CRYPT_VERSION=$LINUXV2_CRYPT_VERSION CRYPT_VERSION=$LINUXV2_CRYPT_VERSION
CRYPT_INC_PATH=wolfssl/wolfcrypt CRYPT_INC_PATH=wolfssl/wolfcrypt
CRYPT_SRC_PATH=wolfcrypt/src CRYPT_SRC_PATH=wolfcrypt/src
WC_MODS+=( cmac dh ) WC_MODS+=( cmac dh ecc )
FIPS_SRCS+=( wolfcrypt_first.c wolfcrypt_last.c ) FIPS_SRCS+=( wolfcrypt_first.c wolfcrypt_last.c )
FIPS_INCS=( fips.h ) FIPS_INCS=( fips.h )
FIPS_OPTION=v2 FIPS_OPTION=v2

View File

@ -6039,7 +6039,7 @@ static int ecc_check_privkey_gen_helper(ecc_key* key)
err = BAD_COND_E; err = BAD_COND_E;
#else #else
ALLOC_CURVE_SPECS(curve, 2); ALLOC_CURVE_SPECS(2);
/* load curve info */ /* load curve info */
err = wc_ecc_curve_load(key->dp, &curve, err = wc_ecc_curve_load(key->dp, &curve,