Merge pull request #550 from brave/fix_526

Fix #526: Adding static pins for Amazons CAs
brave · Jun 1, 2018 · 9987d58 · 9987d58
1 parent 117fe11
commit 9987d58
Show file tree

Hide file tree

Showing 5 changed files with 1,856 additions and 3 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1,2 @@
 *.patch -crlf
+atom/browser/resources/transport_security_state_static.pins -crlf
diff --git a/atom/browser/BUILD.gn b/atom/browser/BUILD.gn
@@ -90,6 +90,7 @@ source_set("browser") {
     "api/save_page_handler.cc",
     "api/save_page_handler.h",
     "browser/resources/transport_security_state_static.json",
+    "browser/resources/transport_security_state_static.pins",
     "auto_updater.cc",
     "auto_updater.h",
     "atom_browser_client.cc",

diff --git a/atom/browser/resources/transport_security_state_static.json b/atom/browser/resources/transport_security_state_static.json
@@ -69,6 +69,11 @@
     {
       "name": "brave",
       "static_spki_hashes": [
+        "AmazonRootCA1",
+        "AmazonRootCA2",
+        "AmazonRootCA3",
+        "AmazonRootCA4",
+        "StarfieldG2",
         "GlobalSignRootCA",
         "GlobalSignRootCA_R2",
         "GlobalSignRootCA_R3",