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

Side by Side Diff: crypto/openssl_util.cc

Issue 1312203002: Include BoringSSL headers from third_party/ in crypto. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 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
« no previous file with comments | « crypto/openssl_bio_string_unittest.cc ('k') | crypto/rsa_private_key_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 "crypto/openssl_util.h" 5 #include "crypto/openssl_util.h"
6 6
7 #include <openssl/err.h>
8 #include <openssl/ssl.h>
9 #include <openssl/cpu.h>
10
11 #include "base/logging.h" 7 #include "base/logging.h"
12 #include "base/memory/singleton.h" 8 #include "base/memory/singleton.h"
13 #include "base/strings/string_piece.h" 9 #include "base/strings/string_piece.h"
14 #include "build/build_config.h" 10 #include "build/build_config.h"
11 #include "third_party/boringssl/src/include/openssl/cpu.h"
12 #include "third_party/boringssl/src/include/openssl/err.h"
13 #include "third_party/boringssl/src/include/openssl/ssl.h"
15 14
16 #if defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL) 15 #if defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL)
17 #include <cpu-features.h> 16 #include <cpu-features.h>
18 #include "base/cpu.h" 17 #include "base/cpu.h"
19 #endif 18 #endif
20 19
21 namespace crypto { 20 namespace crypto {
22 21
23 namespace { 22 namespace {
24 23
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 std::string message; 90 std::string message;
92 location.Write(true, true, &message); 91 location.Write(true, true, &message);
93 DVLOG(1) << "OpenSSL ERR_get_error stack from " << message; 92 DVLOG(1) << "OpenSSL ERR_get_error stack from " << message;
94 ERR_print_errors_cb(&OpenSSLErrorCallback, NULL); 93 ERR_print_errors_cb(&OpenSSLErrorCallback, NULL);
95 } else { 94 } else {
96 ERR_clear_error(); 95 ERR_clear_error();
97 } 96 }
98 } 97 }
99 98
100 } // namespace crypto 99 } // namespace crypto
OLDNEW
« no previous file with comments | « crypto/openssl_bio_string_unittest.cc ('k') | crypto/rsa_private_key_openssl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698