Fix line lengths.

This commit is contained in:
David Garske
2023-12-27 10:12:52 -08:00
parent b86dfffdbe
commit 0d057099af
3 changed files with 12 additions and 6 deletions

View File

@ -1134,7 +1134,8 @@ static int Tls13_HKDF_Extract(WOLFSSL *ssl, byte* prk, const byte* salt,
else
#endif
{
#if !defined(HAVE_FIPS) || (defined(FIPS_VERSION_GE) && FIPS_VERSION_GE(5,3))
#if !defined(HAVE_FIPS) || \
(defined(FIPS_VERSION_GE) && FIPS_VERSION_GE(5,3))
ret = wc_Tls13_HKDF_Extract_ex(prk, salt, saltLen, ikm, ikmLen, digest,
ssl->heap, ssl->devId);
#else
@ -4806,7 +4807,8 @@ static int EchCheckAcceptance(WOLFSSL* ssl, const byte* input,
/* extract clientRandomInner with a key of all zeros */
if (ret == 0) {
PRIVATE_KEY_UNLOCK();
#if !defined(HAVE_FIPS) || (defined(FIPS_VERSION_GE) && FIPS_VERSION_GE(5,3))
#if !defined(HAVE_FIPS) || \
(defined(FIPS_VERSION_GE) && FIPS_VERSION_GE(5,3))
ret = wc_HKDF_Extract_ex(digestType, zeros, digestSize,
ssl->arrays->clientRandomInner, RAN_LEN, expandLabelPrk,
ssl->heap, ssl->devId);
@ -4943,7 +4945,8 @@ static int EchWriteAcceptance(WOLFSSL* ssl, byte* output,
/* extract clientRandom with a key of all zeros */
if (ret == 0) {
PRIVATE_KEY_UNLOCK();
#if !defined(HAVE_FIPS) || (defined(FIPS_VERSION_GE) && FIPS_VERSION_GE(5,3))
#if !defined(HAVE_FIPS) || \
(defined(FIPS_VERSION_GE) && FIPS_VERSION_GE(5,3))
ret = wc_HKDF_Extract_ex(digestType, zeros, digestSize,
ssl->arrays->clientRandom, RAN_LEN, expandLabelPrk,
ssl->heap, ssl->devId);

View File

@ -1939,7 +1939,8 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
int wc_Shake128Hash(const byte* data, word32 len, byte* hash,
word32 hashLen)
{
return wc_Shake128Hash_ex(data, len, hash, hashLen, NULL, INVALID_DEVID);
return wc_Shake128Hash_ex(data, len, hash, hashLen,
NULL, INVALID_DEVID);
}
#endif /* WOLFSSL_SHAKE_128 */
@ -1990,7 +1991,8 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
int wc_Shake256Hash(const byte* data, word32 len, byte* hash,
word32 hashLen)
{
return wc_Shake256Hash_ex(data, len, hash, hashLen, NULL, INVALID_DEVID);
return wc_Shake256Hash_ex(data, len, hash, hashLen,
NULL, INVALID_DEVID);
}
#endif /* WOLFSSL_SHAKE_256 */
#endif /* WOLFSSL_SHA3 */

View File

@ -77,7 +77,8 @@ enum {
};
WOLFSSL_LOCAL int wc_Tls13_HKDF_Extract_ex(byte* prk, const byte* salt,
word32 saltLen, byte* ikm, word32 ikmLen, int digest, void* heap, int devId);
word32 saltLen, byte* ikm, word32 ikmLen, int digest,
void* heap, int devId);
WOLFSSL_API int wc_Tls13_HKDF_Extract(byte* prk, const byte* salt,
word32 saltLen, byte* ikm, word32 ikmLen, int digest);