WolfSSL
/
wolfssh
mirror of https://github.com/wolfSSL/wolfssh.git
1
0
Fork 0
Code Issues Releases Wiki Activity

check on return value of get digest size and remove old ret reset code

pull/928/head
JacobBarthelmeh 2026-04-16 17:27:59 -06:00
parent 8a945c7b35
commit 6013f122b4
1 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/internal.c
View File

@ -5696,12 +5696,20 @@ static int KeyAgreeEcdhMlKem_client(WOLFSSH* ssh, byte hashId,
/* Replace the concatenated shared secrets with the hash. That
* will become the new shared secret. */
if (ret == 0) {
sharedSecretHashSz = wc_HashGetDigestSize((enum wc_HashType)hashId);
sharedSecretHash = (byte *)WMALLOC(sharedSecretHashSz,
ssh->ctx->heap,
DYNTYPE_PRIVKEY);
if (sharedSecretHash == NULL) {
ret = WS_MEMORY_E;
int digestSz;
digestSz = wc_HashGetDigestSize((enum wc_HashType)hashId);
if (digestSz <= 0) {
ret = WS_INVALID_ALGO_ID;
}
else {
sharedSecretHashSz = (byte)digestSz;
sharedSecretHash = (byte *)WMALLOC(sharedSecretHashSz,
ssh->ctx->heap,
DYNTYPE_PRIVKEY);
if (sharedSecretHash == NULL) {
ret = WS_MEMORY_E;
}
}
}
@ -12370,11 +12378,19 @@ static int KeyAgreeEcdhMlKem_server(WOLFSSH* ssh, byte hashId,
/* Replace the concatenated shared secrets with the hash. That
* will become the new shared secret.*/
if (ret == 0) {
sharedSecretHashSz = wc_HashGetDigestSize((enum wc_HashType)hashId);
sharedSecretHash = (byte *)WMALLOC(sharedSecretHashSz,
ssh->ctx->heap, DYNTYPE_PRIVKEY);
if (sharedSecretHash == NULL) {
ret = WS_MEMORY_E;
int digestSz;
digestSz = wc_HashGetDigestSize((enum wc_HashType)hashId);
if (digestSz <= 0) {
ret = WS_INVALID_ALGO_ID;
}
else {
sharedSecretHashSz = (byte)digestSz;
sharedSecretHash = (byte *)WMALLOC(sharedSecretHashSz,
ssh->ctx->heap, DYNTYPE_PRIVKEY);
if (sharedSecretHash == NULL) {
ret = WS_MEMORY_E;
}
}
}
if (ret == 0) {
@ -13557,12 +13573,11 @@ int SendKexDhInit(WOLFSSH* ssh)
#if !defined(WOLFSSH_NO_NISTP256_MLKEM768_SHA256) || \
!defined(WOLFSSH_NO_NISTP384_MLKEM1024_SHA384) || \
!defined(WOLFSSH_NO_CURVE25519_MLKEM768_SHA256)
if (ssh->handshake->useEccMlKem) {
if (ret == WS_SUCCESS && ssh->handshake->useEccMlKem) {
MlKemKey kem;
word32 length_publickey = 0;
word32 length_privatekey = 0;
int mlKemType = WC_ML_KEM_768;
ret = 0;
WMEMSET(&kem, 0, sizeof(kem));