wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-02-22 21:14:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4052 from elms/gcc11_fixes

Browse Source 
fixes for gcc 11 compile and other whitespace
This commit is contained in:
Sean Parkinson
2021-06-10 15:51:04 +10:00
committed by GitHub
parent c6c7dfd5db 5a54bb656b
commit 56c317e1ab
4 changed files with 62 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ssl.c
View File

@@ -14467,7 +14467,10 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
idx += (int)iov[i].iov_len;
}
/* myBuffer may not initialized fully, but the sending length will be */
PRAGMA_GCC_IGNORE("GCC diagnostic ignored \"-Wmaybe-uninitialized\"");
ret = wolfSSL_write(ssl, myBuffer, sending);
PRAGMA_GCC_POP;
if (dynamic)
XFREE(myBuffer, ssl->heap, DYNAMIC_TYPE_WRITEV);
@@ -27326,7 +27329,7 @@ int wolfSSL_X509_VERIFY_PARAM_set1_host(WOLFSSL_X509_VERIFY_PARAM* pParam,
if (nameSz > 0)
XMEMCPY(pParam->hostName, name, nameSz);
pParam->hostName[nameSz] = '\0';
pParam->hostName[nameSz] = '\0';
return WOLFSSL_SUCCESS;
}

4
src/tls13.c
View File

@@ -421,6 +421,7 @@ static int DeriveKey(WOLFSSL* ssl, byte* output, int outputLen,
#endif
default:
ret = HASH_TYPE_E;
break;
}
if (ret != 0)
@@ -435,9 +436,12 @@ static int DeriveKey(WOLFSSL* ssl, byte* output, int outputLen,
if (includeMsgs)
hashOutSz = hashSz;
/* myBuffer may not initialized fully, but the sending length will be */
PRAGMA_GCC_IGNORE("GCC diagnostic ignored \"-Wmaybe-uninitialized\"");
return HKDF_Expand_Label(output, outputLen, secret, hashSz,
protocol, protocolLen, label, labelLen,
hash, hashOutSz, digestAlg);
PRAGMA_GCC_POP;
}
#ifndef NO_PSK