diff --git a/ctaocrypt/src/asn.c b/ctaocrypt/src/asn.c index ef0389625..614134b94 100644 --- a/ctaocrypt/src/asn.c +++ b/ctaocrypt/src/asn.c @@ -2894,9 +2894,9 @@ word32 EncodeSignature(byte* out, const byte* digest, word32 digSz, int hashOID) } -int GetCTC_HashOID(int hashType) +int GetCTC_HashOID(int type) { - switch (hashType) { + switch (type) { #ifdef CYASSL_MD2 case MD2: return MD2h; diff --git a/cyassl/ctaocrypt/asn_public.h b/cyassl/ctaocrypt/asn_public.h index 405d95368..4650abb7f 100644 --- a/cyassl/ctaocrypt/asn_public.h +++ b/cyassl/ctaocrypt/asn_public.h @@ -184,7 +184,7 @@ CYASSL_API int SetDatesBuffer(Cert*, const byte*, int); /* DER encode signature */ CYASSL_API word32 EncodeSignature(byte* out, const byte* digest, word32 digSz, int hashOID); -CYASSL_API int GetCTC_HashOID(int hashType); +CYASSL_API int GetCTC_HashOID(int type); #ifdef __cplusplus } /* extern "C" */ diff --git a/cyassl/ctaocrypt/fips_test.h b/cyassl/ctaocrypt/fips_test.h index e40a19964..b492a4fd7 100644 --- a/cyassl/ctaocrypt/fips_test.h +++ b/cyassl/ctaocrypt/fips_test.h @@ -30,17 +30,20 @@ extern "C" { #endif -/* Known Answer Test string inputs are hex */ - -CYASSL_LOCAL int DoKnownAnswerTests(char*); +/* Known Answer Test string inputs are hex, internal */ +CYASSL_LOCAL int DoKnownAnswerTests(char*, int); -/* Power on self test failure callback */ +/* FIPS failure callback */ typedef void(*wolfCrypt_fips_cb)(int ok, int err, const char* hash); /* Public set function */ CYASSL_API int wolfCrypt_SetCb_fips(wolfCrypt_fips_cb cbf); +/* Public get status functions */ +CYASSL_API int wolfCrypt_GetStatus_fips(void); +CYASSL_API const char* wolfCrypt_GetCoreHash_fips(void); + #ifdef __cplusplus } /* extern "C" */