summaryrefslogtreecommitdiff
path: root/board/cr50/dcrypto/fips.h
diff options
context:
space:
mode:
Diffstat (limited to 'board/cr50/dcrypto/fips.h')
-rw-r--r--board/cr50/dcrypto/fips.h26
1 files changed, 12 insertions, 14 deletions
diff --git a/board/cr50/dcrypto/fips.h b/board/cr50/dcrypto/fips.h
index cfd39bb1fc..ca1fd689f0 100644
--- a/board/cr50/dcrypto/fips.h
+++ b/board/cr50/dcrypto/fips.h
@@ -37,14 +37,10 @@ enum fips_status {
#endif
FIPS_FATAL_SELF_INTEGRITY = 1 << 10,
FIPS_FATAL_BN_MATH = 1 << 11,
+ FIPS_FATAL_ECDSA_PWCT = 1 << 12,
FIPS_FATAL_OTHER = 1 << 15,
-/* For CRYPTO_TEST ignore self-integrity errors. */
-#ifdef CRYPTO_TEST_SETUP
- FIPS_ERROR_MASK = 0xffff & ~FIPS_FATAL_SELF_INTEGRITY,
-#else
FIPS_ERROR_MASK = 0xffff,
-#endif
FIPS_RFU_MASK = 0x7fff0000
};
@@ -56,13 +52,14 @@ enum fips_break {
FIPS_BREAK_SHA256 = 2,
FIPS_BREAK_HMAC_SHA256 = 3,
FIPS_BREAK_HMAC_DRBG = 4,
- FIPS_BREAK_ECDSA = 5,
- FIPS_BREAK_ECDSA_PWCT = 6,
+ FIPS_BREAK_ECDSA_VER = 5,
+ FIPS_BREAK_ECDSA_SIGN = 6,
+ FIPS_BREAK_ECDSA_PWCT = 7,
#ifdef CONFIG_FIPS_AES_CBC_256
- FIPS_BREAK_AES256 = 7,
+ FIPS_BREAK_AES256 = 8,
#endif
#ifdef CONFIG_FIPS_RSA2048
- FIPS_BREAK_RSA2048 = 8,
+ FIPS_BREAK_RSA2048 = 9,
#endif
};
@@ -82,15 +79,16 @@ enum fips_cmd {
FIPS_CMD_BREAK_SHA256 = 4,
FIPS_CMD_BREAK_HMAC_SHA256 = 5,
FIPS_CMD_BREAK_HMAC_DRBG = 6,
- FIPS_CMD_BREAK_ECDSA = 7,
- FIPS_CMD_BREAK_ECDSA_PWCT = 8,
+ FIPS_CMD_BREAK_ECDSA_VER = 7,
+ FIPS_CMD_BREAK_ECDSA_SIGN = 8,
+ FIPS_CMD_BREAK_ECDSA_PWCT = 9,
#ifdef CONFIG_FIPS_AES_CBC_256
- FIPS_CMD_BREAK_AES256 = 9,
+ FIPS_CMD_BREAK_AES256 = 10,
#endif
#ifdef CONFIG_FIPS_RSA2048
- FIPS_CMD_BREAK_RSA2048 = 10,
+ FIPS_CMD_BREAK_RSA2048 = 11,
#endif
- FIPS_CMD_NO_BREAK = 11
+ FIPS_CMD_NO_BREAK = 12
};
/* These symbols defined in core/cortex-m/ec.lds.S. */