From 6e16410e25748b0cc090a44e75ea7badb5706d6e Mon Sep 17 00:00:00 2001 From: jrblixt Date: Thu, 6 Apr 2017 15:47:53 -0600 Subject: [PATCH] Modifications per Todd's requests. --- src/keys.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/keys.c b/src/keys.c index 1e5203944..2b7d068ec 100644 --- a/src/keys.c +++ b/src/keys.c @@ -2940,9 +2940,9 @@ int DeriveKeys(WOLFSSL* ssl) #endif ret = wc_InitMd5(md5); - - ret = wc_InitSha(sha); - + if (ret == 0) { + ret = wc_InitSha(sha); + } if (ret == 0) { XMEMCPY(md5Input, ssl->arrays->masterSecret, SECRET_LEN); @@ -2968,7 +2968,9 @@ int DeriveKeys(WOLFSSL* ssl) XMEMCPY(md5Input + SECRET_LEN, shaOutput, SHA_DIGEST_SIZE); ret = wc_Md5Update(md5, md5Input, SECRET_LEN + SHA_DIGEST_SIZE); - ret = wc_Md5Final(md5, keyData + i * MD5_DIGEST_SIZE); + if (ret == 0) { + ret = wc_Md5Final(md5, keyData + i * MD5_DIGEST_SIZE); + } } if (ret == 0) @@ -3060,9 +3062,9 @@ static int MakeSslMasterSecret(WOLFSSL* ssl) #endif ret = wc_InitMd5(md5); - - ret = wc_InitSha(sha); - + if (ret == 0) { + ret = wc_InitSha(sha); + } if (ret == 0) { XMEMCPY(md5Input, ssl->arrays->preMasterSecret, pmsSz); @@ -3091,7 +3093,10 @@ static int MakeSslMasterSecret(WOLFSSL* ssl) idx += SHA_DIGEST_SIZE; ret = wc_Md5Update(md5, md5Input, idx); - ret = wc_Md5Final(md5, &ssl->arrays->masterSecret[i * MD5_DIGEST_SIZE]); + if (ret == 0) { + ret = wc_Md5Final(md5, + &ssl->arrays->masterSecret[i * MD5_DIGEST_SIZE]); + } } #ifdef SHOW_SECRETS