Merge pull request #7132 from ejohnstown/x25519-ecdhe-psk

ECDHE-PSK with x25519
This commit is contained in:
David Garske 2024-01-16 20:16:01 -08:00 committed by GitHub
commit 089468fbf1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 27 additions and 0 deletions

View File

@ -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) {

View File

@ -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

View File

@ -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