Separate http_security_headers from transport_security_state

net/base/x509_cert_types.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_BASE_X509_CERT_TYPES_H_
 #define NET_BASE_X509_CERT_TYPES_H_
 
 #include <string.h>
 
 #include <set>
@@ skipping 57 matching lines @@
   // This must always be last.
   HASH_VALUE_TAGS_COUNT
 };
 
 class NET_EXPORT HashValue {
  public:
   explicit HashValue(HashValueTag tag) : tag(tag) {}
   HashValue() : tag(HASH_VALUE_SHA1) {}
 
   bool Equals(const HashValue& other) const;
+
+  // Parse/write in this format: "sha1/Guzek9lMwR3KeIS8wwS9gBvVtIg="
+  bool ParseBase64String(const std::string& input);
+  std::string WriteBase64String() const;
+
   size_t size() const;
   unsigned char* data();
   const unsigned char* data() const;
 
   HashValueTag tag;
 
  private:
   union {
     SHA1HashValue sha1;
     SHA256HashValue sha256;
   } fingerprint;
 };
 
-class NET_EXPORT HashValueLessThan {
- public:
-  bool operator()(const HashValue& lhs,
-                  const HashValue& rhs) const {
-    size_t lhs_size = lhs.size();
-    size_t rhs_size = rhs.size();
+class NET_EXPORT HashValuesEqual {
+  public:
+  explicit HashValuesEqual(const HashValue& fingerprint) :
+      fingerprint_(fingerprint) {}
 
-    if (lhs_size != rhs_size)
-      return lhs_size < rhs_size;
+  bool operator()(const HashValue& other) const {
+    return fingerprint_.Equals(other);
+  }
 
-    return memcmp(lhs.data(), rhs.data(), lhs_size) < 0;
-  }
+  const HashValue& fingerprint_;
 };
 
 typedef std::vector<HashValue> HashValueVector;
 
 // IsSHA1HashInSortedArray returns true iff |hash| is in |array|, a sorted
 // array of SHA1 hashes.
 bool NET_EXPORT IsSHA1HashInSortedArray(const SHA1HashValue& hash,
                                         const uint8* array,
                                         size_t array_byte_len);
 
+// Returns true if the intersection of |a| and |b| is not empty. If either
+// |a| or |b| is empty, returns false.
+bool NET_EXPORT HashesIntersect(const HashValueVector& a,
+                                const HashValueVector& b);
+
+// Convert between HashValueVector and comma-separated string format:
+// "sha1/Guzek9lMwR3KeIS8wwS9gBvVtIg=,sha256/U8Sg...
+// A correct input string returns true, with hashes populated
+// An empty input string returns true, with hashes cleared
+// An incorrect input string returns false, with hashes cleared
+std::string NET_EXPORT HashesToBase64String(const HashValueVector& hashes);
+bool NET_EXPORT Base64StringToHashes(const std::string& hashes_str,
+                                     HashValueVector* hashes);
+
 // CertPrincipal represents the issuer or subject field of an X.509 certificate.
 struct NET_EXPORT CertPrincipal {
   CertPrincipal();
   explicit CertPrincipal(const std::string& name);
   ~CertPrincipal();
 
 #if (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_WIN)
   // Parses a BER-format DistinguishedName.
   bool ParseDistinguishedName(const void* ber_name_data, size_t length);
 #endif
@@ skipping 87 matching lines @@
 // Attempts to parse |raw_date|, an ASN.1 date/time string encoded as
 // |format|, and writes the result into |*time|. If an invalid date is
 // specified, or if parsing fails, returns false, and |*time| will not be
 // updated.
 bool ParseCertificateDate(const base::StringPiece& raw_date,
                           CertDateFormat format,
                           base::Time* time);
 }  // namespace net
 
 #endif  // NET_BASE_X509_CERT_TYPES_H_