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

ECDHE-PSK with x25519

Browse Source 
1. Add missing assignment of the WOLFSSL object's ecdhCurveOid value. It
   is set correctly in the previous cases, but got missed for ECDHE-PSK.
2. Add test cases to the unit testing.
This commit is contained in:
John Safranek
2024-01-16 15:18:05 -08:00
parent 7a77d64d56
commit 746ffac84a
3 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/internal.c
View File

@ -29895,6 +29895,7 @@ static int DoServerKeyExchange(WOLFSSL* ssl, const byte* input,
if ((curveOid = CheckCurveId(b)) < 0) { if ((curveOid = CheckCurveId(b)) < 0) {
ERROR_OUT(ECC_CURVE_ERROR, exit_dske); ERROR_OUT(ECC_CURVE_ERROR, exit_dske);
} }
ssl->ecdhCurveOID = curveOid;
length = input[args->idx++]; length = input[args->idx++];
if ((args->idx - args->begin) + length > size) { if ((args->idx - args->begin) + length > size) {

14
tests/test-dtls.conf
View File

@ -55,6 +55,20 @@
-s -s
-l ECDHE-PSK-CHACHA20-POLY1305 -l ECDHE-PSK-CHACHA20-POLY1305
# server TLSv1.2 ECDHE-PSK-CHACHA20-POLY1305 x25519
-u
-v 3
-s
-t
-l ECDHE-PSK-CHACHA20-POLY1305
# client TLSv1.2 ECDHE-PSK-CHACHA20-POLY1305 x25519
-u
-v 3
-s
-t
-l ECDHE-PSK-CHACHA20-POLY1305
# server TLSv1.2 PSK-CHACHA20-POLY1305 # server TLSv1.2 PSK-CHACHA20-POLY1305
-u -u
-v 3 -v 3

12
tests/test.conf
View File

@ -45,6 +45,18 @@
-s -s
-l ECDHE-PSK-CHACHA20-POLY1305 -l ECDHE-PSK-CHACHA20-POLY1305
# server TLSv1.2 ECDHE-PSK-CHACHA20-POLY1305 x25519
-v 3
-s
-t
-l ECDHE-PSK-CHACHA20-POLY1305
# client TLSv1.2 ECDHE-PSK-CHACHA20-POLY1305 x25519
-v 3
-s
-t
-l ECDHE-PSK-CHACHA20-POLY1305
# server TLSv1.2 PSK-CHACHA20-POLY1305 # server TLSv1.2 PSK-CHACHA20-POLY1305
-v 3 -v 3
-s -s