SignedCertificateTimestamp storing & serialization code.

net/ssl/ssl_info.cc

 // 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.
 
 #include "net/ssl/ssl_info.h"
 
+#include "base/pickle.h"
 #include "net/cert/cert_status_flags.h"
+#include "net/cert/signed_certificate_timestamp.h"
 #include "net/cert/x509_certificate.h"
 
 namespace net {
 
+SignedCertificateTimestampAndStatus::SignedCertificateTimestampAndStatus(
+    const scoped_refptr<ct::SignedCertificateTimestamp>& sct,
+    const SignedCertificateTimestampVerificationStatus status)
+    : sct_(sct), status_(status) {}
+
 SSLInfo::SSLInfo() {
   Reset();
 }
 
 SSLInfo::SSLInfo(const SSLInfo& info) {
   *this = info;
 }
 
 SSLInfo::~SSLInfo() {
 }
 
 SSLInfo& SSLInfo::operator=(const SSLInfo& info) {
   cert = info.cert;
+  signed_certificate_timestamps = info.signed_certificate_timestamps;
   cert_status = info.cert_status;
   security_bits = info.security_bits;
   connection_status = info.connection_status;
   is_issued_by_known_root = info.is_issued_by_known_root;
   client_cert_sent = info.client_cert_sent;
   channel_id_sent = info.channel_id_sent;
   handshake_type = info.handshake_type;
   public_key_hashes = info.public_key_hashes;
 
   return *this;
 }
 
 void SSLInfo::Reset() {
   cert = NULL;
   cert_status = 0;
   security_bits = -1;
   connection_status = 0;
   is_issued_by_known_root = false;
   client_cert_sent = false;
   channel_id_sent = false;
   handshake_type = HANDSHAKE_UNKNOWN;
 
+  signed_certificate_timestamps.clear();

[wtc, 2013/11/27 16:32:41]

Move this up, between lines 46 and 47, to match the order in which these members
are declared.

Can you also delete the blank line? Thanks.

[alcutter, 2013/11/27 18:05:55]

Exchanged with the public_key_hashes.clear() line to match the new location in
the decl.
Done.

   public_key_hashes.clear();
 }
 
 void SSLInfo::SetCertError(int error) {
   cert_status |= MapNetErrorToCertStatus(error);
 }
 
 }  // namespace net