feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

add int return to OpenSSL compatibility MD5 functions

Browse Source
This commit is contained in:
Chris Conlon
2017-09-28 11:12:18 -06:00
parent ef141c3ce9
commit eff781c0aa
2 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/ssl.c
View File

@ -11959,7 +11959,7 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
#ifndef NO_MD5
void wolfSSL_MD5_Init(WOLFSSL_MD5_CTX* md5)
int wolfSSL_MD5_Init(WOLFSSL_MD5_CTX* md5)
{
int ret;
typedef char md5_test[sizeof(MD5_CTX) >= sizeof(Md5) ? 1 : -1];
@ -11967,22 +11967,43 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
WOLFSSL_ENTER("MD5_Init");
ret = wc_InitMd5((Md5*)md5);
(void)ret;
/* return 1 on success, 0 otherwise */
if (ret == 0)
return 1;
return 0;
}
void wolfSSL_MD5_Update(WOLFSSL_MD5_CTX* md5, const void* input,
int wolfSSL_MD5_Update(WOLFSSL_MD5_CTX* md5, const void* input,
unsigned long sz)
{
int ret;
WOLFSSL_ENTER("wolfSSL_MD5_Update");
wc_Md5Update((Md5*)md5, (const byte*)input, (word32)sz);
ret = wc_Md5Update((Md5*)md5, (const byte*)input, (word32)sz);
/* return 1 on success, 0 otherwise */
if (ret == 0)
return 1;
return 0;
}
void wolfSSL_MD5_Final(byte* input, WOLFSSL_MD5_CTX* md5)
int wolfSSL_MD5_Final(byte* input, WOLFSSL_MD5_CTX* md5)
{
int ret;
WOLFSSL_ENTER("MD5_Final");
wc_Md5Final((Md5*)md5, input);
ret = wc_Md5Final((Md5*)md5, input);
/* return 1 on success, 0 otherwise */
if (ret == 0)
return 1;
return 0;
}
#endif /* NO_MD5 */
@ -11991,6 +12012,7 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
int wolfSSL_SHA_Init(WOLFSSL_SHA_CTX* sha)
{
int ret;
typedef char sha_test[sizeof(SHA_CTX) >= sizeof(Sha) ? 1 : -1];
(void)sizeof(sha_test);

6
wolfssl/openssl/md5.h
View File

@ -21,9 +21,9 @@ typedef struct WOLFSSL_MD5_CTX {
int holder[28 + (WC_ASYNC_DEV_SIZE / sizeof(int))]; /* big enough to hold wolfcrypt md5, but check on init */
} WOLFSSL_MD5_CTX;
WOLFSSL_API void wolfSSL_MD5_Init(WOLFSSL_MD5_CTX*);
WOLFSSL_API void wolfSSL_MD5_Update(WOLFSSL_MD5_CTX*, const void*, unsigned long);
WOLFSSL_API void wolfSSL_MD5_Final(unsigned char*, WOLFSSL_MD5_CTX*);
WOLFSSL_API int wolfSSL_MD5_Init(WOLFSSL_MD5_CTX*);
WOLFSSL_API int wolfSSL_MD5_Update(WOLFSSL_MD5_CTX*, const void*, unsigned long);
WOLFSSL_API int wolfSSL_MD5_Final(unsigned char*, WOLFSSL_MD5_CTX*);
typedef WOLFSSL_MD5_CTX MD5_CTX;