mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-26 02:17:34 +09:00
Replace NSS with Pale Moon's
This commit is contained in:
parent
ff1e5e48bf
commit
8c2e376f94
2870 changed files with 1762232 additions and 1374220 deletions
|
|
@ -1,4 +1,5 @@
|
|||
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* vim: set ts=2 et sw=2 tw=80: */
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
|
@ -958,6 +959,34 @@ TEST_P(TlsKeyExchange13, ConnectEcdhePreferenceMismatchHrr) {
|
|||
CheckKEXDetails(client_groups, expectedShares, ssl_grp_ec_curve25519);
|
||||
}
|
||||
|
||||
TEST_P(TlsKeyExchange13, SecondClientHelloPreambleMatches) {
|
||||
server_->SetVersionRange(SSL_LIBRARY_VERSION_TLS_1_3,
|
||||
SSL_LIBRARY_VERSION_TLS_1_3);
|
||||
client_->SetVersionRange(SSL_LIBRARY_VERSION_TLS_1_1,
|
||||
SSL_LIBRARY_VERSION_TLS_1_3);
|
||||
|
||||
ConfigureSelfEncrypt();
|
||||
static const std::vector<SSLNamedGroup> client_groups = {
|
||||
ssl_grp_ec_secp384r1, ssl_grp_ec_curve25519};
|
||||
static const std::vector<SSLNamedGroup> server_groups = {
|
||||
ssl_grp_ec_curve25519};
|
||||
client_->ConfigNamedGroups(client_groups);
|
||||
server_->ConfigNamedGroups(server_groups);
|
||||
|
||||
auto ch1 = MakeTlsFilter<ClientHelloPreambleCapture>(client_);
|
||||
StartConnect();
|
||||
client_->Handshake();
|
||||
server_->Handshake();
|
||||
|
||||
MakeNewServer();
|
||||
auto ch2 = MakeTlsFilter<ClientHelloPreambleCapture>(client_);
|
||||
Handshake();
|
||||
|
||||
EXPECT_TRUE(ch1->captured());
|
||||
EXPECT_TRUE(ch2->captured());
|
||||
EXPECT_EQ(ch1->contents(), ch2->contents());
|
||||
}
|
||||
|
||||
// This should work, but not use HRR because the key share for x25519 was
|
||||
// pre-generated by the client.
|
||||
TEST_P(TlsKeyExchange13, ConnectEcdhePreferenceMismatchHrrExtraShares) {
|
||||
|
|
@ -1107,9 +1136,10 @@ class HelloRetryRequestAgentTest : public TlsAgentTestClient {
|
|||
|
||||
hrr_data.Allocate(len + 6);
|
||||
size_t i = 0;
|
||||
i = hrr_data.Write(i, variant_ == ssl_variant_datagram
|
||||
? SSL_LIBRARY_VERSION_DTLS_1_2_WIRE
|
||||
: SSL_LIBRARY_VERSION_TLS_1_2,
|
||||
i = hrr_data.Write(i,
|
||||
variant_ == ssl_variant_datagram
|
||||
? SSL_LIBRARY_VERSION_DTLS_1_2_WIRE
|
||||
: SSL_LIBRARY_VERSION_TLS_1_2,
|
||||
2);
|
||||
i = hrr_data.Write(i, ssl_hello_retry_random,
|
||||
sizeof(ssl_hello_retry_random));
|
||||
|
|
@ -1121,9 +1151,10 @@ class HelloRetryRequestAgentTest : public TlsAgentTestClient {
|
|||
// Now the supported version.
|
||||
i = hrr_data.Write(i, ssl_tls13_supported_versions_xtn, 2);
|
||||
i = hrr_data.Write(i, 2, 2);
|
||||
i = hrr_data.Write(i, (variant_ == ssl_variant_datagram)
|
||||
? (0x7f00 | DTLS_1_3_DRAFT_VERSION)
|
||||
: SSL_LIBRARY_VERSION_TLS_1_3,
|
||||
i = hrr_data.Write(i,
|
||||
(variant_ == ssl_variant_datagram)
|
||||
? (0x7f00 | DTLS_1_3_DRAFT_VERSION)
|
||||
: SSL_LIBRARY_VERSION_TLS_1_3,
|
||||
2);
|
||||
if (len) {
|
||||
hrr_data.Write(i, body, len);
|
||||
|
|
@ -1320,13 +1351,14 @@ TEST_F(TlsConnectStreamTls13, HrrThenTls12SupportedVersions) {
|
|||
client_->CheckErrorCode(SSL_ERROR_PROTOCOL_VERSION_ALERT);
|
||||
}
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(HelloRetryRequestAgentTests, HelloRetryRequestAgentTest,
|
||||
::testing::Combine(TlsConnectTestBase::kTlsVariantsAll,
|
||||
TlsConnectTestBase::kTlsV13));
|
||||
INSTANTIATE_TEST_SUITE_P(HelloRetryRequestAgentTests,
|
||||
HelloRetryRequestAgentTest,
|
||||
::testing::Combine(TlsConnectTestBase::kTlsVariantsAll,
|
||||
TlsConnectTestBase::kTlsV13));
|
||||
#ifndef NSS_DISABLE_TLS_1_3
|
||||
INSTANTIATE_TEST_CASE_P(HelloRetryRequestKeyExchangeTests, TlsKeyExchange13,
|
||||
::testing::Combine(TlsConnectTestBase::kTlsVariantsAll,
|
||||
TlsConnectTestBase::kTlsV13));
|
||||
INSTANTIATE_TEST_SUITE_P(HelloRetryRequestKeyExchangeTests, TlsKeyExchange13,
|
||||
::testing::Combine(TlsConnectTestBase::kTlsVariantsAll,
|
||||
TlsConnectTestBase::kTlsV13));
|
||||
#endif
|
||||
|
||||
} // namespace nss_test
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue