Separate http_security_headers from transport_security_state

net/base/transport_security_state_static.h

Index: net/base/transport_security_state_static.h
===================================================================
--- net/base/transport_security_state_static.h	(revision 175486)
+++ net/base/transport_security_state_static.h	(working copy)
@@ -8,163 +8,215 @@
 #define NET_BASE_TRANSPORT_SECURITY_STATE_STATIC_H_
 
 // These are SubjectPublicKeyInfo hashes for public key pinning. The
-// hashes are base64 encoded, SHA1 digests.
+// hashes are SHA1 digests.
 
 static const char kSPKIHash_TestSPKI[] =
-    "sha1/AAAAAAAAAAAAAAAAAAAAAAAAAAA=";
+    "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+    "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00";
 
 static const char kSPKIHash_VeriSignClass3[] =
-    "sha1/4n972HfV354KP560yw4uqe/baXc=";
+    "\xe2\x7f\x7b\xd8\x77\xd5\xdf\x9e\x0a\x3f"
+    "\x9e\xb4\xcb\x0e\x2e\xa9\xef\xdb\x69\x77";
 
 static const char kSPKIHash_VeriSignClass3_G3[] =
-    "sha1/IvGeLsbqzPxdI0b0wuj2xVTdXgc=";
+    "\x22\xf1\x9e\x2e\xc6\xea\xcc\xfc\x5d\x23"
+    "\x46\xf4\xc2\xe8\xf6\xc5\x54\xdd\x5e\x07";
 
 static const char kSPKIHash_Google1024[] =
-    "sha1/QMVAHW+MuvCLAO3vse6H0AWzuc0=";
+    "\x40\xc5\x40\x1d\x6f\x8c\xba\xf0\x8b\x00"
+    "\xed\xef\xb1\xee\x87\xd0\x05\xb3\xb9\xcd";
 
 static const char kSPKIHash_Google2048[] =
-    "sha1/AbkhxY0L343gKf+cki7NVWp+ozk=";
+    "\x01\xb9\x21\xc5\x8d\x0b\xdf\x8d\xe0\x29"
+    "\xff\x9c\x92\x2e\xcd\x55\x6a\x7e\xa3\x39";
 
 static const char kSPKIHash_EquifaxSecureCA[] =
-    "sha1/SOZo+SvSspXXR9gjIBBPM5iQn9Q=";
+    "\x48\xe6\x68\xf9\x2b\xd2\xb2\x95\xd7\x47"
+    "\xd8\x23\x20\x10\x4f\x33\x98\x90\x9f\xd4";
 
 static const char kSPKIHash_Aetna[] =
-    "sha1/klKqFN6/gK4wqtlOYDhwJKVDLxo=";
+    "\x92\x52\xaa\x14\xde\xbf\x80\xae\x30\xaa"
+    "\xd9\x4e\x60\x38\x70\x24\xa5\x43\x2f\x1a";
 
 static const char kSPKIHash_GeoTrustGlobal[] =
-    "sha1/wHqYaI2J+6sFZAwRfap9ZbjKzE4=";
+    "\xc0\x7a\x98\x68\x8d\x89\xfb\xab\x05\x64"
+    "\x0c\x11\x7d\xaa\x7d\x65\xb8\xca\xcc\x4e";
 
 static const char kSPKIHash_GeoTrustPrimary[] =
-    "sha1/sBmJ5+/7Sq/LFI9YRjl2IkFQ4bo=";
+    "\xb0\x19\x89\xe7\xef\xfb\x4a\xaf\xcb\x14"
+    "\x8f\x58\x46\x39\x76\x22\x41\x50\xe1\xba";
 
 static const char kSPKIHash_Intel[] =
-    "sha1/DsYq91myCBCQJW/D3f2KZjEwK8U=";
+    "\x0e\xc6\x2a\xf7\x59\xb2\x08\x10\x90\x25"
+    "\x6f\xc3\xdd\xfd\x8a\x66\x31\x30\x2b\xc5";
 
 static const char kSPKIHash_TCTrustCenter[] =
-    "sha1/gzuEEAB/bkqdQS3EIjk2by7lW+k=";
+    "\x83\x3b\x84\x10\x00\x7f\x6e\x4a\x9d\x41"
+    "\x2d\xc4\x22\x39\x36\x6f\x2e\xe5\x5b\xe9";
 
 static const char kSPKIHash_Vodafone[] =
-    "sha1/DX/hXFUUNmiZ/EDWIgjvIuvRFRw=";
+    "\x0d\x7f\xe1\x5c\x55\x14\x36\x68\x99\xfc"
+    "\x40\xd6\x22\x08\xef\x22\xeb\xd1\x15\x1c";
 
 static const char kSPKIHash_RapidSSL[] =
