SignedCertificateTimestamp storing & serialization code.

content/public/common/ssl_status.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 CONTENT_PUBLIC_COMMON_SSL_STATUS_H_
 #define CONTENT_PUBLIC_COMMON_SSL_STATUS_H_
 
+#include <vector>
+
 #include "content/common/content_export.h"
 #include "content/public/common/security_style.h"
 #include "net/cert/cert_status_flags.h"
+#include "net/cert/sct_status_flags.h"
 
 namespace content {
 
+// Holds the ID of a SignedCertificateTimestamp (as assigned by
+// SignedCertificateTimestampStore), and its verification status.

[jam, 2013/11/27 01:07:50]

per content api guidelines
(http://www.chromium.org/developers/content-module/content-api), please put
every struct/class in a separate file

[alcutter, 2013/11/27 12:17:56]

Done, thank you for pointing that out.

+struct SignedCertificateTimestampIDAndStatus {
+  SignedCertificateTimestampIDAndStatus(
+      int id, net::SignedCertificateTimestampVerificationStatus status);
+
+  bool operator==(const SignedCertificateTimestampIDAndStatus& other) const;
+
+  int id_;
+  net::SignedCertificateTimestampVerificationStatus status_;

[jam, 2013/11/27 01:07:50]

nit: per style guide, no "_" at end of member variables in a struct

[alcutter, 2013/11/27 12:17:56]

Done.

+};
+
+typedef std::vector<SignedCertificateTimestampIDAndStatus>
+    SignedCertificateTimestampIDStatusList;
+
 // Collects the SSL information for this NavigationEntry.
 struct CONTENT_EXPORT SSLStatus {
   // Flags used for the page security content status.
   enum ContentStatusFlags {
     // HTTP page, or HTTPS page with no insecure content.
     NORMAL_CONTENT             = 0,
 
     // HTTPS page containing "displayed" HTTP resources (e.g. images, CSS).
     DISPLAYED_INSECURE_CONTENT = 1 << 0,
 
     // HTTPS page containing "executed" HTTP resources (i.e. script).
     // Also currently used for HTTPS page containing broken-HTTPS resources;
     // this is wrong and should be fixed (see comments in
     // SSLPolicy::OnRequestStarted()).
     RAN_INSECURE_CONTENT       = 1 << 1,
   };
 
   SSLStatus();
+  ~SSLStatus();

[jam, 2013/11/27 01:07:50]

nit: don't add that unless it's necessary. I see the new struct needs it, but it
doesn't look like this one does.

[alcutter, 2013/11/27 12:17:56]

I think this might've been a thinko.
Removed.

[alcutter, 2013/11/28 18:44:11]

Ah, not having this there causes android_clang_dbg to fail to build, citing
"error: [chromium-style] Complex class/struct needs an explicit out-of-line
destructor.", so I've added it back in.

 
   bool Equals(const SSLStatus& status) const {
     return security_style == status.security_style &&
            cert_id == status.cert_id &&
            cert_status == status.cert_status &&
            security_bits == status.security_bits &&
-           content_status == status.content_status;
+           content_status == status.content_status &&
+           signed_certificate_timestamp_ids ==
+               status.signed_certificate_timestamp_ids;
   }
 
   content::SecurityStyle security_style;
   int cert_id;
   net::CertStatus cert_status;
   int security_bits;
   int connection_status;
   // A combination of the ContentStatusFlags above.
   int content_status;
+  SignedCertificateTimestampIDStatusList signed_certificate_timestamp_ids;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_COMMON_SSL_STATUS_H_