wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename the PCT error codes to remove 'FIPS' since they can be enabled without FIPS.

Browse Source
This commit is contained in:
John Safranek
2021-03-26 10:49:52 -07:00
parent 9e3e14c875
commit a57be5a8e5
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wolfcrypt/src/dh.c
View File

@ -1340,7 +1340,7 @@ static int wc_DhGenerateKeyPair_Sync(DhKey* key, WC_RNG* rng,
ret = _ffc_validate_public_key(key, pub, *pubSz, NULL, 0, 0); ret = _ffc_validate_public_key(key, pub, *pubSz, NULL, 0, 0);
if (ret == 0) { if (ret == 0) {
ret = _ffc_pairwise_consistency_test(key, pub, *pubSz, priv, *privSz); ret = _ffc_pairwise_consistency_test(key, pub, *pubSz, priv, *privSz);
if (ret != 0) ret = DHE_PCT_FIPS_E; if (ret != 0) ret = DHE_PCT_E;
} }
return ret; return ret;

2
wolfcrypt/src/ecc.c
View File

@ -7639,7 +7639,7 @@ static int _ecc_pairwise_consistency_test(ecc_key* key)
int err = 0; int err = 0;
if (ecc_check_privkey_gen_helper(key) != 0) if (ecc_check_privkey_gen_helper(key) != 0)
err = ECC_PCT_FIPS_E; err = ECC_PCT_E;
return err; return err;
} }

8
wolfcrypt/src/error.c
View File

@ -542,11 +542,11 @@ const char* wc_GetErrorString(int error)
case KDF_SSH_KAT_FIPS_E: case KDF_SSH_KAT_FIPS_E:
return "wolfcrypt FIPS SSH KDF Known Answer Test Failure"; return "wolfcrypt FIPS SSH KDF Known Answer Test Failure";
case DHE_PCT_FIPS_E: case DHE_PCT_E:
return "wolfcrypt FIPS DHE Pairwise Consistency Test Failure"; return "wolfcrypt DHE Pairwise Consistency Test Failure";
case ECC_PCT_FIPS_E: case ECC_PCT_E:
return "wolfcrypt FIPS ECDHE Pairwise Consistency Test Failure"; return "wolfcrypt ECDHE Pairwise Consistency Test Failure";
default: default:
return "unknown error number"; return "unknown error number";

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

@ -242,8 +242,8 @@ enum {
KDF_TLS12_KAT_FIPS_E = -281, /* TLS12 KDF KAT failure */ KDF_TLS12_KAT_FIPS_E = -281, /* TLS12 KDF KAT failure */
KDF_TLS13_KAT_FIPS_E = -282, /* TLS13 KDF KAT failure */ KDF_TLS13_KAT_FIPS_E = -282, /* TLS13 KDF KAT failure */
KDF_SSH_KAT_FIPS_E = -283, /* SSH KDF KAT failure */ KDF_SSH_KAT_FIPS_E = -283, /* SSH KDF KAT failure */
DHE_PCT_FIPS_E = -284, /* DHE Pairwise Consistency Test failure */ DHE_PCT_E = -284, /* DHE Pairwise Consistency Test failure */
ECC_PCT_FIPS_E = -285, /* ECDHE Pairwise Consistency Test failure */ ECC_PCT_E = -285, /* ECDHE Pairwise Consistency Test failure */
WC_LAST_E = -285, /* Update this to indicate last error */ WC_LAST_E = -285, /* Update this to indicate last error */
MIN_CODE_E = -300 /* errors -101 - -299 */ MIN_CODE_E = -300 /* errors -101 - -299 */