From 5881d857c573874bde9417e97df3267f19c7ecb6 Mon Sep 17 00:00:00 2001 From: Clide Stefani Date: Tue, 25 Jun 2024 11:46:39 -0400 Subject: [PATCH] crypto/tls: add support for -expect-no-hrr to bogo_shim_test The existing implementation of bogo_shim_test does not support tests that use the expect-no-hrr flag. This change adds support for this flag. Updates #51434 Change-Id: Iadb38fc2262783cab144a7b52904d0443e7fc2c2 Reviewed-on: https://go-review.googlesource.com/c/go/+/594835 LUCI-TryBot-Result: Go LUCI Reviewed-by: Roland Shoemaker Reviewed-by: Russell Webb Reviewed-by: Carlos Amedee Auto-Submit: Roland Shoemaker --- src/crypto/tls/bogo_shim_test.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/crypto/tls/bogo_shim_test.go b/src/crypto/tls/bogo_shim_test.go index 38087d2b1c..f481a5a40f 100644 --- a/src/crypto/tls/bogo_shim_test.go +++ b/src/crypto/tls/bogo_shim_test.go @@ -54,6 +54,7 @@ var ( echConfigListB64 = flag.String("ech-config-list", "", "") expectECHAccepted = flag.Bool("expect-ech-accept", false, "") expectHRR = flag.Bool("expect-hrr", false, "") + expectNoHRR = flag.Bool("expect-no-hrr", false, "") expectedECHRetryConfigs = flag.String("expect-ech-retry-configs", "", "") expectNoECHRetryConfigs = flag.Bool("expect-no-ech-retry-configs", false, "") onInitialExpectECHAccepted = flag.Bool("on-initial-expect-ech-accept", false, "") @@ -283,6 +284,10 @@ func bogoShim() { log.Fatal("expected HRR but did not do it") } + if *expectNoHRR && cs.testingOnlyDidHRR { + log.Fatal("expected no HRR but did do it") + } + if *expectSessionMiss && cs.DidResume { log.Fatal("unexpected session resumption") } -- 2.48.1