feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Update to FIPS v5-ready will use latest master. Support for FIPS in core hash using SHA2-256 and SHA2-384 in fips_test.h. Fixes for MATH_INT_T. Fix error: ‘tls13_kdf_test’ declared ‘static’ but never defined.

Browse Source
This commit is contained in:
David Garske
2022-07-01 12:33:08 -07:00
parent bd75e1d6a4
commit b9be5c2c24
7 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fips-check.sh
View File

@ -240,7 +240,7 @@ linuxv5)
;; ;;
linuxv5-ready|fips-ready|fips-v5-ready) linuxv5-ready|fips-ready|fips-v5-ready)
FIPS_REPO="git@github.com:wolfSSL/fips.git" FIPS_REPO="git@github.com:wolfSSL/fips.git"
FIPS_VERSION="WCv5.0-RC12" FIPS_VERSION="master"
CRYPT_INC_PATH=wolfssl/wolfcrypt CRYPT_INC_PATH=wolfssl/wolfcrypt
CRYPT_SRC_PATH=wolfcrypt/src CRYPT_SRC_PATH=wolfcrypt/src
FIPS_SRCS=( fips.c fips_test.c wolfcrypt_first.c wolfcrypt_last.c ) FIPS_SRCS=( fips.c fips_test.c wolfcrypt_first.c wolfcrypt_last.c )

2
wolfcrypt/src/port/cypress/psoc6_crypto.c
View File

@ -32,7 +32,7 @@
#endif #endif
#if defined(WOLFSSL_PSOC6_CRYPTO) #if defined(WOLFSSL_PSOC6_CRYPTO)
#ifdef WOLFSSL_SP_MATH #if defined(WOLFSSL_SP_MATH) || defined(WOLFSSL_SP_MATH_ALL)
struct sp_int; struct sp_int;
#define MATH_INT_T struct sp_int #define MATH_INT_T struct sp_int
#elif defined(USE_FAST_MATH) #elif defined(USE_FAST_MATH)

2
wolfcrypt/src/port/nxp/se050_port.c
View File

@ -47,7 +47,7 @@
#include "ex_sss_boot.h" #include "ex_sss_boot.h"
#endif #endif
#ifdef WOLFSSL_SP_MATH #if defined(WOLFSSL_SP_MATH) || defined(WOLFSSL_SP_MATH_ALL)
struct sp_int; struct sp_int;
#define MATH_INT_T struct sp_int #define MATH_INT_T struct sp_int
#elif defined(USE_FAST_MATH) #elif defined(USE_FAST_MATH)

2
wolfcrypt/test/test.c
View File

@ -21002,7 +21002,7 @@ const char resMasterLabel[] = "res master";
const char derivedLabel[] = "derived"; const char derivedLabel[] = "derived";
int tls13_kdf_test(void) WOLFSSL_TEST_SUBROUTINE int tls13_kdf_test(void)
{ {
int ret = 0; int ret = 0;
word32 i; word32 i;

19
wolfssl/wolfcrypt/fips_test.h
View File

@ -31,6 +31,25 @@
extern "C" { extern "C" {
#endif #endif
/* Added for FIPS v5.3 or later */
#if defined(FIPS_VERSION_GE) && FIPS_VERSION_GE(5,3)
/* Determine FIPS in core hash type and size */
#ifndef NO_SHA256
#define FIPS_IN_CORE_DIGEST_SIZE 32
#define FIPS_IN_CORE_HASH_TYPE WC_SHA256
#define FIPS_IN_CORE_KEY_SZ 32
#define FIPS_IN_CORE_VERIFY_SZ FIPS_IN_CORE_KEY_SZ
#elif defined(WOLFSSL_SHA384)
#define FIPS_IN_CORE_DIGEST_SIZE 48
#define FIPS_IN_CORE_HASH_TYPE WC_SHA384
#define FIPS_IN_CORE_KEY_SZ 48
#define FIPS_IN_CORE_VERIFY_SZ FIPS_IN_CORE_KEY_SZ
#else
#error No FIPS hash (SHA2-256 or SHA2-384)
#endif
#endif /* FIPS v5.3 or later */
enum FipsCastId { enum FipsCastId {
FIPS_CAST_AES_CBC, FIPS_CAST_AES_CBC,
FIPS_CAST_AES_GCM, FIPS_CAST_AES_GCM,

2
wolfssl/wolfcrypt/port/nxp/se050_port.h
View File

@ -118,7 +118,7 @@ WOLFSSL_LOCAL void se050_aes_free(struct Aes* aes);
struct ecc_key; struct ecc_key;
struct WC_RNG; struct WC_RNG;
#ifdef WOLFSSL_SP_MATH #if defined(WOLFSSL_SP_MATH) || defined(WOLFSSL_SP_MATH_ALL)
struct sp_int; struct sp_int;
#define MATH_INT_T struct sp_int #define MATH_INT_T struct sp_int
#elif defined(USE_FAST_MATH) #elif defined(USE_FAST_MATH)

2
wolfssl/wolfcrypt/port/st/stm32.h
View File

@ -152,7 +152,7 @@ int wc_Stm32_Hash_Final(STM32_HASH_Context* stmCtx, word32 algo,
#endif /* STM32_CRYPTO */ #endif /* STM32_CRYPTO */
#if defined(WOLFSSL_STM32_PKA) && defined(HAVE_ECC) #if defined(WOLFSSL_STM32_PKA) && defined(HAVE_ECC)
#ifdef WOLFSSL_SP_MATH #if defined(WOLFSSL_SP_MATH) || defined(WOLFSSL_SP_MATH_ALL)
struct sp_int; struct sp_int;
#define MATH_INT_T struct sp_int #define MATH_INT_T struct sp_int
#elif defined(USE_FAST_MATH) #elif defined(USE_FAST_MATH)