feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

DH: fix when using SP

Browse Source 
The agreed secret must not be 0 or 1 by SP800-56A, 5.7.1.1.
Check done when not using SP.
Add check to SP calling code.
This commit is contained in:
Sean Parkinson
2022-11-09 09:55:16 +10:00
parent dfa997a6fd
commit 2d757eadd0
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);