-    "sha1/o5OZxATDsgmwgcIfIWIneMJ0jkw=";
+    "\xa3\x93\x99\xc4\x04\xc3\xb2\x09\xb0\x81"
+    "\xc2\x1f\x21\x62\x27\x78\xc2\x74\x8e\x4c";
 
 static const char kSPKIHash_DigiCertEVRoot[] =
-    "sha1/gzF+YoVCU9bXeDGQ7JGQVumRueM=";
+    "\x83\x31\x7e\x62\x85\x42\x53\xd6\xd7\x78"
+    "\x31\x90\xec\x91\x90\x56\xe9\x91\xb9\xe3";
 
 static const char kSPKIHash_Tor1[] =
-    "sha1/juNxSTv9UANmpC9kF5GKpmWNx3Y=";
+    "\x8e\xe3\x71\x49\x3b\xfd\x50\x03\x66\xa4"
+    "\x2f\x64\x17\x91\x8a\xa6\x65\x8d\xc7\x76";
 
 static const char kSPKIHash_Tor2[] =
-    "sha1/lia43lPolzSPVIq34Dw57uYcLD8=";
+    "\x96\x26\xb8\xde\x53\xe8\x97\x34\x8f\x54"
+    "\x8a\xb7\xe0\x3c\x39\xee\xe6\x1c\x2c\x3f";
 
 static const char kSPKIHash_Tor3[] =
-    "sha1/rzEyQIKOh77j87n5bjWUNguXF8Y=";
+    "\xaf\x31\x32\x40\x82\x8e\x87\xbe\xe3\xf3"
+    "\xb9\xf9\x6e\x35\x94\x36\x0b\x97\x17\xc6";
 
 static const char kSPKIHash_VeriSignClass1[] =
-    "sha1/I0PRSKJViZuUfUYaeX7ATP7RcLc=";
+    "\x23\x43\xd1\x48\xa2\x55\x89\x9b\x94\x7d"
+    "\x46\x1a\x79\x7e\xc0\x4c\xfe\xd1\x70\xb7";
 
 static const char kSPKIHash_VeriSignClass3_G4[] =
-    "sha1/7WYxNdMb1OymFMQp4xkGn5TBJlA=";
+    "\xed\x66\x31\x35\xd3\x1b\xd4\xec\xa6\x14"
+    "\xc4\x29\xe3\x19\x06\x9f\x94\xc1\x26\x50";
 
 static const char kSPKIHash_VeriSignClass4_G3[] =
-    "sha1/PANDaGiVHPNpKri0Jtq6j+ki5b0=";
+    "\x3c\x03\x43\x68\x68\x95\x1c\xf3\x69\x2a"
+    "\xb8\xb4\x26\xda\xba\x8f\xe9\x22\xe5\xbd";
 
 static const char kSPKIHash_VeriSignClass1_G3[] =
-    "sha1/VRmyeKyygdftp6vBg5nDu2kEJLU=";
+    "\x55\x19\xb2\x78\xac\xb2\x81\xd7\xed\xa7"
+    "\xab\xc1\x83\x99\xc3\xbb\x69\x04\x24\xb5";
 
 static const char kSPKIHash_VeriSignClass2_G3[] =
-    "sha1/Wr7Fddyu87COJxlD/H8lDD32YeM=";
+    "\x5a\xbe\xc5\x75\xdc\xae\xf3\xb0\x8e\x27"
+    "\x19\x43\xfc\x7f\x25\x0c\x3d\xf6\x61\xe3";
 
 static const char kSPKIHash_VeriSignClass3_G2[] =
-    "sha1/GiG0lStik84Ys2XsnA6TTLOB5tQ=";
+    "\x1a\x21\xb4\x95\x2b\x62\x93\xce\x18\xb3"
+    "\x65\xec\x9c\x0e\x93\x4c\xb3\x81\xe6\xd4";
 
 static const char kSPKIHash_VeriSignClass2_G2[] =
-    "sha1/Eje6RRfurSkm/cHN/r7t8t7ZFFw=";
+    "\x12\x37\xba\x45\x17\xee\xad\x29\x26\xfd"
+    "\xc1\xcd\xfe\xbe\xed\xf2\xde\xd9\x14\x5c";
 
 static const char kSPKIHash_VeriSignClass3_G5[] =
-    "sha1/sYEIGhmkwJQf+uiVKMEkyZs0rMc=";
+    "\xb1\x81\x08\x1a\x19\xa4\xc0\x94\x1f\xfa"
+    "\xe8\x95\x28\xc1\x24\xc9\x9b\x34\xac\xc7";
 
 static const char kSPKIHash_VeriSignUniversal[] =
-    "sha1/u8I+KQuzKHcdrT6iTb30I70GsD0=";
+    "\xbb\xc2\x3e\x29\x0b\xb3\x28\x77\x1d\xad"
+    "\x3e\xa2\x4d\xbd\xf4\x23\xbd\x06\xb0\x3d";
 
 static const char kSPKIHash_Twitter1[] =
