Chromium Code Reviews| Index: net/tools/transport_security_state_generator/resources/transport_security_state_static.template |
| diff --git a/net/tools/transport_security_state_generator/resources/transport_security_state_static.template b/net/tools/transport_security_state_generator/resources/transport_security_state_static.template |
| index be15c42521814100dde8082aa3f8825c73980418..516f1a6153051935f14cd8435bdb9c2eb3d607f2 100644 |
| --- a/net/tools/transport_security_state_generator/resources/transport_security_state_static.template |
| +++ b/net/tools/transport_security_state_generator/resources/transport_security_state_static.template |
| @@ -9,6 +9,8 @@ |
| #include <stdint.h> |
| +#include "net/http/transport_security_state_structs.h" |
| + |
| enum SecondLevelDomainName [[DOMAIN_IDS]]; |
| // These are SubjectPublicKeyInfo hashes for public key pinning. The |
| @@ -29,13 +31,7 @@ static const char kNoReportURI[] = ""; |
| [[ACCEPTABLE_CERTS]] |
| -struct Pinset { |
|
martijnc
2017/03/01 22:12:28
This definition will be required in multiple files
|
| - const char* const* const accepted_pins; |
| - const char* const* const rejected_pins; |
| - const char* const report_uri; |
| -}; |
| - |
| -static const struct Pinset kPinsets[] = [[PINSETS]]; |
| +static const net::Pinset kPinsets[] = [[PINSETS]]; |
| // kHSTSHuffmanTree describes a Huffman tree. The nodes of the tree are pairs |
| // of uint8s. The last node in the array is the root of the tree. Each pair is |
| @@ -49,4 +45,16 @@ static const uint8_t kPreloadedHSTSData[] = [[HSTS_TRIE]]; |
| static const unsigned kPreloadedHSTSBits = [[HSTS_TRIE_BITS]]; |
| static const unsigned kHSTSRootPosition = [[HSTS_TRIE_ROOT]]; |
| +static const net::TransportSecurityStateSource kHSTSSource = { |
| + kHSTSHuffmanTree, |
| + sizeof(kHSTSHuffmanTree), |
| + kPreloadedHSTSData, |
| + kPreloadedHSTSBits, |
| + kHSTSRootPosition, |
| + kExpectCTReportURIs, |
| + kExpectStapleReportURIs, |
| + kPinsets, |
| + arraysize(kPinsets) |
| +}; |
| + |
| #endif // NET_HTTP_TRANSPORT_SECURITY_STATE_STATIC_H_ |