From 6338e29c49f995fb2d89082345013671fb943d83 Mon Sep 17 00:00:00 2001 From: tb Date: Mon, 18 Jul 2022 09:15:08 +0000 Subject: [PATCH] Add comments to explain the magic numbers 57 and 58 --- regress/lib/libssl/tlsfuzzer/Makefile | 4 ++-- regress/lib/libssl/tlsfuzzer/tlsfuzzer.py | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/regress/lib/libssl/tlsfuzzer/Makefile b/regress/lib/libssl/tlsfuzzer/Makefile index 2097b84caac..2731676303a 100644 --- a/regress/lib/libssl/tlsfuzzer/Makefile +++ b/regress/lib/libssl/tlsfuzzer/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2021/08/30 17:34:02 tb Exp $ +# $OpenBSD: Makefile,v 1.5 2022/07/18 09:15:08 tb Exp $ .if !exists(/usr/local/share/tlsfuzzer) regress: @@ -18,7 +18,7 @@ CLEANFILES += localhost.key localhost.crt PORT ?= 4433 SLOW = -s -TIMING = # -t +TIMING = -t VERBOSE = # -v regress-tlsfuzzer: certs diff --git a/regress/lib/libssl/tlsfuzzer/tlsfuzzer.py b/regress/lib/libssl/tlsfuzzer/tlsfuzzer.py index 821fd055a96..0cbd90c2e24 100644 --- a/regress/lib/libssl/tlsfuzzer/tlsfuzzer.py +++ b/regress/lib/libssl/tlsfuzzer/tlsfuzzer.py @@ -1,4 +1,4 @@ -# $OpenBSD: tlsfuzzer.py,v 1.46 2022/07/18 08:36:47 tb Exp $ +# $OpenBSD: tlsfuzzer.py,v 1.47 2022/07/18 09:15:08 tb Exp $ # # Copyright (c) 2020 Theo Buehler # @@ -175,6 +175,7 @@ tls13_tests = TestGroup("TLSv1.3 tests", [ Test("test-tls13-legacy-version.py"), Test("test-tls13-nociphers.py"), Test("test-tls13-record-padding.py"), + # Exclude QUIC transport parameters Test("test-tls13-shuffled-extentions.py", [ "--exc", "57" ]), Test("test-tls13-zero-content-type.py"), @@ -207,6 +208,7 @@ tls13_slow_tests = TestGroup("slow TLSv1.3 tests", [ ]), # We don't accept an empty ECPF extension since it must advertise the # uncompressed point format. Exclude this extension type from the test. + # Also exclude QUIC transport parameters. Test( "test-tls13-large-number-of-extensions.py", tls13_args = ["--exc", "11", "--exc", "57"], @@ -413,6 +415,7 @@ tls12_slow_tests = TestGroup("slow TLSv1.2 tests", [ Test("test-dhe-no-shared-secret-padding.py", tls12_exclude_legacy_protocols), Test("test-ecdhe-padded-shared-secret.py", tls12_exclude_legacy_protocols), Test("test-ecdhe-rsa-key-share-random.py", tls12_exclude_legacy_protocols), + # Start at extension number 58 to avoid QUIC transport parameters (57) Test("test-large-hello.py", [ "-m", "58" ]), ]) -- 2.20.1