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

Corrected spacing and comments

Browse Source
This commit is contained in:
Bill Phipps
2023-04-10 17:15:22 +00:00
parent 599cf9356f
commit 2430f2377f
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/internal.c
View File

@@ -4388,28 +4388,28 @@ static void SetDigest(WOLFSSL* ssl, int hashAlgo)
switch (hashAlgo) { switch (hashAlgo) {
#ifndef NO_SHA #ifndef NO_SHA
case sha_mac: case sha_mac:
ssl->options.dontFreeDigest=1; ssl->options.dontFreeDigest = 1;
ssl->buffers.digest.buffer = ssl->hsHashes->certHashes.sha; ssl->buffers.digest.buffer = ssl->hsHashes->certHashes.sha;
ssl->buffers.digest.length = WC_SHA_DIGEST_SIZE; ssl->buffers.digest.length = WC_SHA_DIGEST_SIZE;
break; break;
#endif /* !NO_SHA */ #endif /* !NO_SHA */
#ifndef NO_SHA256 #ifndef NO_SHA256
case sha256_mac: case sha256_mac:
ssl->options.dontFreeDigest=1; ssl->options.dontFreeDigest = 1;
ssl->buffers.digest.buffer = ssl->hsHashes->certHashes.sha256; ssl->buffers.digest.buffer = ssl->hsHashes->certHashes.sha256;
ssl->buffers.digest.length = WC_SHA256_DIGEST_SIZE; ssl->buffers.digest.length = WC_SHA256_DIGEST_SIZE;
break; break;
#endif /* !NO_SHA256 */ #endif /* !NO_SHA256 */
#ifdef WOLFSSL_SHA384 #ifdef WOLFSSL_SHA384
case sha384_mac: case sha384_mac:
ssl->options.dontFreeDigest=1; ssl->options.dontFreeDigest = 1;
ssl->buffers.digest.buffer = ssl->hsHashes->certHashes.sha384; ssl->buffers.digest.buffer = ssl->hsHashes->certHashes.sha384;
ssl->buffers.digest.length = WC_SHA384_DIGEST_SIZE; ssl->buffers.digest.length = WC_SHA384_DIGEST_SIZE;
break; break;
#endif /* WOLFSSL_SHA384 */ #endif /* WOLFSSL_SHA384 */
#ifdef WOLFSSL_SHA512 #ifdef WOLFSSL_SHA512
case sha512_mac: case sha512_mac:
ssl->options.dontFreeDigest=1; ssl->options.dontFreeDigest = 1;
ssl->buffers.digest.buffer = ssl->hsHashes->certHashes.sha512; ssl->buffers.digest.buffer = ssl->hsHashes->certHashes.sha512;
ssl->buffers.digest.length = WC_SHA512_DIGEST_SIZE; ssl->buffers.digest.length = WC_SHA512_DIGEST_SIZE;
break; break;
@@ -7548,12 +7548,13 @@ void FreeKeyExchange(WOLFSSL* ssl)
/* Cleanup digest buffer */ /* Cleanup digest buffer */
if (ssl->buffers.digest.buffer) { if (ssl->buffers.digest.buffer) {
if(!ssl->options.dontFreeDigest) { /* Only free if digest buffer was not set using SetDigest */
if (!ssl->options.dontFreeDigest) {
XFREE(ssl->buffers.digest.buffer, ssl->heap, DYNAMIC_TYPE_DIGEST); XFREE(ssl->buffers.digest.buffer, ssl->heap, DYNAMIC_TYPE_DIGEST);
} }
ssl->buffers.digest.buffer = NULL; ssl->buffers.digest.buffer = NULL;
ssl->buffers.digest.length = 0; ssl->buffers.digest.length = 0;
ssl->options.dontFreeDigest=0; ssl->options.dontFreeDigest = 0;
} }
/* Free handshake key */ /* Free handshake key */
@@ -26232,13 +26233,13 @@ static int HashSkeData(WOLFSSL* ssl, enum wc_HashType hashType,
ssl->buffers.digest.length = (unsigned int)digest_sz; ssl->buffers.digest.length = (unsigned int)digest_sz;
/* buffer for hash */ /* buffer for hash */
if(!ssl->buffers.digest.buffer) { if (!ssl->buffers.digest.buffer) {
if(!ssl->options.dontFreeDigest) { if (!ssl->options.dontFreeDigest) {
XFREE(ssl->buffers.digest.buffer, ssl->heap, XFREE(ssl->buffers.digest.buffer, ssl->heap,
DYNAMIC_TYPE_DIGEST); DYNAMIC_TYPE_DIGEST);
} }
} }
ssl->options.dontFreeDigest=0; ssl->options.dontFreeDigest = 0;
ssl->buffers.digest.buffer = (byte*)XMALLOC(ssl->buffers.digest.length, ssl->buffers.digest.buffer = (byte*)XMALLOC(ssl->buffers.digest.length,
ssl->heap, DYNAMIC_TYPE_DIGEST); ssl->heap, DYNAMIC_TYPE_DIGEST);
@@ -30492,7 +30493,7 @@ exit_scv:
/* Digest is not allocated, so do this to prevent free */ /* Digest is not allocated, so do this to prevent free */
if(ssl->buffers.digest.buffer) { if(ssl->buffers.digest.buffer) {
if(!ssl->options.dontFreeDigest) { if (!ssl->options.dontFreeDigest) {
/*This should not happen*/ /*This should not happen*/
XFREE(ssl->buffers.digest.buffer, XFREE(ssl->buffers.digest.buffer,
ssl->heap, DYNAMIC_TYPE_DIGEST); ssl->heap, DYNAMIC_TYPE_DIGEST);
@@ -30500,7 +30501,7 @@ exit_scv:
} }
ssl->buffers.digest.buffer = NULL; ssl->buffers.digest.buffer = NULL;
ssl->buffers.digest.length = 0; ssl->buffers.digest.length = 0;
ssl->options.dontFreeDigest=0; ssl->options.dontFreeDigest = 0;
/* Final cleanup */ /* Final cleanup */
#ifdef WOLFSSL_ASYNC_IO #ifdef WOLFSSL_ASYNC_IO
@@ -31983,11 +31984,11 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
TypeHash(ssl->options.hashAlgo)); TypeHash(ssl->options.hashAlgo));
/* Replace sig buffer with new one */ /* Replace sig buffer with new one */
if(!ssl->options.dontFreeDigest) { if (!ssl->options.dontFreeDigest) {
XFREE(ssl->buffers.digest.buffer, XFREE(ssl->buffers.digest.buffer,
ssl->heap, DYNAMIC_TYPE_DIGEST); ssl->heap, DYNAMIC_TYPE_DIGEST);
} }
ssl->options.dontFreeDigest=0; ssl->options.dontFreeDigest = 0;
ssl->buffers.digest.buffer = encodedSig; ssl->buffers.digest.buffer = encodedSig;
} }
@@ -32204,11 +32205,11 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
TypeHash(ssl->options.hashAlgo)); TypeHash(ssl->options.hashAlgo));
/* Replace sig buffer with new one */ /* Replace sig buffer with new one */
if(!ssl->options.dontFreeDigest) { if (!ssl->options.dontFreeDigest) {
XFREE(ssl->buffers.digest.buffer, XFREE(ssl->buffers.digest.buffer,
ssl->heap, DYNAMIC_TYPE_DIGEST); ssl->heap, DYNAMIC_TYPE_DIGEST);
} }
ssl->options.dontFreeDigest=0; ssl->options.dontFreeDigest = 0;
ssl->buffers.digest.buffer = encodedSig; ssl->buffers.digest.buffer = encodedSig;
} }
break; break;
@@ -34298,7 +34299,7 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
#endif #endif
/* Digest is not allocated, so do this to prevent free */ /* Digest is not allocated, so do this to prevent free */
if(ssl->buffers.digest.buffer) { if(ssl->buffers.digest.buffer) {
if(!ssl->options.dontFreeDigest) { if (!ssl->options.dontFreeDigest) {
/*This should not happen*/ /*This should not happen*/
XFREE(ssl->buffers.digest.buffer, XFREE(ssl->buffers.digest.buffer,
ssl->heap, DYNAMIC_TYPE_DIGEST); ssl->heap, DYNAMIC_TYPE_DIGEST);
@@ -34306,7 +34307,7 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
} }
ssl->buffers.digest.buffer = NULL; ssl->buffers.digest.buffer = NULL;
ssl->buffers.digest.length = 0; ssl->buffers.digest.length = 0;
ssl->options.dontFreeDigest=0; ssl->options.dontFreeDigest = 0;
#ifdef WOLFSSL_ASYNC_CRYPT #ifdef WOLFSSL_ASYNC_CRYPT
/* Cleanup async */ /* Cleanup async */