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

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

Issue 1028873002: Use uint32_t to hold return values from ERR_get_error() and ERR_peek_error(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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
« no previous file with comments | « crypto/openssl_util.cc ('k') | net/quic/crypto/aead_base_decrypter_openssl.cc » ('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) 2011 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/cert/test_root_certs.h" 5 #include "net/cert/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/location.h" 10 #include "base/location.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "crypto/openssl_util.h" 12 #include "crypto/openssl_util.h"
13 #include "net/cert/x509_certificate.h" 13 #include "net/cert/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 uint32_t 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 crypto::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 temporary_roots_.push_back(certificate); 29 temporary_roots_.push_back(certificate);
30 return true; 30 return true;
(...skipping 19 matching lines...) Expand all
50 return true; 50 return true;
51 } 51 }
52 return false; 52 return false;
53 } 53 }
54 54
55 TestRootCerts::~TestRootCerts() {} 55 TestRootCerts::~TestRootCerts() {}
56 56
57 void TestRootCerts::Init() {} 57 void TestRootCerts::Init() {}
58 58
59 } // namespace net 59 } // namespace net
OLDNEW
« no previous file with comments | « crypto/openssl_util.cc ('k') | net/quic/crypto/aead_base_decrypter_openssl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698