Merge pull request #7132 from ejohnstown/x25519-ecdhe-psk
ECDHE-PSK with x25519
This commit is contained in:
commit
089468fbf1
@ -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) {
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user