mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-25 09:57:32 +09:00
Issue #1338 - Part 2: Update NSS to 3.48-RTM
This commit is contained in:
parent
1a92143e68
commit
c57cac24e8
885 changed files with 1650639 additions and 59530 deletions
|
|
@ -48,6 +48,8 @@ class TlsConnectTestBase : public ::testing::Test {
|
|||
virtual void SetUp();
|
||||
virtual void TearDown();
|
||||
|
||||
PRTime now() const { return now_; }
|
||||
|
||||
// Initialize client and server.
|
||||
void Init();
|
||||
// Clear the statistics.
|
||||
|
|
@ -131,6 +133,13 @@ class TlsConnectTestBase : public ::testing::Test {
|
|||
|
||||
// Move the DTLS timers for both endpoints to pop the next timer.
|
||||
void ShiftDtlsTimers();
|
||||
void AdvanceTime(PRTime time_shift);
|
||||
|
||||
void ResetAntiReplay(PRTime window);
|
||||
void RolloverAntiReplay();
|
||||
|
||||
void SaveAlgorithmPolicy();
|
||||
void RestoreAlgorithmPolicy();
|
||||
|
||||
protected:
|
||||
SSLProtocolVariant variant_;
|
||||
|
|
@ -142,6 +151,7 @@ class TlsConnectTestBase : public ::testing::Test {
|
|||
SessionResumptionMode expected_resumption_mode_;
|
||||
uint8_t expected_resumptions_;
|
||||
std::vector<std::vector<uint8_t>> session_ids_;
|
||||
ScopedSSLAntiReplayContext anti_replay_;
|
||||
|
||||
// A simple value of "a", "b". Note that the preferred value of "a" is placed
|
||||
// at the end, because the NSS API follows the now defunct NPN specification,
|
||||
|
|
@ -149,14 +159,24 @@ class TlsConnectTestBase : public ::testing::Test {
|
|||
// NSS will move this final entry to the front when used with ALPN.
|
||||
const uint8_t alpn_dummy_val_[4] = {0x01, 0x62, 0x01, 0x61};
|
||||
|
||||
// A list of algorithm IDs whose policies need to be preserved
|
||||
// around test cases. In particular, DSA is checked in
|
||||
// ssl_extension_unittest.cc.
|
||||
const std::vector<SECOidTag> algorithms_ = {SEC_OID_APPLY_SSL_POLICY,
|
||||
SEC_OID_ANSIX9_DSA_SIGNATURE,
|
||||
SEC_OID_CURVE25519, SEC_OID_SHA1};
|
||||
std::vector<std::tuple<SECOidTag, uint32_t>> saved_policies_;
|
||||
|
||||
private:
|
||||
void CheckResumption(SessionResumptionMode expected);
|
||||
void CheckExtendedMasterSecret();
|
||||
void CheckEarlyDataAccepted();
|
||||
static PRTime TimeFunc(void* arg);
|
||||
|
||||
bool expect_extended_master_secret_;
|
||||
bool expect_early_data_accepted_;
|
||||
bool skip_version_checks_;
|
||||
PRTime now_;
|
||||
|
||||
// Track groups and make sure that there are no duplicates.
|
||||
class DuplicateGroupChecker {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue