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

Side by Side Diff: net/cert/ct_signed_certificate_timestamp_log_param.cc

Issue 1059843002: Refactor NetLog::LogLevel --> NetLogCaptureMode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase again to fix a merge conflict Created 5 years, 8 months 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "net/cert/ct_signed_certificate_timestamp_log_param.h" 5 #include "net/cert/ct_signed_certificate_timestamp_log_param.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "base/base64.h" 10 #include "base/base64.h"
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 it != sct_list.end(); 122 it != sct_list.end();
123 ++it) 123 ++it)
124 output_scts->Append(SCTToDictionary(*(it->get()))); 124 output_scts->Append(SCTToDictionary(*(it->get())));
125 125
126 return output_scts; 126 return output_scts;
127 } 127 }
128 128
129 } // namespace 129 } // namespace
130 130
131 base::Value* NetLogSignedCertificateTimestampCallback( 131 base::Value* NetLogSignedCertificateTimestampCallback(
132 const ct::CTVerifyResult* ct_result, NetLog::LogLevel log_level) { 132 const ct::CTVerifyResult* ct_result,
133 NetLogCaptureMode capture_mode) {
133 base::DictionaryValue* dict = new base::DictionaryValue(); 134 base::DictionaryValue* dict = new base::DictionaryValue();
134 135
135 dict->Set("verified_scts", 136 dict->Set("verified_scts",
136 SCTListToPrintableValues(ct_result->verified_scts)); 137 SCTListToPrintableValues(ct_result->verified_scts));
137 138
138 dict->Set("invalid_scts", 139 dict->Set("invalid_scts",
139 SCTListToPrintableValues(ct_result->invalid_scts)); 140 SCTListToPrintableValues(ct_result->invalid_scts));
140 141
141 dict->Set("unknown_logs_scts", 142 dict->Set("unknown_logs_scts",
142 SCTListToPrintableValues(ct_result->unknown_logs_scts)); 143 SCTListToPrintableValues(ct_result->unknown_logs_scts));
143 144
144 return dict; 145 return dict;
145 } 146 }
146 147
147 base::Value* NetLogRawSignedCertificateTimestampCallback( 148 base::Value* NetLogRawSignedCertificateTimestampCallback(
148 const std::string* embedded_scts, 149 const std::string* embedded_scts,
149 const std::string* sct_list_from_ocsp, 150 const std::string* sct_list_from_ocsp,
150 const std::string* sct_list_from_tls_extension, 151 const std::string* sct_list_from_tls_extension,
151 NetLog::LogLevel log_level) { 152 NetLogCaptureMode capture_mode) {
152 base::DictionaryValue* dict = new base::DictionaryValue(); 153 base::DictionaryValue* dict = new base::DictionaryValue();
153 154
154 SetBinaryData("embedded_scts", *embedded_scts, dict); 155 SetBinaryData("embedded_scts", *embedded_scts, dict);
155 SetBinaryData("scts_from_ocsp_response", *sct_list_from_ocsp, dict); 156 SetBinaryData("scts_from_ocsp_response", *sct_list_from_ocsp, dict);
156 SetBinaryData("scts_from_tls_extension", *sct_list_from_tls_extension, dict); 157 SetBinaryData("scts_from_tls_extension", *sct_list_from_tls_extension, dict);
157 158
158 return dict; 159 return dict;
159 } 160 }
160 161
161 } // namespace net 162 } // namespace net
OLDNEW
« no previous file with comments | « net/cert/ct_signed_certificate_timestamp_log_param.h ('k') | net/cert/multi_threaded_cert_verifier.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698