-    "sha1/Vv7zwhR9TtOIN/29MFI4cgHld40=";
+    "\x56\xfe\xf3\xc2\x14\x7d\x4e\xd3\x88\x37"
+    "\xfd\xbd\x30\x52\x38\x72\x01\xe5\x77\x8d";
 
 static const char kSPKIHash_GeoTrustGlobal2[] =
-    "sha1/cTg28gIxU0crbrplRqkQFVggBQk=";
+    "\x71\x38\x36\xf2\x02\x31\x53\x47\x2b\x6e"
+    "\xba\x65\x46\xa9\x10\x15\x58\x20\x05\x09";
 
 static const char kSPKIHash_GeoTrustUniversal[] =
-    "sha1/h+hbY1PGI6MSjLD/u/VR/lmADiI=";
+    "\x87\xe8\x5b\x63\x53\xc6\x23\xa3\x12\x8c"
+    "\xb0\xff\xbb\xf5\x51\xfe\x59\x80\x0e\x22";
 
 static const char kSPKIHash_GeoTrustUniversal2[] =
-    "sha1/Xk9ThoXdT57KX9wNRW99UbHcm3s=";
+    "\x5e\x4f\x53\x86\x85\xdd\x4f\x9e\xca\x5f"
+    "\xdc\x0d\x45\x6f\x7d\x51\xb1\xdc\x9b\x7b";
 
 static const char kSPKIHash_GeoTrustPrimary_G2[] =
-    "sha1/vb6nG6txV/nkddlU0rcngBqCJoI=";
+    "\xbd\xbe\xa7\x1b\xab\x71\x57\xf9\xe4\x75"
+    "\xd9\x54\xd2\xb7\x27\x80\x1a\x82\x26\x82";
 
 static const char kSPKIHash_GeoTrustPrimary_G3[] =
-    "sha1/nKmNAK90Dd2BgNITRaWLjy6UONY=";
+    "\x9c\xa9\x8d\x00\xaf\x74\x0d\xdd\x81\x80"
+    "\xd2\x13\x45\xa5\x8b\x8f\x2e\x94\x38\xd6";
 
 static const char kSPKIHash_Entrust_2048[] =
-    "sha1/VeSB0RGAvtiJuQijMfmhJAkWuXA=";
+    "\x55\xe4\x81\xd1\x11\x80\xbe\xd8\x89\xb9"
+    "\x08\xa3\x31\xf9\xa1\x24\x09\x16\xb9\x70";
 
 static const char kSPKIHash_Entrust_EV[] =
-    "sha1/ukKwgYhTiB2GY71MwF4I/upuu3c=";
+    "\xba\x42\xb0\x81\x88\x53\x88\x1d\x86\x63"
+    "\xbd\x4c\xc0\x5e\x08\xfe\xea\x6e\xbb\x77";
 
 static const char kSPKIHash_Entrust_G2[] =
-    "sha1/qzDTr0vY8WtYae5FaSnahLhzlIg=";
+    "\xab\x30\xd3\xaf\x4b\xd8\xf1\x6b\x58\x69"
+    "\xee\x45\x69\x29\xda\x84\xb8\x73\x94\x88";
 
 static const char kSPKIHash_Entrust_SSL[] =
-    "sha1/8BdiE1U9s/8KAGv7UISX8+1i0Bo=";
+    "\xf0\x17\x62\x13\x55\x3d\xb3\xff\x0a\x00"
+    "\x6b\xfb\x50\x84\x97\xf3\xed\x62\xd0\x1a";
 
 static const char kSPKIHash_AAACertificateServices[] =
-    "sha1/xDAoxdPjCAwQRIssd7okU5dgu/k=";
+    "\xc4\x30\x28\xc5\xd3\xe3\x08\x0c\x10\x44"
+    "\x8b\x2c\x77\xba\x24\x53\x97\x60\xbb\xf9";
 
 static const char kSPKIHash_AddTrustClass1CARoot[] =
-    "sha1/i9vXzKBoU0IW9MErJUT8Apyli0c=";
+    "\x8b\xdb\xd7\xcc\xa0\x68\x53\x42\x16\xf4"
+    "\xc1\x2b\x25\x44\xfc\x02\x9c\xa5\x8b\x47";
 
 static const char kSPKIHash_AddTrustExternalCARoot[] =
-    "sha1/T5x9IXmcrQ7YuQxXnxoCmeeQ84c=";
+    "\x4f\x9c\x7d\x21\x79\x9c\xad\x0e\xd8\xb9"
+    "\x0c\x57\x9f\x1a\x02\x99\xe7\x90\xf3\x87";
 
 static const char kSPKIHash_AddTrustPublicCARoot[] =
