Remove implicit -on-resume for -expect-early-data-accept.
We have a generic mechanism for this now. While
-expect-early-data-accept only makes sense for the resumption leg, we
have some tests which send fake early data to a server on the first leg.
This is in preparation for adding an SSL_get_early_data_reason, where
asserting in those cases would be useful.
(Also -expect-early-data-reject works just fine for initial connections.
It might make sense to make that implicit from the lack of
-expect-early-data-accept?)
Change-Id: I41ad0c5bb538409628885183f88f7fbd619bc6aa
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/35884
Reviewed-by: Adam Langley <agl@google.com>
diff --git a/ssl/test/bssl_shim.cc b/ssl/test/bssl_shim.cc
index 62db076..d61a2a6 100644
--- a/ssl/test/bssl_shim.cc
+++ b/ssl/test/bssl_shim.cc
@@ -587,7 +587,8 @@
return false;
}
- if (is_resume && !SSL_in_early_data(ssl)) {
+ // The early data status is only applicable after the handshake is confirmed.
+ if (!SSL_in_early_data(ssl)) {
if ((config->expect_accept_early_data && !SSL_early_data_accepted(ssl)) ||
(config->expect_reject_early_data && SSL_early_data_accepted(ssl))) {
fprintf(stderr,
diff --git a/ssl/test/runner/runner.go b/ssl/test/runner/runner.go
index 8461bd8..d27b094 100644
--- a/ssl/test/runner/runner.go
+++ b/ssl/test/runner/runner.go
@@ -4532,7 +4532,7 @@
flags: []string{
"-enable-early-data",
"-expect-ticket-supports-early-data",
- "-expect-accept-early-data",
+ "-on-resume-expect-accept-early-data",
"-on-resume-shim-writes-first",
},
})
@@ -4561,7 +4561,7 @@
flags: []string{
"-enable-early-data",
"-expect-ticket-supports-early-data",
- "-expect-accept-early-data",
+ "-on-resume-expect-accept-early-data",
"-on-resume-read-with-unfinished-write",
"-on-resume-shim-writes-first",
},
@@ -4612,7 +4612,7 @@
resumeSession: true,
flags: []string{
"-enable-early-data",
- "-expect-accept-early-data",
+ "-on-resume-expect-accept-early-data",
},
shouldFail: true,
expectedError: ":TOO_MUCH_READ_EARLY_DATA:",
@@ -10129,7 +10129,7 @@
flags: []string{
"-enable-early-data",
"-expect-ticket-supports-early-data",
- "-expect-accept-early-data",
+ "-on-resume-expect-accept-early-data",
"-on-resume-export-keying-material", "1024",
"-on-resume-export-label", "label",
"-on-resume-export-context", "context",
@@ -10160,7 +10160,7 @@
flags: []string{
"-enable-early-data",
"-expect-ticket-supports-early-data",
- "-expect-accept-early-data",
+ "-on-resume-expect-accept-early-data",
"-on-resume-export-early-keying-material", "1024",
"-on-resume-export-label", "label",
"-on-resume-export-context", "context",
@@ -10187,7 +10187,7 @@
flags: []string{
"-enable-early-data",
"-expect-ticket-supports-early-data",
- "-expect-accept-early-data",
+ "-on-resume-expect-accept-early-data",
// Handshake twice on the client to force
// handshake confirmation.
"-handshake-twice",
@@ -12329,7 +12329,7 @@
flags: []string{
"-enable-early-data",
"-expect-ticket-supports-early-data",
- "-expect-accept-early-data",
+ "-on-resume-expect-accept-early-data",
"-on-resume-shim-writes-first",
},
})
@@ -12373,7 +12373,7 @@
resumeSession: true,
flags: []string{
"-enable-early-data",
- "-expect-accept-early-data",
+ "-on-resume-expect-accept-early-data",
},
})
@@ -12394,7 +12394,7 @@
resumeSession: true,
flags: []string{
"-enable-early-data",
- "-expect-accept-early-data",
+ "-on-resume-expect-accept-early-data",
},
})
@@ -13460,7 +13460,7 @@
"-enable-early-data",
"-expect-ticket-supports-early-data",
"-send-channel-id", path.Join(*resourceDir, channelIDKeyFile),
- "-expect-accept-early-data",
+ "-on-resume-expect-accept-early-data",
},
})
@@ -13504,7 +13504,7 @@
expectChannelID: false,
flags: []string{
"-enable-early-data",
- "-expect-accept-early-data",
+ "-on-resume-expect-accept-early-data",
"-enable-channel-id",
},
})
@@ -13565,7 +13565,7 @@
flags: []string{
"-enable-early-data",
"-expect-ticket-supports-early-data",
- "-expect-accept-early-data",
+ "-on-resume-expect-accept-early-data",
"-expect-version", strconv.Itoa(VersionTLS13),
},
})
@@ -13590,7 +13590,7 @@
flags: []string{
"-enable-early-data",
"-expect-ticket-supports-early-data",
- "-expect-accept-early-data",
+ "-on-resume-expect-accept-early-data",
},
shouldFail: true,
expectedError: ":DIGEST_CHECK_FAILED:",
@@ -13614,7 +13614,7 @@
resumeSession: true,
flags: []string{
"-enable-early-data",
- "-expect-accept-early-data",
+ "-on-resume-expect-accept-early-data",
},
shouldFail: true,
expectedError: ":DIGEST_CHECK_FAILED:",
@@ -13639,7 +13639,7 @@
flags: []string{
"-enable-early-data",
"-expect-ticket-supports-early-data",
- "-expect-accept-early-data",
+ "-on-resume-expect-accept-early-data",
},
shouldFail: true,
expectedError: ":DECODE_ERROR:",
@@ -14390,7 +14390,7 @@
flags: []string{
"-async",
"-enable-early-data",
- "-expect-accept-early-data",
+ "-on-resume-expect-accept-early-data",
"-no-op-extra-handshake",
},
})
