mirror of
https://github.com/wolfSSL/wolfssl.git
synced 2025-07-31 11:17:29 +02:00
fixes for gcc 11 compile and other whitespace
This commit is contained in:
@ -14457,7 +14457,14 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
|
|||||||
idx += (int)iov[i].iov_len;
|
idx += (int)iov[i].iov_len;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* myBuffer may not initialized fully, but the sending length will be */
|
||||||
|
#if defined(__GNUC__) && __GNUC__ > 5
|
||||||
|
_Pragma("GCC diagnostic ignored \"-Wmaybe-uninitialized\"");
|
||||||
|
#endif
|
||||||
ret = wolfSSL_write(ssl, myBuffer, sending);
|
ret = wolfSSL_write(ssl, myBuffer, sending);
|
||||||
|
#if defined(__GNUC__) && __GNUC__ > 5
|
||||||
|
_Pragma("GCC diagnostic pop");
|
||||||
|
#endif
|
||||||
|
|
||||||
if (dynamic)
|
if (dynamic)
|
||||||
XFREE(myBuffer, ssl->heap, DYNAMIC_TYPE_WRITEV);
|
XFREE(myBuffer, ssl->heap, DYNAMIC_TYPE_WRITEV);
|
||||||
|
@ -421,6 +421,7 @@ static int DeriveKey(WOLFSSL* ssl, byte* output, int outputLen,
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
ret = HASH_TYPE_E;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (ret != 0)
|
if (ret != 0)
|
||||||
@ -435,9 +436,16 @@ static int DeriveKey(WOLFSSL* ssl, byte* output, int outputLen,
|
|||||||
if (includeMsgs)
|
if (includeMsgs)
|
||||||
hashOutSz = hashSz;
|
hashOutSz = hashSz;
|
||||||
|
|
||||||
|
/* myBuffer may not initialized fully, but the sending length will be */
|
||||||
|
#if defined(__GNUC__) && __GNUC__ > 5
|
||||||
|
_Pragma("GCC diagnostic ignored \"-Wmaybe-uninitialized\"");
|
||||||
|
#endif
|
||||||
return HKDF_Expand_Label(output, outputLen, secret, hashSz,
|
return HKDF_Expand_Label(output, outputLen, secret, hashSz,
|
||||||
protocol, protocolLen, label, labelLen,
|
protocol, protocolLen, label, labelLen,
|
||||||
hash, hashOutSz, digestAlg);
|
hash, hashOutSz, digestAlg);
|
||||||
|
#if defined(__GNUC__) && __GNUC__ > 5
|
||||||
|
_Pragma("GCC diagnostic pop");
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef NO_PSK
|
#ifndef NO_PSK
|
||||||
|
Reference in New Issue
Block a user