-    "sha1/qFdl1ugyyMUZY3Namhd0OoHf7i4=";
+    "\xa8\x57\x65\xd6\xe8\x32\xc8\xc5\x19\x63"
+    "\x73\x5a\x9a\x17\x74\x3a\x81\xdf\xee\x2e";
 
 static const char kSPKIHash_AddTrustQualifiedCARoot[] =
-    "sha1/vOS3IxJVmOVjQRkcUOS2R8J2Bdc=";
+    "\xbc\xe4\xb7\x23\x12\x55\x98\xe5\x63\x41"
+    "\x19\x1c\x50\xe4\xb6\x47\xc2\x76\x05\xd7";
 
 static const char kSPKIHash_COMODOCertificationAuthority[] =
-    "sha1/EeSR0cnkwOuazs9zVF3h8agwPsM=";
+    "\x11\xe4\x91\xd1\xc9\xe4\xc0\xeb\x9a\xce"
+    "\xcf\x73\x54\x5d\xe1\xf1\xa8\x30\x3e\xc3";
 
 static const char kSPKIHash_SecureCertificateServices[] =
-    "sha1/PLQahC71XPIaPaVKyNG+OQh2N7w=";
+    "\x3c\xb4\x1a\x84\x2e\xf5\x5c\xf2\x1a\x3d"
+    "\xa5\x4a\xc8\xd1\xbe\x39\x08\x76\x37\xbc";
 
 static const char kSPKIHash_TrustedCertificateServices[] =
-    "sha1//nLI678ML7sOJhOTkzwsqY3cJJQ=";
+    "\xfe\x72\xc8\xeb\xbf\x0c\x2f\xbb\x0e\x26"
+    "\x13\x93\x93\x3c\x2c\xa9\x8d\xdc\x24\x94";
 
 static const char kSPKIHash_UTNDATACorpSGC[] =
-    "sha1/UzLRs89/+uDxoF2FTpLSnkUdtE8=";
+    "\x53\x32\xd1\xb3\xcf\x7f\xfa\xe0\xf1\xa0"
+    "\x5d\x85\x4e\x92\xd2\x9e\x45\x1d\xb4\x4f";
 
 static const char kSPKIHash_UTNUSERFirstClientAuthenticationandEmail[] =
-    "sha1/iYJnfcSdJnAAS7RQSHzePa4Ebn0=";
+    "\x89\x82\x67\x7d\xc4\x9d\x26\x70\x00\x4b"
+    "\xb4\x50\x48\x7c\xde\x3d\xae\x04\x6e\x7d";
 
 static const char kSPKIHash_UTNUSERFirstHardware[] =
-    "sha1/oXJfJhsomEOVXQc31YWWnUvSw0U=";
+    "\xa1\x72\x5f\x26\x1b\x28\x98\x43\x95\x5d"
+    "\x07\x37\xd5\x85\x96\x9d\x4b\xd2\xc3\x45";
 
 static const char kSPKIHash_UTNUSERFirstObject[] =
-    "sha1/2u1kdBScFDyr3ZmpvVsoTYs8ydg=";
+    "\xda\xed\x64\x74\x14\x9c\x14\x3c\xab\xdd"
+    "\x99\xa9\xbd\x5b\x28\x4d\x8b\x3c\xc9\xd8";
 
 static const char kSPKIHash_GTECyberTrustGlobalRoot[] =
-    "sha1/WXkS3mF11m/EI7d3E3THlt5viHI=";
+    "\x59\x79\x12\xde\x61\x75\xd6\x6f\xc4\x23"
+    "\xb7\x77\x13\x74\xc7\x96\xde\x6f\x88\x72";
 
 static const char kSPKIHash_Tor2web[] =
-    "sha1/GeW1hxvUgy7I9ZSX/sZe+0jjM7E=";
+    "\x19\xe5\xb5\x87\x1b\xd4\x83\x2e\xc8\xf5"
+    "\x94\x97\xfe\xc6\x5e\xfb\x48\xe3\x33\xb1";
 
 static const char kSPKIHash_AlphaSSL_G2[] =
-    "sha1/5STpjjF9yPytkFN8kecNpHCTkF8=";
+    "\xe5\x24\xe9\x8e\x31\x7d\xc8\xfc\xad\x90"
+    "\x53\x7c\x91\xe7\x0d\xa4\x70\x93\x90\x5f";
 
 static const char kSPKIHash_CryptoCat1[] =
-    "sha1/TIfOhSz0wE1nqeDsUQx/OxSz6ck=";
+    "\x4c\x87\xce\x85\x2c\xf4\xc0\x4d\x67\xa9"
+    "\xe0\xec\x51\x0c\x7f\x3b\x14\xb3\xe9\xc9";
 
 // The following is static data describing the hosts that are hardcoded with
 // certificate pins or HSTS information.