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

This commit is contained in:
toddouska 2014-11-07 16:23:56 -08:00
commit e6e24d92fb
2 changed files with 3 additions and 3 deletions

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 #ifdef CYASSL_MD2
case MD2: case MD2:
return MD2h; return MD2h;

View File

@ -184,7 +184,7 @@ CYASSL_API int SetDatesBuffer(Cert*, const byte*, int);
/* DER encode signature */ /* DER encode signature */
CYASSL_API word32 EncodeSignature(byte* out, const byte* digest, word32 digSz, CYASSL_API word32 EncodeSignature(byte* out, const byte* digest, word32 digSz,
int hashOID); int hashOID);
CYASSL_API int GetCTC_HashOID(int hashType); CYASSL_API int GetCTC_HashOID(int type);
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */