Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(697)

Unified Diff: extensions/browser/api/cast_channel/cast_auth_ica.cc

Issue 627573002: Enable passing cast channel certificate authority keys. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Synced with nss/ssl common code changes. Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: extensions/browser/api/cast_channel/cast_auth_ica.cc
diff --git a/extensions/browser/api/cast_channel/cast_auth_ica.cc b/extensions/browser/api/cast_channel/cast_auth_ica.cc
index 1dd83558ce9d1b2b05139c38cc9e44454c69f7bd..ac97edca135c3d2db082c855f4362effc5be2b1a 100644
--- a/extensions/browser/api/cast_channel/cast_auth_ica.cc
+++ b/extensions/browser/api/cast_channel/cast_auth_ica.cc
@@ -4,7 +4,11 @@
#include "extensions/browser/api/cast_channel/cast_auth_ica.h"
+#include "base/base64.h"
+#include "base/lazy_instance.h"
+#include "crypto/signature_verifier.h"
#include "extensions/browser/api/cast_channel/cast_auth_util.h"
+#include "extensions/common/api/cast_channel/authority_keys.pb.h"
#include "net/base/hash_value.h"
#include "net/cert/x509_certificate.h"
@@ -13,18 +17,13 @@ namespace core_api {
namespace cast_channel {
namespace {
-// Struct for trusted ICA certs (for BoringSSL and NSS).
-struct ICACertInfo {
- const net::SHA1HashValue* fingerprint;
- const unsigned char* public_key;
- const int public_key_len;
-};
-
// Fingerprints and public keys of the allowed / trusted ICAs.
-static const net::SHA1HashValue kFingerprintICA1 = { {
- 0x57, 0x16, 0xE2, 0xAD, 0x73, 0x2E, 0xBE, 0xDA, 0xEB, 0x18,
- 0xE8, 0x47, 0x15, 0xA8, 0xDE, 0x90, 0x3B, 0x5E, 0x2A, 0xF4
+static const net::SHA256HashValue kFingerprintICA1 = { {
+ 0x52, 0x9D, 0x9C, 0xD6, 0x7F, 0xE5, 0xEB, 0x69, 0x8E, 0x70, 0xDD, 0x26,
+ 0xD7, 0xD8, 0xF1, 0x26, 0x59, 0xF1, 0xE6, 0xE5, 0x23, 0x48, 0xBF, 0x6A,
+ 0x5C, 0xF7, 0x16, 0xE1, 0x3F, 0x41, 0x0E, 0x73
} };
+
static const unsigned char kPublicKeyICA1[] = {
0x30, 0x82, 0x01, 0x0A, 0x02, 0x82, 0x01, 0x01, 0x00, 0xBC, 0x22, 0x80,
0xBD, 0x80, 0xF6, 0x3A, 0x21, 0x00, 0x3B, 0xAE, 0x76, 0x5E, 0x35, 0x7F,
@@ -51,10 +50,12 @@ static const unsigned char kPublicKeyICA1[] = {
0x1B, 0x02, 0x03, 0x01, 0x00, 0x01
};
-static const net::SHA1HashValue kFingerprintICA2 = { {
- 0x1B, 0xA2, 0x9E, 0xC9, 0x8E, 0x4E, 0xB3, 0x80, 0xEE, 0x55,
- 0xB2, 0x97, 0xFD, 0x2E, 0x2B, 0x2C, 0xB6, 0x8E, 0x0B, 0x2F
-} };
+static const net::SHA256HashValue kFingerprintICA2 = {{
+ 0x98, 0xD6, 0x6D, 0xE8, 0x1C, 0x56, 0x47, 0x84, 0x4D, 0x96, 0x43, 0x4D,
+ 0x37, 0xC4, 0x8D, 0xC2, 0xCE, 0x7F, 0x08, 0x72, 0x50, 0x19, 0xE7, 0xB6,
+ 0xE8, 0x92, 0x7F, 0x56, 0xD6, 0x81, 0xAA, 0x18
+}};
+
static const unsigned char kPublicKeyICA2[] = {
0x30, 0x82, 0x01, 0x0A, 0x02, 0x82, 0x01, 0x01, 0x00, 0xBC, 0x22, 0x80,
0xBD, 0x80, 0xF6, 0x3A, 0x21, 0x00, 0x3B, 0xAE, 0x76, 0x5E, 0x35, 0x7F,
@@ -81,11 +82,45 @@ static const unsigned char kPublicKeyICA2[] = {
0x1B, 0x02, 0x03, 0x01, 0x00, 0x01
};
-static const net::SHA1HashValue kFingerprintICA3 = { {
- 0x97, 0x05, 0xCE, 0xF6, 0x3F, 0xA9, 0x5E, 0x0F, 0xE7, 0x61,
- 0xFB, 0x08, 0x44, 0x31, 0xBE, 0xDE, 0x01, 0xB8, 0xFB, 0xEB
-} };
+static const net::SHA256HashValue kFingerprintICA3 = {{
+ 0xA2, 0x48, 0xC2, 0xE8, 0x54, 0xE6, 0x56, 0xA5, 0x6D, 0xE8, 0x23, 0x1F,
+ 0x1E, 0xE1, 0x75, 0x6F, 0xDB, 0xE4, 0x07, 0xF9, 0xFE, 0xD4, 0x65, 0x0D,
+ 0x60, 0xCC, 0x5A, 0xCB, 0x65, 0x11, 0xC7, 0x20
+}};
+
static const unsigned char kPublicKeyICA3[] = {
+ 0x30, 0x82, 0x01, 0x0A, 0x02, 0x82, 0x01, 0x01, 0x00, 0xB0, 0x0E, 0x5E,
+ 0x07, 0x3A, 0xDF, 0xA4, 0x5F, 0x68, 0xF7, 0x21, 0xC7, 0x64, 0xDB, 0xB6,
+ 0x76, 0xEF, 0xEE, 0x8B, 0x93, 0xF8, 0xF6, 0x1B, 0x88, 0xE1, 0x93, 0xB7,
+ 0x17, 0xF0, 0x15, 0x1E, 0x7E, 0x52, 0x55, 0x77, 0x3C, 0x02, 0x8D, 0x7B,
+ 0x4A, 0x6C, 0xD3, 0xBD, 0xD6, 0xC1, 0x9C, 0x72, 0xC8, 0xB3, 0x15, 0xCF,
+ 0x11, 0xC1, 0xF5, 0x46, 0xC4, 0xD5, 0x20, 0x47, 0xFB, 0x30, 0xF4, 0xE4,
+ 0x61, 0x0C, 0x68, 0xF0, 0x5E, 0xAB, 0x37, 0x8E, 0x9B, 0xE1, 0xBC, 0x81,
+ 0xC3, 0x70, 0x8A, 0x78, 0xD6, 0x83, 0x34, 0x32, 0x9C, 0x19, 0x62, 0xEB,
+ 0xE4, 0x9C, 0xED, 0xE3, 0x64, 0x6C, 0x41, 0x1D, 0x9C, 0xD2, 0x8B, 0x48,
+ 0x4C, 0x23, 0x90, 0x95, 0xB3, 0xE7, 0x52, 0xEA, 0x05, 0x57, 0xCC, 0x60,
+ 0xB3, 0xBA, 0x14, 0xE4, 0xBA, 0x00, 0x39, 0xE4, 0x46, 0x55, 0x74, 0xCE,
+ 0x5A, 0x8E, 0x7A, 0x67, 0x23, 0xDA, 0x68, 0x0A, 0xFA, 0xC4, 0x84, 0x1E,
+ 0xB4, 0xC5, 0xA1, 0xA2, 0x6A, 0x73, 0x1F, 0x6E, 0xC8, 0x2E, 0x2F, 0x9A,
+ 0x9E, 0xA8, 0xB1, 0x0E, 0xFD, 0x87, 0xA6, 0x8F, 0x4D, 0x3D, 0x4B, 0x05,
+ 0xD5, 0x35, 0x5A, 0x74, 0x4D, 0xBC, 0x8E, 0x82, 0x44, 0x96, 0xF4, 0xB5,
+ 0x95, 0x60, 0x4E, 0xA5, 0xDF, 0x27, 0x3D, 0x41, 0x5C, 0x07, 0xA3, 0xB4,
+ 0x35, 0x5A, 0xB3, 0x9E, 0xF2, 0x05, 0x24, 0xCA, 0xCD, 0x31, 0x5A, 0x0D,
+ 0x26, 0x4C, 0xD4, 0xD3, 0xFD, 0x50, 0xE1, 0x34, 0xE9, 0x4C, 0x81, 0x58,
+ 0x30, 0xB2, 0xC7, 0x7A, 0xDD, 0x81, 0x89, 0xA6, 0xD4, 0x3A, 0x38, 0x84,
+ 0x03, 0xB7, 0x34, 0x9E, 0x77, 0x3F, 0xFF, 0x78, 0x07, 0x5B, 0x99, 0xC1,
+ 0xB2, 0x1F, 0x35, 0x56, 0x6E, 0x3A, 0x3C, 0x0C, 0x25, 0xE1, 0x57, 0xF6,
+ 0x8A, 0x7E, 0x49, 0xC0, 0xCC, 0x83, 0x11, 0x35, 0xE7, 0x91, 0x6D, 0x2E,
+ 0x65, 0x02, 0x03, 0x01, 0x00, 0x01
+};
+
+static const net::SHA256HashValue kFingerprintICA4 = {{
+ 0x2B, 0x9B, 0xC7, 0x92, 0xCD, 0x2A, 0x20, 0xB3, 0x65, 0x5E, 0x57, 0xFB,
+ 0x10, 0x1A, 0x95, 0x93, 0x62, 0x53, 0x69, 0x50, 0x52, 0xA2, 0x71, 0x42,
+ 0x2B, 0xFE, 0xB5, 0xB4, 0x5D, 0xC5, 0xA5, 0xE9
+}};
+
+static const unsigned char kPublicKeyICA4[] = {
0x30, 0x82, 0x01, 0x0A, 0x02, 0x82, 0x01, 0x01, 0x00, 0xB7, 0xE8, 0xC3,
0xE4, 0x2C, 0xDE, 0x74, 0x53, 0xF2, 0x49, 0x95, 0x6D, 0xD1, 0xDA, 0x69,
0x57, 0x0D, 0x86, 0xE5, 0xED, 0xB4, 0xB9, 0xE6, 0x73, 0x9F, 0x6C, 0xAD,
@@ -111,40 +146,12 @@ static const unsigned char kPublicKeyICA3[] = {
0x09, 0x02, 0x03, 0x01, 0x00, 0x01
};
-static const net::SHA1HashValue kFingerprintICA4 = { {
- 0x01, 0xF5, 0x28, 0x56, 0x33, 0x80, 0x9B, 0x31, 0xE7, 0xD9,
- 0xF7, 0x4E, 0xAA, 0xDD, 0x97, 0x37, 0xA0, 0x28, 0xE7, 0x24
-} };
-static const unsigned char kPublicKeyICA4[] = {
- 0x30, 0x82, 0x01, 0x0A, 0x02, 0x82, 0x01, 0x01, 0x00, 0xB0, 0x0E, 0x5E,
- 0x07, 0x3A, 0xDF, 0xA4, 0x5F, 0x68, 0xF7, 0x21, 0xC7, 0x64, 0xDB, 0xB6,
- 0x76, 0xEF, 0xEE, 0x8B, 0x93, 0xF8, 0xF6, 0x1B, 0x88, 0xE1, 0x93, 0xB7,
- 0x17, 0xF0, 0x15, 0x1E, 0x7E, 0x52, 0x55, 0x77, 0x3C, 0x02, 0x8D, 0x7B,
- 0x4A, 0x6C, 0xD3, 0xBD, 0xD6, 0xC1, 0x9C, 0x72, 0xC8, 0xB3, 0x15, 0xCF,
- 0x11, 0xC1, 0xF5, 0x46, 0xC4, 0xD5, 0x20, 0x47, 0xFB, 0x30, 0xF4, 0xE4,
- 0x61, 0x0C, 0x68, 0xF0, 0x5E, 0xAB, 0x37, 0x8E, 0x9B, 0xE1, 0xBC, 0x81,
- 0xC3, 0x70, 0x8A, 0x78, 0xD6, 0x83, 0x34, 0x32, 0x9C, 0x19, 0x62, 0xEB,
- 0xE4, 0x9C, 0xED, 0xE3, 0x64, 0x6C, 0x41, 0x1D, 0x9C, 0xD2, 0x8B, 0x48,
- 0x4C, 0x23, 0x90, 0x95, 0xB3, 0xE7, 0x52, 0xEA, 0x05, 0x57, 0xCC, 0x60,
- 0xB3, 0xBA, 0x14, 0xE4, 0xBA, 0x00, 0x39, 0xE4, 0x46, 0x55, 0x74, 0xCE,
- 0x5A, 0x8E, 0x7A, 0x67, 0x23, 0xDA, 0x68, 0x0A, 0xFA, 0xC4, 0x84, 0x1E,
- 0xB4, 0xC5, 0xA1, 0xA2, 0x6A, 0x73, 0x1F, 0x6E, 0xC8, 0x2E, 0x2F, 0x9A,
- 0x9E, 0xA8, 0xB1, 0x0E, 0xFD, 0x87, 0xA6, 0x8F, 0x4D, 0x3D, 0x4B, 0x05,
- 0xD5, 0x35, 0x5A, 0x74, 0x4D, 0xBC, 0x8E, 0x82, 0x44, 0x96, 0xF4, 0xB5,
- 0x95, 0x60, 0x4E, 0xA5, 0xDF, 0x27, 0x3D, 0x41, 0x5C, 0x07, 0xA3, 0xB4,
- 0x35, 0x5A, 0xB3, 0x9E, 0xF2, 0x05, 0x24, 0xCA, 0xCD, 0x31, 0x5A, 0x0D,
- 0x26, 0x4C, 0xD4, 0xD3, 0xFD, 0x50, 0xE1, 0x34, 0xE9, 0x4C, 0x81, 0x58,
- 0x30, 0xB2, 0xC7, 0x7A, 0xDD, 0x81, 0x89, 0xA6, 0xD4, 0x3A, 0x38, 0x84,
- 0x03, 0xB7, 0x34, 0x9E, 0x77, 0x3F, 0xFF, 0x78, 0x07, 0x5B, 0x99, 0xC1,
- 0xB2, 0x1F, 0x35, 0x56, 0x6E, 0x3A, 0x3C, 0x0C, 0x25, 0xE1, 0x57, 0xF6,
- 0x8A, 0x7E, 0x49, 0xC0, 0xCC, 0x83, 0x11, 0x35, 0xE7, 0x91, 0x6D, 0x2E,
- 0x65, 0x02, 0x03, 0x01, 0x00, 0x01
-};
+static const net::SHA256HashValue kFingerprintICA5 = {{
+ 0xFD, 0xCD, 0x0D, 0x59, 0x29, 0xF8, 0x7A, 0x62, 0xD2, 0xFE, 0x0F, 0xD8,
+ 0x94, 0xB8, 0x32, 0xF1, 0xD4, 0x9C, 0x73, 0xF9, 0xD3, 0x51, 0x8B, 0x64,
+ 0x67, 0x3E, 0x04, 0x97, 0x0B, 0x0A, 0x4F, 0xAD
+}};
-static const net::SHA1HashValue kFingerprintICA5 = { {
- 0x59, 0xD6, 0xA3, 0xAB, 0xF3, 0x2E, 0x1D, 0x33, 0x6C, 0xA1,
- 0x08, 0xA4, 0x8A, 0xA4, 0x32, 0x90, 0x5C, 0x63, 0x2B, 0x1E
-} };
static const unsigned char kPublicKeyICA5[] = {
0x30, 0x82, 0x01, 0x0A, 0x02, 0x82, 0x01, 0x01, 0x00, 0xC2, 0xF6, 0xD5,
0x91, 0xDC, 0x37, 0xB4, 0x9A, 0x73, 0x4A, 0xE7, 0x74, 0x6D, 0x03, 0xAE,
@@ -171,10 +178,12 @@ static const unsigned char kPublicKeyICA5[] = {
0xDF, 0x02, 0x03, 0x01, 0x00, 0x01
};
-static const net::SHA1HashValue kFingerprintICA6 = { {
- 0xE0, 0xE1, 0x57, 0x47, 0xFD, 0x50, 0xA4, 0x99, 0x80, 0x6E,
- 0x52, 0x40, 0x9F, 0x9C, 0xE3, 0x9F, 0x6D, 0x81, 0x59, 0xFE
-} };
+static const net::SHA256HashValue kFingerprintICA6 = {{
+ 0xD6, 0xA1, 0xC4, 0xBC, 0x74, 0x5B, 0xC8, 0xE9, 0xED, 0xF8, 0x9C, 0x0D,
+ 0x55, 0xCC, 0xB2, 0xC9, 0xF3, 0x04, 0xF6, 0x6E, 0x4D, 0x3D, 0x27, 0x4C,
+ 0xA3, 0xFC, 0x0F, 0x4B, 0x95, 0x55, 0x10, 0x7E
+}};
+
static const unsigned char kPublicKeyICA6[] = {
0x30, 0x82, 0x01, 0x0A, 0x02, 0x82, 0x01, 0x01, 0x00, 0xB5, 0xC8, 0x14,
0x5B, 0x94, 0x2E, 0x8E, 0x40, 0xBC, 0x8A, 0xAB, 0x1F, 0x48, 0xEE, 0xA5,
@@ -201,10 +210,12 @@ static const unsigned char kPublicKeyICA6[] = {
0xE9, 0x02, 0x03, 0x01, 0x00, 0x01
};
-static const net::SHA1HashValue kFingerprintICA7 = { {
- 0xF9, 0xDC, 0x51, 0x97, 0x48, 0xB6, 0x61, 0xBD, 0x60, 0x78,
- 0x91, 0x6B, 0x20, 0xC1, 0x9A, 0xA3, 0xCA, 0xEC, 0xF8, 0xFC
-} };
+static const net::SHA256HashValue kFingerprintICA7 = {{
+ 0xB6, 0xB3, 0x4F, 0x73, 0x23, 0x9D, 0xA6, 0xDD, 0x9A, 0x26, 0xF7, 0xD5,
+ 0x9E, 0x26, 0x3B, 0xF0, 0x0C, 0x01, 0x6B, 0x21, 0x17, 0x41, 0xE5, 0xAD,
+ 0x92, 0xA5, 0xA0, 0x0B, 0xD7, 0x31, 0x26, 0x11
+}};
+
static const unsigned char kPublicKeyICA7[] = {
0x30, 0x82, 0x01, 0x0A, 0x02, 0x82, 0x01, 0x01, 0x00, 0xCC, 0xE2, 0xB6,
0x2F, 0x11, 0xAB, 0xFF, 0xD0, 0x5D, 0x63, 0x97, 0x59, 0xFA, 0x5F, 0x26,
@@ -231,10 +242,12 @@ static const unsigned char kPublicKeyICA7[] = {
0x3F, 0x02, 0x03, 0x01, 0x00, 0x01
};
-static const net::SHA1HashValue kFingerprintICA8 = { {
- 0x51, 0xD4, 0x70, 0x0A, 0x03, 0x6E, 0xA5, 0x6A, 0xF3, 0x99,
- 0xCF, 0x3D, 0x0F, 0x17, 0x8D, 0x10, 0x1A, 0x4B, 0xD2, 0x44
-} };
+static const net::SHA256HashValue kFingerprintICA8 = {{
+ 0xE9, 0xD4, 0x83, 0xD3, 0x78, 0x01, 0xB1, 0x1A, 0xB8, 0x8E, 0xE1, 0x87,
+ 0xB1, 0x88, 0xD5, 0xE2, 0xF0, 0xFE, 0x18, 0xE7, 0xCE, 0xB8, 0x10, 0x06,
+ 0x3E, 0xA5, 0x05, 0x4A, 0x1A, 0x9D, 0x1C, 0x11
+}};
+
static const unsigned char kPublicKeyICA8[] = {
0x30, 0x82, 0x01, 0x0A, 0x02, 0x82, 0x01, 0x01, 0x00, 0xBF, 0x3A, 0x31,
0xFC, 0xF8, 0xE6, 0xEE, 0xC0, 0x48, 0x00, 0xB4, 0x05, 0x65, 0x36, 0x23,
@@ -261,10 +274,12 @@ static const unsigned char kPublicKeyICA8[] = {
0xB9, 0x02, 0x03, 0x01, 0x00, 0x01
};
-static const net::SHA1HashValue kFingerprintICA9 = { {
- 0x9B, 0x2A, 0x45, 0xBD, 0x4F, 0x80, 0x53, 0x94, 0xD3, 0xA7,
- 0x9D, 0xC7, 0xFA, 0xCD, 0x77, 0x0B, 0x36, 0xB2, 0x3C, 0x18
-} };
+static const net::SHA256HashValue kFingerprintICA9 = {{
+ 0x7A, 0x96, 0xE1, 0xA4, 0xDE, 0xEB, 0x04, 0x23, 0xD6, 0xC4, 0xFD, 0x98,
+ 0xDF, 0x25, 0x83, 0x25, 0x2C, 0x3E, 0xE0, 0x23, 0x35, 0x9F, 0x4B, 0x92,
+ 0x08, 0xAB, 0xE8, 0x7C, 0xB1, 0xD8, 0x4D, 0x85
+}};
+
static const unsigned char kPublicKeyICA9[] = {
0x30, 0x82, 0x01, 0x0A, 0x02, 0x82, 0x01, 0x01, 0x00, 0xE5, 0x44, 0x79,
0xD4, 0x75, 0x3A, 0xBD, 0x25, 0x6F, 0x89, 0xF7, 0x94, 0xE9, 0x23, 0xAE,
@@ -291,10 +306,12 @@ static const unsigned char kPublicKeyICA9[] = {
0xA1, 0x02, 0x03, 0x01, 0x00, 0x01
};
-static const net::SHA1HashValue kFingerprintICA10 = { {
- 0xDD, 0x37, 0x71, 0xB1, 0x84, 0x07, 0xA5, 0x1A, 0x8B, 0x9C,
- 0x75, 0xA3, 0x77, 0x3B, 0xE4, 0x67, 0x04, 0xB8, 0x66, 0xE5
-} };
+static const net::SHA256HashValue kFingerprintICA10 = {{
+ 0x61, 0x79, 0xBE, 0x64, 0x83, 0xD6, 0x71, 0xCE, 0x4F, 0xEE, 0x95, 0x5B,
+ 0xF3, 0x6A, 0x1D, 0xDB, 0xC9, 0x51, 0x2F, 0xF4, 0x0C, 0xF8, 0xA5, 0x1C,
+ 0x4F, 0x31, 0x2A, 0x93, 0x9A, 0x94, 0x07, 0xF7
+}};
+
static const unsigned char kPublicKeyICA10[] = {
0x30, 0x82, 0x01, 0x0A, 0x02, 0x82, 0x01, 0x01, 0x00, 0xAF, 0xA1, 0x27,
0x5B, 0x18, 0x01, 0xF9, 0x16, 0x7C, 0xB9, 0x1D, 0xBB, 0x34, 0xC4, 0x45,
@@ -321,10 +338,12 @@ static const unsigned char kPublicKeyICA10[] = {
0x8F, 0x02, 0x03, 0x01, 0x00, 0x01
};
-static const net::SHA1HashValue kFingerprintICA11 = { {
- 0x34, 0xAB, 0x0F, 0x01, 0x2C, 0x4F, 0x99, 0x70, 0xA2, 0x44,
- 0x57, 0x12, 0xFB, 0xE3, 0x52, 0xC4, 0x9E, 0x0A, 0x20, 0x6B
-} };
+static const net::SHA256HashValue kFingerprintICA11 = {{
+ 0x9C, 0x1E, 0xB3, 0xEA, 0x88, 0xAA, 0x1C, 0x1E, 0x0A, 0xE7, 0x9C, 0x2B,
+ 0x43, 0xFF, 0x46, 0xD4, 0xC8, 0xF5, 0xF4, 0xFF, 0x43, 0x71, 0xFB, 0x83,
+ 0xE4, 0x81, 0x13, 0x8D, 0xAD, 0x82, 0x42, 0xE8
+}};
+
static const unsigned char kPublicKeyICA11[] = {
0x30, 0x82, 0x01, 0x0A, 0x02, 0x82, 0x01, 0x01, 0x00, 0xA8, 0xB2, 0x65,
0xFB, 0x07, 0xB0, 0x21, 0xBE, 0x11, 0xD1, 0xDA, 0x5D, 0x89, 0xB5, 0xAA,
@@ -351,10 +370,12 @@ static const unsigned char kPublicKeyICA11[] = {
0xF9, 0x02, 0x03, 0x01, 0x00, 0x01
};
-static const net::SHA1HashValue kFingerprintICA12 = { {
- 0x7C, 0x3E, 0x64, 0x37, 0x30, 0xA4, 0x6D, 0xE5, 0x16, 0x7F,
- 0xAC, 0xEA, 0xEA, 0x2A, 0x16, 0x3E, 0xE7, 0x15, 0x45, 0x3A
-} };
+static const net::SHA256HashValue kFingerprintICA12 = {{
+ 0xFF, 0xFA, 0x45, 0x0D, 0x1D, 0xB6, 0x31, 0x13, 0xA7, 0x43, 0x70, 0x19,
+ 0x6E, 0xCB, 0xDB, 0xA4, 0x3F, 0x74, 0xF4, 0xBD, 0x63, 0xAD, 0x8E, 0xFD,
+ 0x35, 0x62, 0xB3, 0xF9, 0xE8, 0x69, 0x1F, 0xDB
+}};
+
static const unsigned char kPublicKeyICA12[] = {
0x30, 0x82, 0x01, 0x0A, 0x02, 0x82, 0x01, 0x01, 0x00, 0xD9, 0xE3, 0x76,
0x97, 0x6A, 0xEF, 0x2D, 0x16, 0xD5, 0xF9, 0xDC, 0x9D, 0x0E, 0x65, 0x12,
@@ -381,10 +402,12 @@ static const unsigned char kPublicKeyICA12[] = {
0xF1, 0x02, 0x03, 0x01, 0x00, 0x01
};
-static const net::SHA1HashValue kFingerprintICA13 = { {
- 0x26, 0x43, 0xE5, 0x33, 0x9E, 0x07, 0x14, 0x83, 0x9A, 0xB1,
- 0xCF, 0x38, 0x1C, 0x77, 0x74, 0xF0, 0xE5, 0xBF, 0x88, 0x6F
-} };
+static const net::SHA256HashValue kFingerprintICA13 = {{
+ 0xE0, 0x2C, 0x66, 0xCD, 0x6F, 0x96, 0xFC, 0x1B, 0x5A, 0x43, 0xC4, 0xA5,
+ 0x19, 0xB6, 0x6F, 0x0B, 0xFE, 0xA7, 0x58, 0x0D, 0xC1, 0x02, 0x3E, 0xFE,
+ 0xFF, 0x9C, 0xE4, 0x9E, 0xB1, 0x7E, 0x3F, 0x79
+}};
+
static const unsigned char kPublicKeyICA13[] = {
0x30, 0x82, 0x01, 0x0A, 0x02, 0x82, 0x01, 0x01, 0x00, 0xBB, 0xE5, 0x0F,
0xD2, 0x1C, 0x6B, 0xBA, 0x23, 0xA9, 0x2F, 0x87, 0xEC, 0xDB, 0x92, 0x3F,
@@ -411,10 +434,12 @@ static const unsigned char kPublicKeyICA13[] = {
0x1D, 0x02, 0x03, 0x01, 0x00, 0x01
};
-static const net::SHA1HashValue kFingerprintICA14 = { {
- 0xCF, 0x58, 0x82, 0xEE, 0x81, 0x71, 0x71, 0x8E, 0x2C, 0xBD,
- 0xDB, 0x87, 0xE0, 0x18, 0xF5, 0xED, 0xDA, 0x85, 0x4A, 0x13
-} };
+static const net::SHA256HashValue kFingerprintICA14 = {{
+ 0x3B, 0x60, 0x2E, 0xE9, 0x9F, 0x75, 0x7C, 0x18, 0xE3, 0x08, 0x1E, 0xC0,
+ 0x72, 0xE9, 0x20, 0x05, 0x0B, 0x83, 0xD7, 0xB7, 0x5E, 0x25, 0x47, 0xE7,
+ 0xE6, 0x44, 0x2C, 0x40, 0xF4, 0xA9, 0xA1, 0xD0
+}};
+
static const unsigned char kPublicKeyICA14[] = {
0x30, 0x82, 0x01, 0x0A, 0x02, 0x82, 0x01, 0x01, 0x00, 0xAD, 0x16, 0x57,
0x87, 0xD7, 0x0D, 0xA3, 0xA2, 0x7E, 0x8B, 0xAE, 0x45, 0x7A, 0x1F, 0xCA,
@@ -441,10 +466,12 @@ static const unsigned char kPublicKeyICA14[] = {
0xD9, 0x02, 0x03, 0x01, 0x00, 0x01
};
-static const net::SHA1HashValue kFingerprintICA15 = { {
- 0xFD, 0x28, 0xC3, 0x71, 0x00, 0x27, 0x0F, 0x36, 0x28, 0x32,
- 0x7F, 0xE6, 0xD6, 0x8A, 0x6F, 0x59, 0x58, 0x4B, 0x3E, 0x1E
-} };
+static const net::SHA256HashValue kFingerprintICA15 = {{
+ 0x09, 0xA7, 0x9F, 0x65, 0xE5, 0x55, 0x72, 0xAA, 0xFD, 0xDB, 0x74, 0xE9,
+ 0xF8, 0xFA, 0x01, 0x45, 0x1D, 0x8E, 0xA4, 0x17, 0x48, 0xAB, 0x50, 0x75,
+ 0xF9, 0xB1, 0x12, 0xB0, 0x6F, 0xC8, 0x08, 0xAE
+}};
+
static const unsigned char kPublicKeyICA15[] = {
0x30, 0x82, 0x01, 0x0A, 0x02, 0x82, 0x01, 0x01, 0x00, 0xDD, 0xFE, 0x56,
0x5F, 0x53, 0x05, 0x59, 0x8F, 0x7C, 0xF4, 0x8B, 0x90, 0x38, 0xED, 0x51,
@@ -471,10 +498,12 @@ static const unsigned char kPublicKeyICA15[] = {
0x99, 0x02, 0x03, 0x01, 0x00, 0x01
};
-static const net::SHA1HashValue kFingerprintICA16 = { {
- 0xBC, 0x59, 0x07, 0x13, 0xA9, 0xCE, 0x8B, 0xFE, 0xE3, 0x5B,
- 0xB7, 0xC3, 0xC3, 0xC2, 0x48, 0x44, 0xE8, 0x6A, 0x77, 0xC0
-} };
+static const net::SHA256HashValue kFingerprintICA16 = {{
+ 0x49, 0x0D, 0xC9, 0x48, 0xA1, 0x6B, 0x02, 0xEA, 0xC6, 0xDA, 0x47, 0x99,
+ 0x36, 0x4D, 0xD2, 0xAF, 0x04, 0xF7, 0xEA, 0x46, 0x30, 0xCF, 0x33, 0x79,
+ 0x73, 0x10, 0xAC, 0x4C, 0x07, 0xB4, 0x67, 0xAD
+}};
+
static const unsigned char kPublicKeyICA16[] = {
0x30, 0x82, 0x01, 0x0A, 0x02, 0x82, 0x01, 0x01, 0x00, 0xD2, 0xB0, 0xC9,
0xB3, 0x88, 0xCD, 0x93, 0x23, 0x6A, 0x46, 0xD3, 0x69, 0x0A, 0xD7, 0xFF,
@@ -501,53 +530,170 @@ static const unsigned char kPublicKeyICA16[] = {
0x63, 0x02, 0x03, 0x01, 0x00, 0x01
};
-// List of allowed / trusted ICAs.
-const ICACertInfo kAllowedICAs[] = {
- {&kFingerprintICA1, kPublicKeyICA1, sizeof(kPublicKeyICA1)},
- {&kFingerprintICA2, kPublicKeyICA2, sizeof(kPublicKeyICA2)},
- {&kFingerprintICA3, kPublicKeyICA3, sizeof(kPublicKeyICA3)},
- {&kFingerprintICA4, kPublicKeyICA4, sizeof(kPublicKeyICA4)},
- {&kFingerprintICA5, kPublicKeyICA5, sizeof(kPublicKeyICA5)},
- {&kFingerprintICA6, kPublicKeyICA6, sizeof(kPublicKeyICA6)},
- {&kFingerprintICA7, kPublicKeyICA7, sizeof(kPublicKeyICA7)},
- {&kFingerprintICA8, kPublicKeyICA8, sizeof(kPublicKeyICA8)},
- {&kFingerprintICA9, kPublicKeyICA9, sizeof(kPublicKeyICA9)},
+// Info for trusted ICA certs.
+struct ICACertInfo {
+ const net::SHA256HashValue* fingerprint;
+ const unsigned char* public_key;
+ size_t public_key_size;
+};
+
+// Default list of allowed / trusted ICAs.
+static const ICACertInfo kAllowedICAs[] = {
+ {&kFingerprintICA1, kPublicKeyICA1, sizeof(kPublicKeyICA1)},
+ {&kFingerprintICA2, kPublicKeyICA2, sizeof(kPublicKeyICA2)},
+ {&kFingerprintICA3, kPublicKeyICA3, sizeof(kPublicKeyICA3)},
+ {&kFingerprintICA4, kPublicKeyICA4, sizeof(kPublicKeyICA4)},
+ {&kFingerprintICA5, kPublicKeyICA5, sizeof(kPublicKeyICA5)},
+ {&kFingerprintICA6, kPublicKeyICA6, sizeof(kPublicKeyICA6)},
+ {&kFingerprintICA7, kPublicKeyICA7, sizeof(kPublicKeyICA7)},
+ {&kFingerprintICA8, kPublicKeyICA8, sizeof(kPublicKeyICA8)},
+ {&kFingerprintICA9, kPublicKeyICA9, sizeof(kPublicKeyICA9)},
{&kFingerprintICA10, kPublicKeyICA10, sizeof(kPublicKeyICA10)},
{&kFingerprintICA11, kPublicKeyICA11, sizeof(kPublicKeyICA11)},
{&kFingerprintICA12, kPublicKeyICA12, sizeof(kPublicKeyICA12)},
{&kFingerprintICA13, kPublicKeyICA13, sizeof(kPublicKeyICA13)},
{&kFingerprintICA14, kPublicKeyICA14, sizeof(kPublicKeyICA14)},
{&kFingerprintICA15, kPublicKeyICA15, sizeof(kPublicKeyICA15)},
- {&kFingerprintICA16, kPublicKeyICA16, sizeof(kPublicKeyICA16)},
-};
+ {&kFingerprintICA16, kPublicKeyICA16, sizeof(kPublicKeyICA16)}};
+
+// Built in public key for verifying trusted authorities data.
+const uint8 kPublicKey[] = {
+ 0x30, 0x82, 0x01, 0x22, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86,
+ 0xF7, 0x0D, 0x01, 0x01, 0x01, 0x05, 0x00, 0x03, 0x82, 0x01, 0x0F, 0x00,
+ 0x30, 0x82, 0x01, 0x0A, 0x02, 0x82, 0x01, 0x01, 0x00, 0xC3, 0x8D, 0xEC,
+ 0xF5, 0x94, 0x4C, 0x66, 0x90, 0xFC, 0x08, 0xED, 0x6E, 0x7D, 0xD0, 0xD6,
+ 0x93, 0x62, 0x94, 0x86, 0xFB, 0xBA, 0x6F, 0x06, 0xD5, 0x26, 0xAD, 0x52,
+ 0x84, 0x5A, 0x68, 0x52, 0xF1, 0xA9, 0x46, 0x04, 0x78, 0xC0, 0xA1, 0x0F,
+ 0x72, 0xCE, 0x1C, 0xB3, 0xD2, 0x34, 0xFA, 0x28, 0xD0, 0xA6, 0x2D, 0xDF,
+ 0xDF, 0x0C, 0x6C, 0x30, 0xCF, 0xF3, 0x67, 0x0E, 0xCE, 0xDD, 0x2D, 0x02,
+ 0x20, 0x05, 0x7D, 0x7F, 0x81, 0x19, 0xBC, 0x42, 0x74, 0xC0, 0x11, 0xC4,
+ 0x7F, 0x31, 0x0B, 0x63, 0xE7, 0x2E, 0xFE, 0xA4, 0x20, 0xE5, 0xD8, 0x19,
+ 0xE1, 0xBE, 0x25, 0x41, 0x88, 0xFA, 0xBB, 0x51, 0xFF, 0x84, 0x9E, 0x37,
+ 0x03, 0xAE, 0xAF, 0x41, 0x4E, 0x4B, 0x75, 0xF8, 0x73, 0x79, 0x20, 0x2B,
+ 0xA0, 0xE9, 0xFC, 0xD6, 0x03, 0x50, 0x1B, 0x2A, 0x6B, 0x31, 0xE8, 0x75,
+ 0x13, 0xB6, 0xEC, 0xE4, 0x5D, 0x2A, 0x3E, 0xE5, 0x49, 0x44, 0xBF, 0xE2,
+ 0xC2, 0x4A, 0x7B, 0xC8, 0xC2, 0xC9, 0x89, 0xEF, 0x1A, 0x67, 0x37, 0xB7,
+ 0x52, 0x93, 0x86, 0x69, 0xA4, 0x1A, 0x2C, 0x69, 0xD2, 0x03, 0x93, 0x15,
+ 0x02, 0x97, 0xB6, 0xF7, 0x55, 0x87, 0x5B, 0xAA, 0x73, 0x12, 0x3F, 0xDD,
+ 0x32, 0x16, 0x3B, 0x8E, 0xD9, 0xD9, 0x49, 0x06, 0x65, 0xAD, 0x28, 0x49,
+ 0xEA, 0x0F, 0x7E, 0x6A, 0x04, 0xF7, 0x89, 0x79, 0x8F, 0xCE, 0x3E, 0xD2,
+ 0x89, 0x6C, 0x43, 0x4B, 0x34, 0xBF, 0x42, 0x65, 0x2B, 0x09, 0x2F, 0x5C,
+ 0xCA, 0x46, 0x1C, 0x22, 0x36, 0x78, 0xEA, 0x98, 0x49, 0xA4, 0x0E, 0xAB,
+ 0x97, 0x0A, 0x76, 0xCD, 0x52, 0x99, 0x42, 0x44, 0xC2, 0x52, 0x40, 0x62,
+ 0x34, 0xC4, 0xCD, 0xE3, 0x3D, 0xCA, 0xE1, 0x33, 0x99, 0xE9, 0xF4, 0x6E,
+ 0xEB, 0xB0, 0x5D, 0xA5, 0x84, 0xA2, 0x5C, 0xC7, 0xBB, 0x14, 0x67, 0x0C,
+ 0x4F, 0x02, 0x03, 0x01, 0x00, 0x01};
+
+// Verifies signature of the data using built-in public key.
+bool VerifySignature(const std::string& signature, const std::string& data) {
+ if (signature.size() != 256)
+ return false;
+
+ crypto::SignatureVerifier verifier;
+ crypto::SignatureVerifier::HashAlgorithm hash_alg =
+ crypto::SignatureVerifier::SHA256;
+ crypto::SignatureVerifier::HashAlgorithm mask_hash_alg = hash_alg;
+ unsigned int hash_len = 32;
+
+ if (!verifier.VerifyInitRSAPSS(
+ hash_alg,
+ mask_hash_alg,
+ hash_len,
+ reinterpret_cast<const uint8*>(signature.data()),
+ signature.size(),
+ kPublicKey,
+ sizeof(kPublicKey))) {
+ return false;
+ }
+
+ verifier.VerifyUpdate(reinterpret_cast<const uint8*>(data.data()),
+ data.size());
+
+ return verifier.VerifyFinal();
+}
} // namespace
-base::StringPiece GetTrustedICAPublicKey(const base::StringPiece& data) {
- scoped_refptr<net::X509Certificate> ica_cert =
- net::X509Certificate::CreateFromBytes(data.data(), data.size());
- if (!ica_cert.get()) {
- LOG(ERROR) << "Couldn't create X509Certificate from bytes.";
- return base::StringPiece();
+AuthorityKeyStore::AuthorityKeyStore() {
+ for (size_t i = 0; i < arraysize(kAllowedICAs); i++) {
+ certificate_authorities_.insert(
+ make_pair(*(kAllowedICAs[i].fingerprint),
+ base::StringPiece(
+ reinterpret_cast<const char*>(kAllowedICAs[i].public_key),
+ kAllowedICAs[i].public_key_size)));
}
+}
+
+AuthorityKeyStore::~AuthorityKeyStore() {
+}
+
+base::StringPiece AuthorityKeyStore::GetICAPublicKeyFromFingerprint(
+ const net::SHA256HashValue& fingerprint) {
+ AuthorityKeysMap::const_iterator it =
+ certificate_authorities_.find(fingerprint);
+ return (it == certificate_authorities_.end()) ? base::StringPiece()
+ : (*it).second;
+}
- const net::SHA1HashValue& fingerprint = ica_cert->fingerprint();
- for (const auto& next_ica : kAllowedICAs) {
- if (next_ica.fingerprint->Equals(fingerprint)) {
- return base::StringPiece(
- reinterpret_cast<const char*>(next_ica.public_key),
- next_ica.public_key_len);
+base::StringPiece AuthorityKeyStore::GetDefaultICAPublicKey() {
+ return GetICAPublicKeyFromFingerprint(kFingerprintICA1);
+}
+
+bool AuthorityKeyStore::Load(const std::string& keys) {
+ certificate_authorities_.clear();
+ authority_keys_.reset(new proto::AuthorityKeys());
+
+ if (!authority_keys_->ParseFromString(keys))
+ return false;
+
+ for (int i = 0; i < authority_keys_->keys_size(); i++) {
+ const std::string& fingerprint = authority_keys_->keys(i).fingerprint();
+ net::SHA256HashValue hash;
+ // Ensure it's the size of SHA-256 fingerprint data.
+ if (fingerprint.size() != sizeof(hash.data)) {
+ return false;
}
+ memcpy(hash.data, fingerprint.data(), sizeof(hash.data));
+ const std::string& public_key = authority_keys_->keys(i).public_key();
+ certificate_authorities_.insert(
+ make_pair(hash, base::StringPiece(public_key)));
}
- LOG(ERROR) << "Couldn't get ICA from fingerprint.";
- return base::StringPiece();
+ return true;
+}
+
+// Trusted certificate authorities.
+static base::LazyInstance<AuthorityKeyStore>::Leaky g_authority_keys_store =
+ LAZY_INSTANCE_INITIALIZER;
+
+bool SetTrustedCertificateAuthorities(const std::string& keys,
+ const std::string& signature) {
+ std::string decoded_keys;
+ if (!base::Base64Decode(keys, &decoded_keys))
+ return false;
+
+ std::string decoded_signature;
+ if (!base::Base64Decode(signature, &decoded_signature))
+ return false;
+
+ if (!VerifySignature(decoded_signature, decoded_keys))
+ return false;
+
+ return g_authority_keys_store.Get().Load(decoded_keys);
+}
+
+base::StringPiece GetTrustedICAPublicKey(const base::StringPiece& data) {
+ AuthorityKeyStore& authority_keys_store = g_authority_keys_store.Get();
+ scoped_refptr<net::X509Certificate> ica_cert =
+ net::X509Certificate::CreateFromBytes(data.data(), data.size());
+ return authority_keys_store.GetICAPublicKeyFromFingerprint(
+ net::X509Certificate::CalculateFingerprint256(
+ ica_cert->os_cert_handle()));
}
base::StringPiece GetDefaultTrustedICAPublicKey() {
- return base::StringPiece(
- reinterpret_cast<const char*>(kAllowedICAs[0].public_key),
- kAllowedICAs[0].public_key_len);
+ AuthorityKeyStore& authority_keys_store = g_authority_keys_store.Get();
+ return authority_keys_store.GetDefaultICAPublicKey();
}
} // namespace cast_channel

Powered by Google App Engine
This is Rietveld 408576698