hoelee/curl-impersonate
1
0
Fork 0
mirror of https://github.com/lwthiker/curl-impersonate.git synced 2025-08-08 12:49:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add missing BoringSSL include

Browse Source
This commit is contained in:
lwthiker
2023-09-02 16:01:49 +03:00
parent 0c2fc6ce9b
commit cb26a3f8e0
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
chrome/patches/curl-impersonate.patch
View File

@@ -1759,24 +1759,25 @@ index f02e66541..d628112a0 100644
struct Names { struct Names {
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 6543fb19a..6a3a78287 100644 index 6543fb19a..da4882af8 100644
--- a/lib/vtls/openssl.c --- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c +++ b/lib/vtls/openssl.c
@@ -80,6 +80,13 @@ @@ -79,6 +79,14 @@
#include <openssl/bio.h>
#include <openssl/buffer.h> #include <openssl/buffer.h>
#include <openssl/pkcs12.h> #include <openssl/pkcs12.h>
+#include <openssl/pool.h>
+
+#ifdef HAVE_LIBZ +#ifdef HAVE_LIBZ
+#include <zlib.h> +#include <zlib.h>
+#endif +#endif
+#ifdef HAVE_BROTLI +#ifdef HAVE_BROTLI
+#include <brotli/decode.h> +#include <brotli/decode.h>
+#endif +#endif
+
#if (OPENSSL_VERSION_NUMBER >= 0x0090808fL) && !defined(OPENSSL_NO_OCSP) #if (OPENSSL_VERSION_NUMBER >= 0x0090808fL) && !defined(OPENSSL_NO_OCSP)
#include <openssl/ocsp.h> #include <openssl/ocsp.h>
#endif @@ -266,6 +274,113 @@
@@ -266,6 +273,113 @@
#define HAVE_OPENSSL_VERSION #define HAVE_OPENSSL_VERSION
#endif #endif
@@ -1890,7 +1891,7 @@ index 6543fb19a..6a3a78287 100644
#ifdef OPENSSL_IS_BORINGSSL #ifdef OPENSSL_IS_BORINGSSL
typedef uint32_t sslerr_t; typedef uint32_t sslerr_t;
#else #else
@@ -2583,6 +2697,151 @@ static const char *tls_rt_type(int type) @@ -2583,6 +2698,151 @@ static const char *tls_rt_type(int type)
} }
} }
@@ -2042,7 +2043,7 @@ index 6543fb19a..6a3a78287 100644
/* /*
* Our callback from the SSL/TLS layers. * Our callback from the SSL/TLS layers.
*/ */
@@ -3536,7 +3795,14 @@ static CURLcode ossl_connect_step1(struct Curl_cfilter *cf, @@ -3536,7 +3796,14 @@ static CURLcode ossl_connect_step1(struct Curl_cfilter *cf,
ctx_options = SSL_OP_ALL; ctx_options = SSL_OP_ALL;
#ifdef SSL_OP_NO_TICKET #ifdef SSL_OP_NO_TICKET
@@ -2058,7 +2059,7 @@ index 6543fb19a..6a3a78287 100644
#endif #endif
#ifdef SSL_OP_NO_COMPRESSION #ifdef SSL_OP_NO_COMPRESSION
@@ -3603,6 +3869,16 @@ static CURLcode ossl_connect_step1(struct Curl_cfilter *cf, @@ -3603,6 +3870,16 @@ static CURLcode ossl_connect_step1(struct Curl_cfilter *cf,
} }
#endif #endif
@@ -2075,7 +2076,7 @@ index 6543fb19a..6a3a78287 100644
if(ssl_cert || ssl_cert_blob || ssl_cert_type) { if(ssl_cert || ssl_cert_blob || ssl_cert_type) {
if(!result && if(!result &&
!cert_stuff(data, backend->ctx, !cert_stuff(data, backend->ctx,
@@ -3656,6 +3932,35 @@ static CURLcode ossl_connect_step1(struct Curl_cfilter *cf, @@ -3656,6 +3933,35 @@ static CURLcode ossl_connect_step1(struct Curl_cfilter *cf,
} }
#endif #endif
@@ -2111,7 +2112,7 @@ index 6543fb19a..6a3a78287 100644
#ifdef USE_OPENSSL_SRP #ifdef USE_OPENSSL_SRP
if(ssl_config->primary.username && Curl_auth_allowed_to_host(data)) { if(ssl_config->primary.username && Curl_auth_allowed_to_host(data)) {
char * const ssl_username = ssl_config->primary.username; char * const ssl_username = ssl_config->primary.username;
@@ -3681,6 +3986,30 @@ static CURLcode ossl_connect_step1(struct Curl_cfilter *cf, @@ -3681,6 +3987,30 @@ static CURLcode ossl_connect_step1(struct Curl_cfilter *cf,
} }
#endif #endif
@@ -2142,7 +2143,7 @@ index 6543fb19a..6a3a78287 100644
/* OpenSSL always tries to verify the peer, this only says whether it should /* OpenSSL always tries to verify the peer, this only says whether it should
* fail to connect if the verification fails, or if it should continue * fail to connect if the verification fails, or if it should continue
* anyway. In the latter case the result of the verification is checked with * anyway. In the latter case the result of the verification is checked with
@@ -3727,6 +4056,23 @@ static CURLcode ossl_connect_step1(struct Curl_cfilter *cf, @@ -3727,6 +4057,23 @@ static CURLcode ossl_connect_step1(struct Curl_cfilter *cf,
SSL_set_app_data(backend->handle, cf); SSL_set_app_data(backend->handle, cf);