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

Merge pull request #5782 from SparkiDev/dh_sp_agree_0_1_fix

Browse Source 
DH: fix when using SP
This commit is contained in:
Daniel Pouzzner
2022-11-08 22:41:08 -06:00
committed by GitHub
parent eac3b4e189 2d757eadd0
commit 1938b117c2
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
wolfcrypt/src/dh.c
View File

@@ -2037,6 +2037,11 @@ static int wc_DhAgree_Sync(DhKey* key, byte* agree, word32* agreeSz,
RESTORE_VECTOR_REGISTERS(); RESTORE_VECTOR_REGISTERS();
/* make sure agree is > 1 (SP800-56A, 5.7.1.1) */
if ((*agreeSz == 0) || ((*agreeSz == 1) && (agree[0] == 1))) {
ret = MP_VAL;
}
#if defined(WOLFSSL_SMALL_STACK) && !defined(WOLFSSL_NO_MALLOC) #if defined(WOLFSSL_SMALL_STACK) && !defined(WOLFSSL_NO_MALLOC)
#if !defined(WOLFSSL_SP_MATH) #if !defined(WOLFSSL_SP_MATH)
XFREE(z, key->heap, DYNAMIC_TYPE_DH); XFREE(z, key->heap, DYNAMIC_TYPE_DH);
@@ -2064,6 +2069,11 @@ static int wc_DhAgree_Sync(DhKey* key, byte* agree, word32* agreeSz,
RESTORE_VECTOR_REGISTERS(); RESTORE_VECTOR_REGISTERS();
/* make sure agree is > 1 (SP800-56A, 5.7.1.1) */
if ((*agreeSz == 0) || ((*agreeSz == 1) && (agree[0] == 1))) {
ret = MP_VAL;
}
#if defined(WOLFSSL_SMALL_STACK) && !defined(WOLFSSL_NO_MALLOC) #if defined(WOLFSSL_SMALL_STACK) && !defined(WOLFSSL_NO_MALLOC)
#if !defined(WOLFSSL_SP_MATH) #if !defined(WOLFSSL_SP_MATH)
XFREE(z, key->heap, DYNAMIC_TYPE_DH); XFREE(z, key->heap, DYNAMIC_TYPE_DH);
@@ -2091,6 +2101,11 @@ static int wc_DhAgree_Sync(DhKey* key, byte* agree, word32* agreeSz,
RESTORE_VECTOR_REGISTERS(); RESTORE_VECTOR_REGISTERS();
/* make sure agree is > 1 (SP800-56A, 5.7.1.1) */
if ((*agreeSz == 0) || ((*agreeSz == 1) && (agree[0] == 1))) {
ret = MP_VAL;
}
#if defined(WOLFSSL_SMALL_STACK) && !defined(WOLFSSL_NO_MALLOC) #if defined(WOLFSSL_SMALL_STACK) && !defined(WOLFSSL_NO_MALLOC)
#if !defined(WOLFSSL_SP_MATH) #if !defined(WOLFSSL_SP_MATH)
XFREE(z, key->heap, DYNAMIC_TYPE_DH); XFREE(z, key->heap, DYNAMIC_TYPE_DH);