mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:cyassl/cyassl

Browse Source
This commit is contained in:
John Safranek 2014-11-07 17:06:04 -08:00
commit 54f678b9ee
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ctaocrypt/src/asn.c
View File

@ -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;

2
cyassl/ctaocrypt/asn_public.h
View File

@ -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" */

11
cyassl/ctaocrypt/fips_test.h
View File

@ -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" */