diff options
author | tb <> | 2020-05-24 10:35:57 +0000 |
---|---|---|
committer | tb <> | 2020-05-24 10:35:57 +0000 |
commit | bf9e1e83d2e56755afd6e9007d5202d39fe11160 (patch) | |
tree | f3c6a209f1b0bd2b49cf1dd9f28f5d1d2491d1ba | |
parent | 364287f1f997e5182cdd62d40726564bff96a8af (diff) | |
download | openbsd-bf9e1e83d2e56755afd6e9007d5202d39fe11160.tar.gz openbsd-bf9e1e83d2e56755afd6e9007d5202d39fe11160.tar.bz2 openbsd-bf9e1e83d2e56755afd6e9007d5202d39fe11160.zip |
The version detection doesn't work on bluhm's test machine, causing
the test to fail. Neuter it for now and just assume we do TLSv1.3.
I have been intending to purge this version detection hack once I'm
sure we can leave the 1.3 server enabled but I'll leave it here for
now.
-rw-r--r-- | src/regress/lib/libssl/tlsfuzzer/tlsfuzzer.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/regress/lib/libssl/tlsfuzzer/tlsfuzzer.py b/src/regress/lib/libssl/tlsfuzzer/tlsfuzzer.py index 963115217c..df965467d6 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.2 2020/05/21 19:08:32 tb Exp $ | 1 | # $OpenBSD: tlsfuzzer.py,v 1.3 2020/05/24 10:35:57 tb Exp $ |
2 | # | 2 | # |
3 | # Copyright (c) 2020 Theo Buehler <tb@openbsd.org> | 3 | # Copyright (c) 2020 Theo Buehler <tb@openbsd.org> |
4 | # | 4 | # |
@@ -150,7 +150,7 @@ tls13_slow_failing_tests = TestGroup("slow, failing TLSv1.3 tests", [ | |||
150 | # 'post-handshake KeyUpdate msg with update_not_request' | 150 | # 'post-handshake KeyUpdate msg with update_not_request' |
151 | # 'post-handshake KeyUpdate msg with update_request' | 151 | # 'post-handshake KeyUpdate msg with update_request' |
152 | Test("test-tls13-keyupdate.py"), | 152 | Test("test-tls13-keyupdate.py"), |
153 | 153 | ||
154 | Test("test-tls13-symetric-ciphers.py"), # unexpected message from peer | 154 | Test("test-tls13-symetric-ciphers.py"), # unexpected message from peer |
155 | 155 | ||
156 | # 70 fail and 644 pass. For some reason the tests expect a decode_error | 156 | # 70 fail and 644 pass. For some reason the tests expect a decode_error |
@@ -583,7 +583,7 @@ class TlsServer: | |||
583 | ) | 583 | ) |
584 | 584 | ||
585 | # Check whether the server talks TLSv1.3 | 585 | # Check whether the server talks TLSv1.3 |
586 | self.has_tls1_3 = subprocess.run( | 586 | self.has_tls1_3 = True or subprocess.run( |
587 | [ | 587 | [ |
588 | "nc", | 588 | "nc", |
589 | "-c", | 589 | "-c", |