Patches for v108

This commit is contained in:
csagan5
2022-12-02 23:01:37 +01:00
committed by Carl
parent b832e272de
commit 4d9aeafe84
23 changed files with 1234 additions and 897 deletions
+10 -8
View File
@@ -9,19 +9,19 @@ Instead, let them appear just like regular ones.
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
net/cert/ev_root_ca_metadata.cc | 20 +++++++++++++++++++-
net/cert/ev_root_ca_metadata.cc | 19 ++++++++++++++++++-
net/cert/ev_root_ca_metadata.h | 4 +---
2 files changed, 20 insertions(+), 4 deletions(-)
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/net/cert/ev_root_ca_metadata.cc b/net/cert/ev_root_ca_metadata.cc
index 343c648374cf1..bbfbdbf30a1dc 100644
--- a/net/cert/ev_root_ca_metadata.cc
+++ b/net/cert/ev_root_ca_metadata.cc
@@ -41,7 +41,20 @@ struct EVMetadata {
@@ -40,7 +40,19 @@ struct EVMetadata {
const base::StringPiece policy_oids[kMaxOIDsPerCA];
};
-#include "net/data/ssl/ev_roots/chrome-ev-root-store-inc.cc"
+
-#include "net/data/ssl/chrome_root_store/chrome-ev-roots-inc.cc"
+static const EVMetadata kEvRootCaMetadata[] = {
+ // need some dummy data to make compiler happy, because
+ // arraysize() is implemented as a convoluted template rather than
@@ -38,7 +38,7 @@ diff --git a/net/cert/ev_root_ca_metadata.cc b/net/cert/ev_root_ca_metadata.cc
#endif // defined(PLATFORM_USES_CHROMIUM_EV_METADATA)
} // namespace
@@ -230,6 +243,11 @@ bool EVRootCAMetadata::RemoveEVCA(const SHA256HashValue& fingerprint) {
@@ -225,6 +237,11 @@ bool EVRootCAMetadata::RemoveEVCA(const SHA256HashValue& fingerprint) {
// metadata.
//
@@ -51,6 +51,7 @@ diff --git a/net/cert/ev_root_ca_metadata.cc b/net/cert/ev_root_ca_metadata.cc
LOG(WARNING) << "Not implemented";
return false;
diff --git a/net/cert/ev_root_ca_metadata.h b/net/cert/ev_root_ca_metadata.h
index c568c640f4a42..e8e0c6c9335bb 100644
--- a/net/cert/ev_root_ca_metadata.h
+++ b/net/cert/ev_root_ca_metadata.h
@@ -20,7 +20,7 @@
@@ -75,5 +76,6 @@ diff --git a/net/cert/ev_root_ca_metadata.h b/net/cert/ev_root_ca_metadata.h
// AddEVCA adds an EV CA to the list of known EV CAs with the given policy.
// |policy| is expressed as a string of dotted numbers. It returns true on
--
2.25.1
--
2.30.2