diff options
| author | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2016-09-14 07:44:16 -0700 |
|---|---|---|
| committer | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2016-09-14 07:44:16 -0700 |
| commit | abd24ac62751393548db42e20e874d2f4114df2c (patch) | |
| tree | 714f015dc811cbe084f4ec3f18edd688b90ef1c8 | |
| parent | 0d024efa19c3c2b90a5bc86e411ba724bf1f29ec (diff) | |
| download | nss-hg-abd24ac62751393548db42e20e874d2f4114df2c.tar.gz | |
Bug 1296239 - follow up for more than suite b, r=me
| -rw-r--r-- | external_tests/ssl_gtest/ssl_ecdh_unittest.cc | 4 | ||||
| -rw-r--r-- | external_tests/ssl_gtest/tls_agent.cc | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/external_tests/ssl_gtest/ssl_ecdh_unittest.cc b/external_tests/ssl_gtest/ssl_ecdh_unittest.cc index b0e5a8428..af0fbe2f0 100644 --- a/external_tests/ssl_gtest/ssl_ecdh_unittest.cc +++ b/external_tests/ssl_gtest/ssl_ecdh_unittest.cc @@ -238,6 +238,10 @@ TEST_P(TlsConnectGenericPre13, P384PriorityOnServer) { } TEST_P(TlsConnectGenericPre13, P384PriorityFromModelSocket) { +#ifdef NSS_ECC_MORE_THAN_SUITE_B + // We can't run this test with a model socket and more than suite B. + return; +#endif EnsureModelSockets(); /* Both prefer P384, set on the model socket. */ diff --git a/external_tests/ssl_gtest/tls_agent.cc b/external_tests/ssl_gtest/tls_agent.cc index 359b2e157..7cb7e98fc 100644 --- a/external_tests/ssl_gtest/tls_agent.cc +++ b/external_tests/ssl_gtest/tls_agent.cc @@ -129,7 +129,8 @@ bool TlsAgent::ConfigServerCert(const std::string& name, bool updateKeyBits, void TlsAgent::DisableLameGroups() { #ifdef NSS_ECC_MORE_THAN_SUITE_B static const SSLNamedGroup groups[] = { - ssl_grp_ec_secp256r1, ssl_grp_ec_secp384r1, ssl_grp_ec_secp521r1}; + ssl_grp_ec_secp256r1, ssl_grp_ec_secp384r1, ssl_grp_ec_secp521r1, + ssl_grp_ffdhe_2048, ssl_grp_ffdhe_3072, ssl_grp_ffdhe_4096}; ConfigNamedGroups(groups, PR_ARRAY_SIZE(groups)); #endif } |