ECDHE-PSK with x25519

ejohnstown · ejohnstown · commit 746ffac84ad7 · 2024-01-16T15:18:05.000-08:00
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.
diff --git a/src/internal.c b/src/internal.c
@@ -29895,6 +29895,7 @@ static int DoServerKeyExchange(WOLFSSL* ssl, const byte* input,
                     if ((curveOid = CheckCurveId(b)) < 0) {
                         ERROR_OUT(ECC_CURVE_ERROR, exit_dske);
                     }
+                    ssl->ecdhCurveOID = curveOid;
 
                     length = input[args->idx++];
                     if ((args->idx - args->begin) + length > size) {
diff --git a/tests/test-dtls.conf b/tests/test-dtls.conf
@@ -55,6 +55,20 @@
 -s
 -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
 -u
 -v 3
diff --git a/tests/test.conf b/tests/test.conf
@@ -45,6 +45,18 @@
 -s
 -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
 -v 3
 -s

Original file line number	Diff line number	Diff line change
`@@ -29895,6 +29895,7 @@ static int DoServerKeyExchange(WOLFSSL* ssl, const byte* input,`
`29895`	`29895`	`if ((curveOid = CheckCurveId(b)) < 0) {`
`29896`	`29896`	`ERROR_OUT(ECC_CURVE_ERROR, exit_dske);`
`29897`	`29897`	`}`
	`29898`	`+ ssl->ecdhCurveOID = curveOid;`
`29898`	`29899`
`29899`	`29900`	`length = input[args->idx++];`
`29900`	`29901`	`if ((args->idx - args->begin) + length > size) {`