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

Side by Side Diff: net/base/test_root_certs_openssl.cc

Issue 6805019: Move crypto files out of base, to a top level directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fixes comments by eroman Created 9 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 | Annotate | Revision Log
« no previous file with comments | « net/base/test_root_certs_nss.cc ('k') | net/base/transport_security_state.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:eol-style
+ LF
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/base/test_root_certs.h" 5 #include "net/base/test_root_certs.h"
6 6
7 #include <openssl/err.h> 7 #include <openssl/err.h>
8 #include <openssl/x509v3.h> 8 #include <openssl/x509v3.h>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/openssl_util.h"
12 #include "base/tracked.h" 11 #include "base/tracked.h"
12 #include "crypto/openssl_util.h"
13 #include "net/base/x509_certificate.h" 13 #include "net/base/x509_certificate.h"
14 14
15 namespace net { 15 namespace net {
16 16
17 bool TestRootCerts::Add(X509Certificate* certificate) { 17 bool TestRootCerts::Add(X509Certificate* certificate) {
18 if (!X509_STORE_add_cert(X509Certificate::cert_store(), 18 if (!X509_STORE_add_cert(X509Certificate::cert_store(),
19 certificate->os_cert_handle())) { 19 certificate->os_cert_handle())) {
20 unsigned long error_code = ERR_peek_error(); 20 unsigned long error_code = ERR_peek_error();
21 if (ERR_GET_LIB(error_code) != ERR_LIB_X509 || 21 if (ERR_GET_LIB(error_code) != ERR_LIB_X509 ||
22 ERR_GET_REASON(error_code) != X509_R_CERT_ALREADY_IN_HASH_TABLE) { 22 ERR_GET_REASON(error_code) != X509_R_CERT_ALREADY_IN_HASH_TABLE) {
23 base::ClearOpenSSLERRStack(FROM_HERE); 23 crypto::ClearOpenSSLERRStack(FROM_HERE);
24 return false; 24 return false;
25 } 25 }
26 ERR_clear_error(); 26 ERR_clear_error();
27 } 27 }
28 28
29 empty_ = false; 29 empty_ = false;
30 return true; 30 return true;
31 } 31 }
32 32
33 void TestRootCerts::Clear() { 33 void TestRootCerts::Clear() {
34 if (empty_) 34 if (empty_)
35 return; 35 return;
36 36
37 X509Certificate::ResetCertStore(); 37 X509Certificate::ResetCertStore();
38 empty_ = true; 38 empty_ = true;
39 } 39 }
40 40
41 bool TestRootCerts::IsEmpty() const { 41 bool TestRootCerts::IsEmpty() const {
42 return empty_; 42 return empty_;
43 } 43 }
44 44
45 TestRootCerts::~TestRootCerts() {} 45 TestRootCerts::~TestRootCerts() {}
46 46
47 void TestRootCerts::Init() { 47 void TestRootCerts::Init() {
48 empty_ = true; 48 empty_ = true;
49 } 49 }
50 50
51 } // namespace net 51 } // namespace net
OLDNEW
« no previous file with comments | « net/base/test_root_certs_nss.cc ('k') | net/base/transport_security_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698