wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 04:04:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix conversion tls13.c

Browse Source
This commit is contained in:
Andras Fekete
2024-05-09 17:51:26 -04:00
parent bf92797cbc
commit 12768cdf57
1 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/tls13.c
View File

@@ -315,7 +315,7 @@ static int DeriveKeyMsg(WOLFSSL* ssl, byte* output, int outputLen,
case sha256_mac: case sha256_mac:
ret = wc_InitSha256_ex(&digest.sha256, ssl->heap, ssl->devId); ret = wc_InitSha256_ex(&digest.sha256, ssl->heap, ssl->devId);
if (ret == 0) { if (ret == 0) {
ret = wc_Sha256Update(&digest.sha256, msg, msgLen); ret = wc_Sha256Update(&digest.sha256, msg, (word32)msgLen);
if (ret == 0) if (ret == 0)
ret = wc_Sha256Final(&digest.sha256, hash); ret = wc_Sha256Final(&digest.sha256, hash);
wc_Sha256Free(&digest.sha256); wc_Sha256Free(&digest.sha256);
@@ -328,7 +328,7 @@ static int DeriveKeyMsg(WOLFSSL* ssl, byte* output, int outputLen,
case sha384_mac: case sha384_mac:
ret = wc_InitSha384_ex(&digest.sha384, ssl->heap, ssl->devId); ret = wc_InitSha384_ex(&digest.sha384, ssl->heap, ssl->devId);
if (ret == 0) { if (ret == 0) {
ret = wc_Sha384Update(&digest.sha384, msg, msgLen); ret = wc_Sha384Update(&digest.sha384, msg, (word32)msgLen);
if (ret == 0) if (ret == 0)
ret = wc_Sha384Final(&digest.sha384, hash); ret = wc_Sha384Final(&digest.sha384, hash);
wc_Sha384Free(&digest.sha384); wc_Sha384Free(&digest.sha384);
@@ -341,7 +341,7 @@ static int DeriveKeyMsg(WOLFSSL* ssl, byte* output, int outputLen,
case sha512_mac: case sha512_mac:
ret = wc_InitSha512_ex(&digest.sha512, ssl->heap, ssl->devId); ret = wc_InitSha512_ex(&digest.sha512, ssl->heap, ssl->devId);
if (ret == 0) { if (ret == 0) {
ret = wc_Sha512Update(&digest.sha512, msg, msgLen); ret = wc_Sha512Update(&digest.sha512, msg, (word32)msgLen);
if (ret == 0) if (ret == 0)
ret = wc_Sha512Final(&digest.sha512, hash); ret = wc_Sha512Final(&digest.sha512, hash);
wc_Sha512Free(&digest.sha512); wc_Sha512Free(&digest.sha512);
@@ -354,7 +354,7 @@ static int DeriveKeyMsg(WOLFSSL* ssl, byte* output, int outputLen,
case sm3_mac: case sm3_mac:
ret = wc_InitSm3(&digest.sm3, ssl->heap, ssl->devId); ret = wc_InitSm3(&digest.sm3, ssl->heap, ssl->devId);
if (ret == 0) { if (ret == 0) {
ret = wc_Sm3Update(&digest.sm3, msg, msgLen); ret = wc_Sm3Update(&digest.sm3, msg, (word32)msgLen);
if (ret == 0) if (ret == 0)
ret = wc_Sm3Final(&digest.sm3, hash); ret = wc_Sm3Final(&digest.sm3, hash);
wc_Sm3Free(&digest.sm3); wc_Sm3Free(&digest.sm3);
@@ -392,9 +392,9 @@ static int DeriveKeyMsg(WOLFSSL* ssl, byte* output, int outputLen,
return VERSION_ERROR; return VERSION_ERROR;
} }
if (outputLen == -1) if (outputLen == -1)
outputLen = hashSz; outputLen = (int)hashSz;
ret = Tls13HKDFExpandLabel(ssl, output, outputLen, secret, hashSz, ret = Tls13HKDFExpandLabel(ssl, output, (word32)outputLen, secret, hashSz,
protocol, protocolLen, label, labelLen, protocol, protocolLen, label, labelLen,
hash, hashSz, digestAlg); hash, hashSz, digestAlg);
return ret; return ret;
@@ -481,7 +481,7 @@ int Tls13DeriveKey(WOLFSSL* ssl, byte* output, int outputLen,
#endif /* WOLFSSL_DTLS13 */ #endif /* WOLFSSL_DTLS13 */
if (outputLen == -1) { if (outputLen == -1) {
outputLen = hashSz; outputLen = (int)hashSz;
} }
if (includeMsgs) { if (includeMsgs) {
hashOutSz = hashSz; hashOutSz = hashSz;
@@ -496,7 +496,7 @@ int Tls13DeriveKey(WOLFSSL* ssl, byte* output, int outputLen,
} }
PRIVATE_KEY_UNLOCK(); PRIVATE_KEY_UNLOCK();
ret = Tls13HKDFExpandKeyLabel(ssl, output, outputLen, secret, hashSz, ret = Tls13HKDFExpandKeyLabel(ssl, output, (word32)outputLen, secret, hashSz,
protocol, protocolLen, label, labelLen, protocol, protocolLen, label, labelLen,
hash, hashOutSz, digestAlg, side); hash, hashOutSz, digestAlg, side);
PRIVATE_KEY_LOCK(); PRIVATE_KEY_LOCK();
@@ -973,7 +973,7 @@ int Tls13_Exporter(WOLFSSL* ssl, unsigned char *out, size_t outLen,
{ {
int ret; int ret;
enum wc_HashType hashType = WC_HASH_TYPE_NONE; enum wc_HashType hashType = WC_HASH_TYPE_NONE;
int hashLen = 0; word32 hashLen = 0;
byte hashOut[WC_MAX_DIGEST_SIZE]; byte hashOut[WC_MAX_DIGEST_SIZE];
const byte* emptyHash = NULL; const byte* emptyHash = NULL;
byte firstExpand[WC_MAX_DIGEST_SIZE]; byte firstExpand[WC_MAX_DIGEST_SIZE];
@@ -1124,7 +1124,7 @@ static int Tls13_HKDF_Extract(WOLFSSL *ssl, byte* prk, const byte* salt,
void *cb_ctx = ssl->HkdfExtractCtx; void *cb_ctx = ssl->HkdfExtractCtx;
CallbackHKDFExtract cb = ssl->ctx->HkdfExtractCb; CallbackHKDFExtract cb = ssl->ctx->HkdfExtractCb;
if (cb != NULL) { if (cb != NULL) {
ret = cb(prk, salt, saltLen, ikm, ikmLen, digest, cb_ctx); ret = cb(prk, salt, (word32)saltLen, ikm, (word32)ikmLen, digest, cb_ctx);
} }
else else
#endif #endif
@@ -1137,7 +1137,7 @@ static int Tls13_HKDF_Extract(WOLFSSL *ssl, byte* prk, const byte* salt,
{ {
#if !defined(HAVE_FIPS) || \ #if !defined(HAVE_FIPS) || \
(defined(FIPS_VERSION_GE) && FIPS_VERSION_GE(5,3)) (defined(FIPS_VERSION_GE) && FIPS_VERSION_GE(5,3))
ret = wc_Tls13_HKDF_Extract_ex(prk, salt, saltLen, ikm, ikmLen, digest, ret = wc_Tls13_HKDF_Extract_ex(prk, salt, (word32)saltLen, ikm, (word32)ikmLen, digest,
ssl->heap, ssl->devId); ssl->heap, ssl->devId);
#else #else
ret = wc_Tls13_HKDF_Extract(prk, salt, saltLen, ikm, ikmLen, digest); ret = wc_Tls13_HKDF_Extract(prk, salt, saltLen, ikm, ikmLen, digest);
@@ -1167,7 +1167,7 @@ int DeriveEarlySecret(WOLFSSL* ssl)
PRIVATE_KEY_UNLOCK(); PRIVATE_KEY_UNLOCK();
#if defined(HAVE_SESSION_TICKET) || !defined(NO_PSK) #if defined(HAVE_SESSION_TICKET) || !defined(NO_PSK)
ret = Tls13_HKDF_Extract(ssl, ssl->arrays->secret, NULL, 0, ret = Tls13_HKDF_Extract(ssl, ssl->arrays->secret, NULL, 0,
ssl->arrays->psk_key, ssl->arrays->psk_keySz, ssl->arrays->psk_key, (int)ssl->arrays->psk_keySz,
mac2hash(ssl->specs.mac_algorithm)); mac2hash(ssl->specs.mac_algorithm));
#else #else
ret = Tls13_HKDF_Extract(ssl, ssl->arrays->secret, NULL, 0, ret = Tls13_HKDF_Extract(ssl, ssl->arrays->secret, NULL, 0,
@@ -1210,7 +1210,7 @@ int DeriveHandshakeSecret(WOLFSSL* ssl)
PRIVATE_KEY_UNLOCK(); PRIVATE_KEY_UNLOCK();
ret = Tls13_HKDF_Extract(ssl, ssl->arrays->preMasterSecret, ret = Tls13_HKDF_Extract(ssl, ssl->arrays->preMasterSecret,
key, ssl->specs.hash_size, key, ssl->specs.hash_size,
ssl->arrays->preMasterSecret, ssl->arrays->preMasterSz, ssl->arrays->preMasterSecret, (int)ssl->arrays->preMasterSz,
mac2hash(ssl->specs.mac_algorithm)); mac2hash(ssl->specs.mac_algorithm));
PRIVATE_KEY_LOCK(); PRIVATE_KEY_LOCK();
@@ -1416,7 +1416,7 @@ static int BuildTls13HandshakeHmac(WOLFSSL* ssl, byte* key, byte* hash,
if (ret == 0) { if (ret == 0) {
ret = wc_HmacSetKey(verifyHmac, hashType, key, ssl->specs.hash_size); ret = wc_HmacSetKey(verifyHmac, hashType, key, ssl->specs.hash_size);
if (ret == 0) if (ret == 0)
ret = wc_HmacUpdate(verifyHmac, hash, hashSz); ret = wc_HmacUpdate(verifyHmac, hash, (word32)hashSz);
if (ret == 0) if (ret == 0)
ret = wc_HmacFinal(verifyHmac, hash); ret = wc_HmacFinal(verifyHmac, hash);
wc_HmacFree(verifyHmac); wc_HmacFree(verifyHmac);
@@ -1432,7 +1432,7 @@ static int BuildTls13HandshakeHmac(WOLFSSL* ssl, byte* key, byte* hash,
#endif #endif
if (pHashSz) if (pHashSz)
*pHashSz = hashSz; *pHashSz = (word32)hashSz;
return ret; return ret;
} }
@@ -1633,7 +1633,7 @@ int DeriveTls13Keys(WOLFSSL* ssl, int secret, int side, int store)
#endif /* WOLFSSL_DTLS13 */ #endif /* WOLFSSL_DTLS13 */
end: end:
ForceZero(key_dig, i); ForceZero(key_dig, (word32)i);
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
XFREE(key_dig, ssl->heap, DYNAMIC_TYPE_DIGEST); XFREE(key_dig, ssl->heap, DYNAMIC_TYPE_DIGEST);
#elif defined(WOLFSSL_CHECK_MEM_ZERO) #elif defined(WOLFSSL_CHECK_MEM_ZERO)
@@ -3273,7 +3273,7 @@ int BuildTls13Message(WOLFSSL* ssl, byte* output, int outSz, const byte* input,
args->headerSz = Dtls13GetRlHeaderLength(ssl, 1); args->headerSz = Dtls13GetRlHeaderLength(ssl, 1);
#endif /* WOLFSSL_DTLS13 */ #endif /* WOLFSSL_DTLS13 */
args->sz = args->headerSz + inSz; args->sz = args->headerSz + (word32)inSz;
args->idx = args->headerSz; args->idx = args->headerSz;
#ifdef WOLFSSL_ASYNC_CRYPT #ifdef WOLFSSL_ASYNC_CRYPT
@@ -3303,7 +3303,7 @@ int BuildTls13Message(WOLFSSL* ssl, byte* output, int outSz, const byte* input,
args->sz += ssl->specs.aead_mac_size; args->sz += ssl->specs.aead_mac_size;
if (sizeOnly) if (sizeOnly)
return args->sz; return (int)args->sz;
if (args->sz > (word32)outSz) { if (args->sz > (word32)outSz) {
WOLFSSL_MSG("Oops, want to write past output buffer size"); WOLFSSL_MSG("Oops, want to write past output buffer size");
@@ -3328,8 +3328,8 @@ int BuildTls13Message(WOLFSSL* ssl, byte* output, int outSz, const byte* input,
/* TLS v1.3 can do in place encryption. */ /* TLS v1.3 can do in place encryption. */
if (input != output + args->idx) if (input != output + args->idx)
XMEMCPY(output + args->idx, input, inSz); XMEMCPY(output + args->idx, input, (size_t)inSz);
args->idx += inSz; args->idx += (word32)inSz;
ssl->options.buildMsgState = BUILD_MSG_HASH; ssl->options.buildMsgState = BUILD_MSG_HASH;
} }
@@ -3338,7 +3338,7 @@ int BuildTls13Message(WOLFSSL* ssl, byte* output, int outSz, const byte* input,
case BUILD_MSG_HASH: case BUILD_MSG_HASH:
{ {
if (hashOutput) { if (hashOutput) {
ret = HashOutput(ssl, output, args->headerSz + inSz, 0); ret = HashOutput(ssl, output, (int)args->headerSz + inSz, 0);
if (ret != 0) if (ret != 0)
goto exit_buildmsg; goto exit_buildmsg;
} }
@@ -3357,8 +3357,8 @@ int BuildTls13Message(WOLFSSL* ssl, byte* output, int outSz, const byte* input,
/* QUIC does not use encryption of the TLS Record Layer. /* QUIC does not use encryption of the TLS Record Layer.
* Return the original length + added headers * Return the original length + added headers
* and restore it in the record header. */ * and restore it in the record header. */
AddTls13RecordHeader(output, inSz, type, ssl); AddTls13RecordHeader(output, (word32)inSz, (byte)type, ssl);
ret = args->headerSz + inSz; ret = (int)args->headerSz + inSz;
goto exit_buildmsg; goto exit_buildmsg;
} }
#endif #endif
@@ -3368,7 +3368,7 @@ int BuildTls13Message(WOLFSSL* ssl, byte* output, int outSz, const byte* input,
byte* mac = output + args->idx; byte* mac = output + args->idx;
output += args->headerSz; output += args->headerSz;
ret = ssl->ctx->MacEncryptCb(ssl, mac, output, inSz, type, 0, ret = ssl->ctx->MacEncryptCb(ssl, mac, output, (unsigned int)inSz, (byte)type, 0,
output, output, args->size, ssl->MacEncryptCtx); output, output, args->size, ssl->MacEncryptCtx);
} }
else else
@@ -3416,7 +3416,7 @@ exit_buildmsg:
/* return sz on success */ /* return sz on success */
if (ret == 0) { if (ret == 0) {
ret = args->sz; ret = (int)args->sz;
} }
else { else {
WOLFSSL_ERROR_VERBOSE(ret); WOLFSSL_ERROR_VERBOSE(ret);
@@ -4023,7 +4023,7 @@ static int WritePSKBinders(WOLFSSL* ssl, byte* output, word32 idx)
idx - Dtls13GetRlHeaderLength(ssl, 0)); idx - Dtls13GetRlHeaderLength(ssl, 0));
else else
#endif /* WOLFSSL_DTLS13 */ #endif /* WOLFSSL_DTLS13 */
ret = HashOutput(ssl, output, idx, 0); ret = HashOutput(ssl, output, (int)idx, 0);
if (ret != 0) if (ret != 0)
return ret; return ret;
@@ -4171,7 +4171,7 @@ static int EchHashHelloInner(WOLFSSL* ssl, WOLFSSL_ECH* ech)
/* hash the body */ /* hash the body */
if (ret == 0) { if (ret == 0) {
ret = HashRaw(ssl, ech->innerClientHello, ret = HashRaw(ssl, ech->innerClientHello,
ech->innerClientHelloLen - ech->paddingLen - ech->hpke->Nt); (int)(ech->innerClientHelloLen - ech->paddingLen - ech->hpke->Nt));
} }
/* swap hsHashes back */ /* swap hsHashes back */
@@ -4423,7 +4423,7 @@ int SendTls13ClientHello(WOLFSSL* ssl)
/* set the type to inner */ /* set the type to inner */
args->ech->type = ECH_TYPE_INNER; args->ech->type = ECH_TYPE_INNER;
args->preXLength = args->length; args->preXLength = (int)args->length;
/* get size for inner */ /* get size for inner */
ret = TLSX_GetRequestSize(ssl, client_hello, &args->length); ret = TLSX_GetRequestSize(ssl, client_hello, &args->length);
@@ -4434,10 +4434,10 @@ int SendTls13ClientHello(WOLFSSL* ssl)
args->ech->type = 0; args->ech->type = 0;
/* set innerClientHelloLen to ClientHelloInner + padding + tag */ /* set innerClientHelloLen to ClientHelloInner + padding + tag */
args->ech->paddingLen = 31 - ((args->length - 1) % 32); args->ech->paddingLen = 31 - ((args->length - 1) % 32);
args->ech->innerClientHelloLen = args->length + args->ech->innerClientHelloLen = (word16)(args->length +
args->ech->paddingLen + args->ech->hpke->Nt; args->ech->paddingLen + args->ech->hpke->Nt);
/* set the length back to before we computed ClientHelloInner size */ /* set the length back to before we computed ClientHelloInner size */
args->length = args->preXLength; args->length = (word32)args->preXLength;
} }
#endif #endif
@@ -4474,7 +4474,7 @@ int SendTls13ClientHello(WOLFSSL* ssl)
} }
/* Total message size. */ /* Total message size. */
args->sendSz = args->length + HANDSHAKE_HEADER_SZ + RECORD_HEADER_SZ; args->sendSz = (int)(args->length + HANDSHAKE_HEADER_SZ + RECORD_HEADER_SZ);
#ifdef WOLFSSL_DTLS13 #ifdef WOLFSSL_DTLS13
if (ssl->options.dtls) if (ssl->options.dtls)
@@ -4514,7 +4514,7 @@ int SendTls13ClientHello(WOLFSSL* ssl)
XMEMCPY(args->output + args->idx, ssl->arrays->clientRandom, RAN_LEN); XMEMCPY(args->output + args->idx, ssl->arrays->clientRandom, RAN_LEN);
#if defined(HAVE_ECH) #if defined(HAVE_ECH)
args->clientRandomOffset = args->idx; args->clientRandomOffset = (int)args->idx;
#endif #endif
args->idx += RAN_LEN; args->idx += RAN_LEN;
@@ -4623,7 +4623,7 @@ int SendTls13ClientHello(WOLFSSL* ssl)
if (ssl->options.useEch == 1) { if (ssl->options.useEch == 1) {
ret = TLSX_FinalizeEch(args->ech, ret = TLSX_FinalizeEch(args->ech,
args->output + RECORD_HEADER_SZ + HANDSHAKE_HEADER_SZ, args->output + RECORD_HEADER_SZ + HANDSHAKE_HEADER_SZ,
args->sendSz - (RECORD_HEADER_SZ + HANDSHAKE_HEADER_SZ)); (word32)(args->sendSz - (RECORD_HEADER_SZ + HANDSHAKE_HEADER_SZ)));
if (ret != 0) if (ret != 0)
return ret; return ret;
@@ -4657,7 +4657,7 @@ int SendTls13ClientHello(WOLFSSL* ssl)
/* compute the outer hash */ /* compute the outer hash */
if (ret == 0) if (ret == 0)
ret = HashOutput(ssl, args->output, args->idx, 0); ret = HashOutput(ssl, args->output, (int)args->idx, 0);
} }
} }
if (ret != 0) if (ret != 0)
@@ -4684,7 +4684,7 @@ int SendTls13ClientHello(WOLFSSL* ssl)
} }
#endif /* WOLFSSL_DTLS13 */ #endif /* WOLFSSL_DTLS13 */
ssl->buffers.outputBuffer.length += args->sendSz; ssl->buffers.outputBuffer.length += (word32)args->sendSz;
/* Advance state and proceed */ /* Advance state and proceed */
ssl->options.asyncState = TLS_ASYNC_END; ssl->options.asyncState = TLS_ASYNC_END;