diff options
| author | tb <> | 2020-08-08 10:06:49 +0000 |
|---|---|---|
| committer | tb <> | 2020-08-08 10:06:49 +0000 |
| commit | 28bfaf84059fc3a58ae4c0b63832c473a4a6c928 (patch) | |
| tree | 8c26322677632171b8b3926e28786423606703d1 /src/regress/lib/libssl | |
| parent | 473861658bf10d1929b736546bd3a38077a52103 (diff) | |
| download | openbsd-28bfaf84059fc3a58ae4c0b63832c473a4a6c928.tar.gz openbsd-28bfaf84059fc3a58ae4c0b63832c473a4a6c928.tar.bz2 openbsd-28bfaf84059fc3a58ae4c0b63832c473a4a6c928.zip | |
Enable P-521 and run the tests that use it.
Diffstat (limited to 'src/regress/lib/libssl')
| -rw-r--r-- | src/regress/lib/libssl/tlsfuzzer/tlsfuzzer.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/regress/lib/libssl/tlsfuzzer/tlsfuzzer.py b/src/regress/lib/libssl/tlsfuzzer/tlsfuzzer.py index 1406b6039f..74f4ed937e 100644 --- a/src/regress/lib/libssl/tlsfuzzer/tlsfuzzer.py +++ b/src/regress/lib/libssl/tlsfuzzer/tlsfuzzer.py | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: tlsfuzzer.py,v 1.11 2020/06/24 07:29:21 tb Exp $ | 1 | # $OpenBSD: tlsfuzzer.py,v 1.12 2020/08/08 10:06:49 tb Exp $ |
| 2 | # | 2 | # |
| 3 | # Copyright (c) 2020 Theo Buehler <tb@openbsd.org> | 3 | # Copyright (c) 2020 Theo Buehler <tb@openbsd.org> |
| 4 | # | 4 | # |
| @@ -65,7 +65,6 @@ class TestGroup: | |||
| 65 | tls13_unsupported_ciphers = [ | 65 | tls13_unsupported_ciphers = [ |
| 66 | "-e", "TLS 1.3 with ffdhe2048", | 66 | "-e", "TLS 1.3 with ffdhe2048", |
| 67 | "-e", "TLS 1.3 with ffdhe3072", | 67 | "-e", "TLS 1.3 with ffdhe3072", |
| 68 | "-e", "TLS 1.3 with secp521r1", # XXX: why is this curve problematic? | ||
| 69 | "-e", "TLS 1.3 with x448", | 68 | "-e", "TLS 1.3 with x448", |
| 70 | ] | 69 | ] |
| 71 | 70 | ||
| @@ -205,11 +204,8 @@ tls12_exclude_legacy_protocols = [ | |||
| 205 | "-e", "Protocol (3, 1) in SSLv2 compatible ClientHello", | 204 | "-e", "Protocol (3, 1) in SSLv2 compatible ClientHello", |
| 206 | "-e", "Protocol (3, 2) in SSLv2 compatible ClientHello", | 205 | "-e", "Protocol (3, 2) in SSLv2 compatible ClientHello", |
| 207 | "-e", "Protocol (3, 3) in SSLv2 compatible ClientHello", | 206 | "-e", "Protocol (3, 3) in SSLv2 compatible ClientHello", |
| 208 | "-e", "Protocol (3, 1) with secp521r1 group", # XXX | ||
| 209 | "-e", "Protocol (3, 1) with x448 group", | 207 | "-e", "Protocol (3, 1) with x448 group", |
| 210 | "-e", "Protocol (3, 2) with secp521r1 group", # XXX | ||
| 211 | "-e", "Protocol (3, 2) with x448 group", | 208 | "-e", "Protocol (3, 2) with x448 group", |
| 212 | "-e", "Protocol (3, 3) with secp521r1 group", # XXX | ||
| 213 | "-e", "Protocol (3, 3) with x448 group", | 209 | "-e", "Protocol (3, 3) with x448 group", |
| 214 | ] | 210 | ] |
| 215 | 211 | ||
| @@ -575,6 +571,8 @@ class TlsServer: | |||
| 575 | "s_server", | 571 | "s_server", |
| 576 | "-accept", | 572 | "-accept", |
| 577 | str(port), | 573 | str(port), |
| 574 | "-groups", | ||
| 575 | "X25519:P-256:P-521:P-384", | ||
| 578 | "-key", | 576 | "-key", |
| 579 | "localhost.key", | 577 | "localhost.key", |
| 580 | "-cert", | 578 | "-cert", |