xref: /aosp_15_r20/external/libchrome/libchrome_tools/patch/ssl.patch (revision 635a864187cb8b6c713ff48b7e790a6b21769273)
1*635a8641SAndroid Build Coastguard Worker# Chrome asumes boringssl, while system installed ssl library may not.
2*635a8641SAndroid Build Coastguard Worker
3*635a8641SAndroid Build Coastguard Worker--- a/crypto/openssl_util.cc
4*635a8641SAndroid Build Coastguard Worker+++ b/crypto/openssl_util.cc
5*635a8641SAndroid Build Coastguard Worker@@ -4,6 +4,13 @@
6*635a8641SAndroid Build Coastguard Worker
7*635a8641SAndroid Build Coastguard Worker #include "crypto/openssl_util.h"
8*635a8641SAndroid Build Coastguard Worker
9*635a8641SAndroid Build Coastguard Worker+#if defined(OPENSSL_IS_BORINGSSL)
10*635a8641SAndroid Build Coastguard Worker+#include <openssl/cpu.h>
11*635a8641SAndroid Build Coastguard Worker+#else
12*635a8641SAndroid Build Coastguard Worker+#include <openssl/ssl.h>
13*635a8641SAndroid Build Coastguard Worker+#endif
14*635a8641SAndroid Build Coastguard Worker+#include <openssl/crypto.h>
15*635a8641SAndroid Build Coastguard Worker+#include <openssl/err.h>
16*635a8641SAndroid Build Coastguard Worker #include <stddef.h>
17*635a8641SAndroid Build Coastguard Worker #include <stdint.h>
18*635a8641SAndroid Build Coastguard Worker
19*635a8641SAndroid Build Coastguard Worker@@ -11,8 +18,6 @@
20*635a8641SAndroid Build Coastguard Worker
21*635a8641SAndroid Build Coastguard Worker #include "base/logging.h"
22*635a8641SAndroid Build Coastguard Worker #include "base/strings/string_piece.h"
23*635a8641SAndroid Build Coastguard Worker-#include "third_party/boringssl/src/include/openssl/crypto.h"
24*635a8641SAndroid Build Coastguard Worker-#include "third_party/boringssl/src/include/openssl/err.h"
25*635a8641SAndroid Build Coastguard Worker
26*635a8641SAndroid Build Coastguard Worker namespace crypto {
27*635a8641SAndroid Build Coastguard Worker
28*635a8641SAndroid Build Coastguard Worker@@ -35,8 +40,12 @@ int OpenSSLErrorCallback(const char* str
29*635a8641SAndroid Build Coastguard Worker }  // namespace
30*635a8641SAndroid Build Coastguard Worker
31*635a8641SAndroid Build Coastguard Worker void EnsureOpenSSLInit() {
32*635a8641SAndroid Build Coastguard Worker+#if defined(OPENSSL_IS_BORINGSSL)
33*635a8641SAndroid Build Coastguard Worker   // CRYPTO_library_init may be safely called concurrently.
34*635a8641SAndroid Build Coastguard Worker   CRYPTO_library_init();
35*635a8641SAndroid Build Coastguard Worker+#else
36*635a8641SAndroid Build Coastguard Worker+  SSL_library_init();
37*635a8641SAndroid Build Coastguard Worker+#endif
38*635a8641SAndroid Build Coastguard Worker }
39*635a8641SAndroid Build Coastguard Worker
40*635a8641SAndroid Build Coastguard Worker void ClearOpenSSLERRStack(const tracked_objects::Location& location) {
41*635a8641SAndroid Build Coastguard Worker--- a/crypto/rsa_private_key.h
42*635a8641SAndroid Build Coastguard Worker+++ b/crypto/rsa_private_key.h
43*635a8641SAndroid Build Coastguard Worker@@ -7,6 +7,7 @@
44*635a8641SAndroid Build Coastguard Worker
45*635a8641SAndroid Build Coastguard Worker #include <stddef.h>
46*635a8641SAndroid Build Coastguard Worker #include <stdint.h>
47*635a8641SAndroid Build Coastguard Worker+#include <openssl/base.h>
48*635a8641SAndroid Build Coastguard Worker
49*635a8641SAndroid Build Coastguard Worker #include <memory>
50*635a8641SAndroid Build Coastguard Worker #include <vector>
51*635a8641SAndroid Build Coastguard Worker@@ -14,7 +15,6 @@
52*635a8641SAndroid Build Coastguard Worker #include "base/macros.h"
53*635a8641SAndroid Build Coastguard Worker #include "build/build_config.h"
54*635a8641SAndroid Build Coastguard Worker #include "crypto/crypto_export.h"
55*635a8641SAndroid Build Coastguard Worker-#include "third_party/boringssl/src/include/openssl/base.h"
56*635a8641SAndroid Build Coastguard Worker
57*635a8641SAndroid Build Coastguard Worker namespace crypto {
58*635a8641SAndroid Build Coastguard Worker
59*635a8641SAndroid Build Coastguard Worker--- a/crypto/secure_hash.cc
60*635a8641SAndroid Build Coastguard Worker+++ b/crypto/secure_hash.cc
61*635a8641SAndroid Build Coastguard Worker@@ -4,14 +4,18 @@
62*635a8641SAndroid Build Coastguard Worker
63*635a8641SAndroid Build Coastguard Worker #include "crypto/secure_hash.h"
64*635a8641SAndroid Build Coastguard Worker
65*635a8641SAndroid Build Coastguard Worker+#if defined(OPENSSL_IS_BORINGSSL)
66*635a8641SAndroid Build Coastguard Worker+#include <openssl/mem.h>
67*635a8641SAndroid Build Coastguard Worker+#else
68*635a8641SAndroid Build Coastguard Worker+#include <openssl/crypto.h>
69*635a8641SAndroid Build Coastguard Worker+#endif
70*635a8641SAndroid Build Coastguard Worker+#include <openssl/sha.h>
71*635a8641SAndroid Build Coastguard Worker #include <stddef.h>
72*635a8641SAndroid Build Coastguard Worker
73*635a8641SAndroid Build Coastguard Worker #include "base/logging.h"
74*635a8641SAndroid Build Coastguard Worker #include "base/memory/ptr_util.h"
75*635a8641SAndroid Build Coastguard Worker #include "base/pickle.h"
76*635a8641SAndroid Build Coastguard Worker #include "crypto/openssl_util.h"
77*635a8641SAndroid Build Coastguard Worker-#include "third_party/boringssl/src/include/openssl/mem.h"
78*635a8641SAndroid Build Coastguard Worker-#include "third_party/boringssl/src/include/openssl/sha.h"
79*635a8641SAndroid Build Coastguard Worker
80*635a8641SAndroid Build Coastguard Worker namespace crypto {
81*635a8641SAndroid Build Coastguard Worker
82*635a8641SAndroid Build Coastguard Worker
83