SignedCertificateTimestamp storing & serialization code.

content/public/common/ssl_status.h

Index: content/public/common/ssl_status.h
diff --git a/content/public/common/ssl_status.h b/content/public/common/ssl_status.h
index 049a5afeef1bd3fb28b7725ed0d7f3539e85b5a4..9c40a3a8f909d856db2ff8d439177477c5d1dc8e 100644
--- a/content/public/common/ssl_status.h
+++ b/content/public/common/ssl_status.h
@@ -5,12 +5,30 @@
 #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.
@@ -29,13 +47,16 @@ struct CONTENT_EXPORT SSLStatus {
   };
 
   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;
@@ -45,6 +66,7 @@ struct CONTENT_EXPORT SSLStatus {
   int connection_status;
   // A combination of the ContentStatusFlags above.
   int content_status;
+  SignedCertificateTimestampIDStatusList signed_certificate_timestamp_ids;
 };
 
 }  // namespace content