Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Side by Side Diff: content/common/ssl_status_serialization.cc

Issue 27026002: CT: Adding preliminary Certificate Transparency support to Chromium. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Distinguish between SCTs from unknown logs and unverified ones Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/common/ssl_status_serialization.h ('k') | content/public/common/ssl_status.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/common/ssl_status_serialization.h" 5 #include "content/common/ssl_status_serialization.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/pickle.h" 8 #include "base/pickle.h"
9 9
10 namespace content { 10 namespace content {
11 11
12 std::string SerializeSecurityInfo(int cert_id, 12 std::string SerializeSecurityInfo(int cert_id,
13 net::CertStatus cert_status, 13 net::CertStatus cert_status,
14 int security_bits, 14 int security_bits,
15 int ssl_connection_status) { 15 int ssl_connection_status,
16 int signed_certificate_timestamp_id) {
16 Pickle pickle; 17 Pickle pickle;
17 pickle.WriteInt(cert_id); 18 pickle.WriteInt(cert_id);
18 pickle.WriteUInt32(cert_status); 19 pickle.WriteUInt32(cert_status);
19 pickle.WriteInt(security_bits); 20 pickle.WriteInt(security_bits);
20 pickle.WriteInt(ssl_connection_status); 21 pickle.WriteInt(ssl_connection_status);
22 pickle.WriteInt(signed_certificate_timestamp_id);
21 return std::string(static_cast<const char*>(pickle.data()), pickle.size()); 23 return std::string(static_cast<const char*>(pickle.data()), pickle.size());
22 } 24 }
23 25
24 bool DeserializeSecurityInfo(const std::string& state, 26 bool DeserializeSecurityInfo(const std::string& state,
25 int* cert_id, 27 int* cert_id,
26 net::CertStatus* cert_status, 28 net::CertStatus* cert_status,
27 int* security_bits, 29 int* security_bits,
28 int* ssl_connection_status) { 30 int* ssl_connection_status,
31 int* signed_certificate_timestamp_id) {
29 DCHECK(cert_id && cert_status && security_bits && ssl_connection_status); 32 DCHECK(cert_id && cert_status && security_bits && ssl_connection_status);
30 if (state.empty()) { 33 if (state.empty()) {
31 // No SSL used. 34 // No SSL used.
32 *cert_id = 0; 35 *cert_id = 0;
33 // The following are not applicable and are set to the default values. 36 // The following are not applicable and are set to the default values.
34 *cert_status = 0; 37 *cert_status = 0;
35 *security_bits = -1; 38 *security_bits = -1;
36 *ssl_connection_status = 0; 39 *ssl_connection_status = 0;
40 *signed_certificate_timestamp_id = 0;
37 return false; 41 return false;
38 } 42 }
39 43
40 Pickle pickle(state.data(), static_cast<int>(state.size())); 44 Pickle pickle(state.data(), static_cast<int>(state.size()));
41 PickleIterator iter(pickle); 45 PickleIterator iter(pickle);
42 return pickle.ReadInt(&iter, cert_id) && 46 return pickle.ReadInt(&iter, cert_id) &&
43 pickle.ReadUInt32(&iter, cert_status) && 47 pickle.ReadUInt32(&iter, cert_status) &&
44 pickle.ReadInt(&iter, security_bits) && 48 pickle.ReadInt(&iter, security_bits) &&
45 pickle.ReadInt(&iter, ssl_connection_status); 49 pickle.ReadInt(&iter, ssl_connection_status) &&
50 pickle.ReadInt(&iter, signed_certificate_timestamp_id);
46 } 51 }
47 52
48 } // namespace content 53 } // namespace content
OLDNEW
« no previous file with comments | « content/common/ssl_status_serialization.h ('k') | content/public/common/ssl_status.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698