summaryrefslogtreecommitdiff
path: root/chromium/net
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/net')
-rw-r--r--chromium/net/cert/pki/test_helpers.cc2
-rwxr-xr-xchromium/net/data/gencerts/__init__.py10
-rw-r--r--chromium/net/dns/public/doh_provider_entry.cc2
-rw-r--r--chromium/net/http/transport_security_state_static.json.gzbin1433904 -> 1433904 bytes
4 files changed, 7 insertions, 7 deletions
diff --git a/chromium/net/cert/pki/test_helpers.cc b/chromium/net/cert/pki/test_helpers.cc
index 914b6a3921a..50cc1ba5105 100644
--- a/chromium/net/cert/pki/test_helpers.cc
+++ b/chromium/net/cert/pki/test_helpers.cc
@@ -236,7 +236,7 @@ bool ReadVerifyCertChainTestFromFile(const std::string& file_path_ascii,
ReadCertChainFromFile(chain_path, &test->chain);
} else if (GetValue("utc_time: ", line_piece, &value, &has_time)) {
if (value == "DEFAULT") {
- value = "211005120000Z";
+ value = "221005120000Z";
}
if (!der::ParseUTCTime(der::Input(&value), &test->time)) {
ADD_FAILURE() << "Failed parsing UTC time";
diff --git a/chromium/net/data/gencerts/__init__.py b/chromium/net/data/gencerts/__init__.py
index 0df76913d82..1231e37cc88 100755
--- a/chromium/net/data/gencerts/__init__.py
+++ b/chromium/net/data/gencerts/__init__.py
@@ -40,12 +40,12 @@ SEPTEMBER_1_2015_UTC = '150901120000Z'
# January 1st, 2016 12:00 UTC
JANUARY_1_2016_UTC = '160101120000Z'
-# October 5th, 2021 12:00 UTC
-OCTOBER_5_2021_UTC = '211005120000Z'
-
# October 5th, 2022 12:00 UTC
OCTOBER_5_2022_UTC = '221005120000Z'
+# October 5th, 2023 12:00 UTC
+OCTOBER_5_2023_UTC = '231005120000Z'
+
KEY_PURPOSE_ANY = 'anyExtendedKeyUsage'
KEY_PURPOSE_SERVER_AUTH = 'serverAuth'
KEY_PURPOSE_CLIENT_AUTH = 'clientAuth'
@@ -66,8 +66,8 @@ g_invoking_script_path = None
# The default validity range of generated certificates. Can be modified with
# set_default_validity_range(). Chosen to end on a Wednesday, since these
# will have to be manually re-generated.
-g_default_start_date = OCTOBER_5_2021_UTC
-g_default_end_date = OCTOBER_5_2022_UTC
+g_default_start_date = OCTOBER_5_2022_UTC
+g_default_end_date = OCTOBER_5_2023_UTC
def set_default_validity_range(start_date, end_date):
diff --git a/chromium/net/dns/public/doh_provider_entry.cc b/chromium/net/dns/public/doh_provider_entry.cc
index 2afa35f9220..e04a49a8d32 100644
--- a/chromium/net/dns/public/doh_provider_entry.cc
+++ b/chromium/net/dns/public/doh_provider_entry.cc
@@ -279,7 +279,7 @@ const DohProviderEntry::List& DohProviderEntry::GetList() {
/*display_countries=*/{}, LoggingLevel::kNormal),
new DohProviderEntry(
"Switch",
- base::Feature{"DohProviderSwitch", base::FEATURE_ENABLED_BY_DEFAULT},
+ base::Feature{"DohProviderSwitch", base::FEATURE_DISABLED_BY_DEFAULT},
/*provider_id_for_histogram=*/absl::nullopt,
{"130.59.31.251", "130.59.31.248", "2001:620:0:ff::2",
"2001:620:0:ff::3"},
diff --git a/chromium/net/http/transport_security_state_static.json.gz b/chromium/net/http/transport_security_state_static.json.gz
index 92182cb59b8..f2ce129fb1c 100644
--- a/chromium/net/http/transport_security_state_static.json.gz
+++ b/chromium/net/http/transport_security_state_static.json.gz
Binary files differ