Chiebot-Mirror
/
boringssl
mirror of https://gitee.com/mirrors/boringssl.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

runner: Remove redundant -enable-all-curves shim flag.

Browse Source 
We already know all the supported curves in runner.go. No sense in
repeating this list in more places than needed. (I'm about to need a
similar construct for -signing-prefs, so I figure it's worth being
consistent.)

This CL also adds a ShimConfig option because others don't support the
same curves we do and will likely run into this quickly.

Change-Id: Id79cea16891802af021b53a33ffd811a5d51c4ae
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/46186
Reviewed-by: Adam Langley <agl@google.com>
grpc-202302
David Benjamin 4 years ago committed by Adam Langley
parent 87aafb69e8
commit 1eae29777c
3 changed files with 73 additions and 60 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 121
      ssl/test/runner/runner.go
  2. 11
      ssl/test/test_config.cc
  3. 1
      ssl/test/test_config.h

121
ssl/test/runner/runner.go
Unescape View File

@ -97,6 +97,11 @@ type ShimConfiguration struct {
// HalfRTTTickets is the number of half-RTT tickets the client should
// expect before half-RTT data when testing 0-RTT.
HalfRTTTickets int
// AllCurves is the list of all curve code points supported by the shim.
// This is currently used to control tests that enable all curves but may
// automatically disable tests in the future.
AllCurves []int
}
// Setup shimConfig defaults aligning with BoringSSL.
@ -253,6 +258,14 @@ func initCertificates() {
garbageCertificate.PrivateKey = rsaCertificate.PrivateKey
}
func flagInts(flagName string, vals []int) []string {
ret := make([]string, 0, 2*len(vals))
for _, val := range vals {
ret = append(ret, flagName, strconv.Itoa(val))
}
return ret
}
func useDebugger() bool {
return *useGDB || *useLLDB || *useRR || *waitForDebugger
}
@ -9982,11 +9995,13 @@ func addSignatureAlgorithmTests() {
fakeSigAlg2,
},
},
flags: []string{
"-cert-file", path.Join(*resourceDir, getShimCertificate(alg.cert)),
"-key-file", path.Join(*resourceDir, getShimKey(alg.cert)),
"-enable-all-curves",
},
flags: append(
[]string{
"-cert-file", path.Join(*resourceDir, getShimCertificate(alg.cert)),
"-key-file", path.Join(*resourceDir, getShimKey(alg.cert)),
},
flagInts("-curves", shimConfig.AllCurves)...,
),
shouldFail: shouldFail,
expectedError: signError,
expectedLocalError: signLocalError,
@ -10004,12 +10019,14 @@ func addSignatureAlgorithmTests() {
MaxVersion: ver.version,
VerifySignatureAlgorithms: allAlgorithms,
},
flags: []string{
"-cert-file", path.Join(*resourceDir, getShimCertificate(alg.cert)),
"-key-file", path.Join(*resourceDir, getShimKey(alg.cert)),
"-enable-all-curves",
"-signing-prefs", strconv.Itoa(int(alg.id)),
},
flags: append(
[]string{
"-cert-file", path.Join(*resourceDir, getShimCertificate(alg.cert)),
"-key-file", path.Join(*resourceDir, getShimKey(alg.cert)),
"-signing-prefs", strconv.Itoa(int(alg.id)),
},
flagInts("-curves", shimConfig.AllCurves)...,
),
expectations: connectionExpectations{
peerSignatureAlgorithm: alg.id,
},
@ -10046,12 +10063,14 @@ func addSignatureAlgorithmTests() {
IgnorePeerSignatureAlgorithmPreferences: shouldFail,
},
},
flags: []string{
"-expect-peer-signature-algorithm", strconv.Itoa(int(alg.id)),
"-enable-all-curves",
// The algorithm may be disabled by default, so explicitly enable it.
"-verify-prefs", strconv.Itoa(int(alg.id)),
},
flags: append(
[]string{
"-expect-peer-signature-algorithm", strconv.Itoa(int(alg.id)),
// The algorithm may be disabled by default, so explicitly enable it.
"-verify-prefs", strconv.Itoa(int(alg.id)),
},
flagInts("-curves", shimConfig.AllCurves)...,
),
// Resume the session to assert the peer signature
// algorithm is reported on both handshakes.
resumeSession: !shouldFail,
@ -10077,10 +10096,10 @@ func addSignatureAlgorithmTests() {
IgnorePeerSignatureAlgorithmPreferences: rejectByDefault,
},
},
flags: []string{
"-expect-peer-signature-algorithm", strconv.Itoa(int(alg.id)),
"-enable-all-curves",
},
flags: append(
[]string{"-expect-peer-signature-algorithm", strconv.Itoa(int(alg.id))},
flagInts("-curves", shimConfig.AllCurves)...,
),
// Resume the session to assert the peer signature
// algorithm is reported on both handshakes.
resumeSession: !rejectByDefault,
@ -10103,11 +10122,11 @@ func addSignatureAlgorithmTests() {
InvalidSignature: true,
},
},
flags: []string{
"-enable-all-curves",
flags: append(
// The algorithm may be disabled by default, so explicitly enable it.
"-verify-prefs", strconv.Itoa(int(alg.id)),
},
[]string{"-verify-prefs", strconv.Itoa(int(alg.id))},
flagInts("-curves", shimConfig.AllCurves)...,
),
shouldFail: true,
expectedError: ":BAD_SIGNATURE:",
}
@ -11491,10 +11510,10 @@ func addCurveTests() {
},
CurvePreferences: []CurveID{curve.id},
},
flags: []string{
"-enable-all-curves",
"-expect-curve-id", strconv.Itoa(int(curve.id)),
},
flags: append(
[]string{"-expect-curve-id", strconv.Itoa(int(curve.id))},
flagInts("-curves", shimConfig.AllCurves)...,
),
expectations: connectionExpectations{
curveID: curve.id,
},
@ -11511,10 +11530,10 @@ func addCurveTests() {
},
CurvePreferences: []CurveID{curve.id},
},
flags: []string{
"-enable-all-curves",
"-expect-curve-id", strconv.Itoa(int(curve.id)),
},
flags: append(
[]string{"-expect-curve-id", strconv.Itoa(int(curve.id))},
flagInts("-curves", shimConfig.AllCurves)...,
),
expectations: connectionExpectations{
curveID: curve.id,
},
@ -11535,7 +11554,7 @@ func addCurveTests() {
SendCompressedCoordinates: true,
},
},
flags: []string{"-enable-all-curves"},
flags: flagInts("-curves", shimConfig.AllCurves),
shouldFail: true,
expectedError: ":BAD_ECPOINT:",
})
@ -11554,7 +11573,7 @@ func addCurveTests() {
SendCompressedCoordinates: true,
},
},
flags: []string{"-enable-all-curves"},
flags: flagInts("-curves", shimConfig.AllCurves),
shouldFail: true,
expectedError: ":BAD_ECPOINT:",
})
@ -16760,6 +16779,25 @@ func main() {
*resourceDir = path.Clean(*resourceDir)
initCertificates()
if len(*shimConfigFile) != 0 {
encoded, err := ioutil.ReadFile(*shimConfigFile)
if err != nil {
fmt.Fprintf(os.Stderr, "Couldn't read config file %q: %s\n", *shimConfigFile, err)
os.Exit(1)
}
if err := json.Unmarshal(encoded, &shimConfig); err != nil {
fmt.Fprintf(os.Stderr, "Couldn't decode config file %q: %s\n", *shimConfigFile, err)
os.Exit(1)
}
}
if shimConfig.AllCurves == nil {
for _, curve := range testCurves {
shimConfig.AllCurves = append(shimConfig.AllCurves, int(curve.id))
}
}
addBasicTests()
addCipherSuiteTests()
addBadECDSASignatureTests()
@ -16817,19 +16855,6 @@ func main() {
testChan := make(chan *testCase, numWorkers)
doneChan := make(chan *testresult.Results)
if len(*shimConfigFile) != 0 {
encoded, err := ioutil.ReadFile(*shimConfigFile)
if err != nil {
fmt.Fprintf(os.Stderr, "Couldn't read config file %q: %s\n", *shimConfigFile, err)
os.Exit(1)
}
if err := json.Unmarshal(encoded, &shimConfig); err != nil {
fmt.Fprintf(os.Stderr, "Couldn't decode config file %q: %s\n", *shimConfigFile, err)
os.Exit(1)
}
}
go statusPrinter(doneChan, statusChan, len(testCases))
for i := 0; i < numWorkers; i++ {

11
ssl/test/test_config.cc
Unescape View File

@ -109,7 +109,6 @@ const Flag<bool> kBoolFlags[] = {
{"-renegotiate-explicit", &TestConfig::renegotiate_explicit},
{"-forbid-renegotiation-after-handshake",
&TestConfig::forbid_renegotiation_after_handshake},
{"-enable-all-curves", &TestConfig::enable_all_curves},
{"-use-old-client-cert-callback",
&TestConfig::use_old_client_cert_callback},
{"-send-alert", &TestConfig::send_alert},
@ -1721,16 +1720,6 @@ bssl::UniquePtr<SSL> TestConfig::NewSSL(
}
}
}
if (enable_all_curves) {
static const int kAllCurves[] = {
NID_secp224r1, NID_X9_62_prime256v1, NID_secp384r1,
NID_secp521r1, NID_X25519, NID_CECPQ2,
};
if (!SSL_set1_curves(ssl.get(), kAllCurves,
OPENSSL_ARRAY_SIZE(kAllCurves))) {
return nullptr;
}
}
if (initial_timeout_duration_ms > 0) {
DTLSv1_set_initial_timeout_duration(ssl.get(), initial_timeout_duration_ms);
}

1
ssl/test/test_config.h
Unescape View File

@ -131,7 +131,6 @@ struct TestConfig {
bool renegotiate_explicit = false;
bool forbid_renegotiation_after_handshake = false;
int expect_peer_signature_algorithm = 0;
bool enable_all_curves = false;
int expect_curve_id = 0;
bool use_old_client_cert_callback = false;
int initial_timeout_duration_ms = 0;

Write Preview
Loading…
Cancel
Save