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

Merge pull request #6736 from ejohnstown/fips-update

Browse Source 
FIPS Update
This commit is contained in:
Kaleb Himes
2023-08-29 08:21:47 -06:00
committed by GitHub
parent c5c968aae3 b13294623b
commit 70c362f680
3 changed files with 45 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
fips-check.sh
View File

@@ -168,6 +168,7 @@ linuxv5)
'wolfssl/wolfcrypt/cmac.h:WCv5.0-RC12' 'wolfssl/wolfcrypt/cmac.h:WCv5.0-RC12'
'wolfssl/wolfcrypt/dh.h:WCv5.0-RC12' 'wolfssl/wolfcrypt/dh.h:WCv5.0-RC12'
'wolfssl/wolfcrypt/ecc.h:WCv5.0-RC12' 'wolfssl/wolfcrypt/ecc.h:WCv5.0-RC12'
'wolfssl/wolfcrypt/fips_test.h:WCv5.0-RC12'
'wolfssl/wolfcrypt/hmac.h:WCv5.0-RC12' 'wolfssl/wolfcrypt/hmac.h:WCv5.0-RC12'
'wolfssl/wolfcrypt/kdf.h:WCv5.0-RC12' 'wolfssl/wolfcrypt/kdf.h:WCv5.0-RC12'
'wolfssl/wolfcrypt/random.h:WCv5.0-RC12' 'wolfssl/wolfcrypt/random.h:WCv5.0-RC12'
@@ -178,6 +179,48 @@ linuxv5)
'wolfssl/wolfcrypt/sha512.h:WCv5.0-RC12' 'wolfssl/wolfcrypt/sha512.h:WCv5.0-RC12'
) )
;; ;;
linuxv5.2.1)
FIPS_OPTION='v5'
FIPS_FILES=(
'wolfcrypt/src/fips.c:v5.2.1-stable'
'wolfcrypt/src/fips_test.c:v5.2.1-stable'
'wolfcrypt/src/wolfcrypt_first.c:v5.2.1-stable'
'wolfcrypt/src/wolfcrypt_last.c:v5.2.1-stable'
'wolfssl/wolfcrypt/fips.h:v5.2.1-stable'
)
WOLFCRYPT_FILES=(
'wolfcrypt/src/aes.c:v5.2.1-stable'
'wolfcrypt/src/aes_asm.asm:v5.2.1-stable'
'wolfcrypt/src/aes_asm.S:v5.2.1-stable'
'wolfcrypt/src/aes_gcm_asm.S:v5.2.1-stable'
'wolfcrypt/src/cmac.c:v5.2.1-stable'
'wolfcrypt/src/dh.c:v5.2.1-stable'
'wolfcrypt/src/ecc.c:v5.2.1-stable'
'wolfcrypt/src/hmac.c:v5.2.1-stable'
'wolfcrypt/src/kdf.c:v5.2.1-stable'
'wolfcrypt/src/random.c:v5.2.1-stable'
'wolfcrypt/src/rsa.c:v5.2.1-stable'
'wolfcrypt/src/sha.c:v5.2.1-stable'
'wolfcrypt/src/sha256.c:v5.2.1-stable'
'wolfcrypt/src/sha256_asm.S:v5.2.1-stable'
'wolfcrypt/src/sha3.c:v5.2.1-stable'
'wolfcrypt/src/sha512.c:v5.2.1-stable'
'wolfcrypt/src/sha512_asm.S:v5.2.1-stable'
'wolfssl/wolfcrypt/aes.h:v5.2.1-stable'
'wolfssl/wolfcrypt/cmac.h:v5.2.1-stable'
'wolfssl/wolfcrypt/dh.h:v5.2.1-stable'
'wolfssl/wolfcrypt/ecc.h:v5.2.1-stable'
'wolfssl/wolfcrypt/fips_test.h:v5.2.1-stable'
'wolfssl/wolfcrypt/hmac.h:v5.2.1-stable'
'wolfssl/wolfcrypt/kdf.h:v5.2.1-stable'
'wolfssl/wolfcrypt/random.h:v5.2.1-stable'
'wolfssl/wolfcrypt/rsa.h:v5.2.1-stable'
'wolfssl/wolfcrypt/sha.h:v5.2.1-stable'
'wolfssl/wolfcrypt/sha256.h:v5.2.1-stable'
'wolfssl/wolfcrypt/sha3.h:v5.2.1-stable'
'wolfssl/wolfcrypt/sha512.h:v5.2.1-stable'
)
;;
fips-ready|fips-dev) fips-ready|fips-dev)
FIPS_OPTION='ready' FIPS_OPTION='ready'
FIPS_FILES=( FIPS_FILES=(

2
wolfcrypt/src/error.c
View File

@@ -595,7 +595,7 @@ const char* wc_GetErrorString(int error)
case SM4_CCM_AUTH_E: case SM4_CCM_AUTH_E:
return "SM4-CCM Authentication check fail"; return "SM4-CCM Authentication check fail";
case DEGRADED_FIPS_E: case FIPS_DEGRADED_E:
return "FIPS module in DEGRADED mode"; return "FIPS module in DEGRADED mode";
default: default:

2
wolfssl/wolfcrypt/error-crypt.h
View File

@@ -66,7 +66,7 @@ enum {
MEMORY_E = -125, /* out of memory error */ MEMORY_E = -125, /* out of memory error */
VAR_STATE_CHANGE_E = -126, /* var state modified by different thread */ VAR_STATE_CHANGE_E = -126, /* var state modified by different thread */
DEGRADED_FIPS_E = -127, /* FIPS Module in degraded mode */ FIPS_DEGRADED_E = -127, /* FIPS Module in degraded mode */
RSA_WRONG_TYPE_E = -130, /* RSA wrong block type for RSA function */ RSA_WRONG_TYPE_E = -130, /* RSA wrong block type for RSA function */
RSA_BUFFER_E = -131, /* RSA buffer error, output too small or RSA_BUFFER_E = -131, /* RSA buffer error, output too small or