From: Daniel Stenberg <daniel@haxx.se>
Date: Sun, 29 Jan 2023 11:26:18 +0000 (+0100)
Subject: openssl: adapt to boringssl's error code type
X-Git-Tag: curl-7_88_0~101
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fc10d860112cfb9057b620fae3e33368008ffdae;p=thirdparty%2Fcurl.git

openssl: adapt to boringssl's error code type

BoringSSL uses uint32_t, OpenSSL uses 'unsigned 'long'

Closes #10360
---

diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 31a8bfc4f8..ffd9e85e76 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -261,6 +261,12 @@
 #define HAVE_OPENSSL_VERSION
 #endif
 
+#ifdef OPENSSL_IS_BORINGSSL
+typedef uint32_t errcode_t;
+#else
+typedef unsigned long errcode_t;
+#endif
+
 /*
  * Whether the OpenSSL version has the API needed to support sharing an
  * X509_STORE between connections. The API is:
@@ -1225,7 +1231,7 @@ SSL_CTX_use_certificate_chain_blob(SSL_CTX *ctx, const struct curl_blob *blob,
 
   if(ret) {
     X509 *ca;
-    unsigned long err;
+    errcode_t err;
 
     if(!SSL_CTX_clear_chain_certs(ctx)) {
       ret = 0;
@@ -3942,7 +3948,7 @@ static CURLcode ossl_connect_step2(struct Curl_cfilter *cf,
     }
     else {
       /* untreated error */
-      unsigned long errdetail;
+      errcode_t errdetail;
       char error_buffer[256]="";
       CURLcode result;
       long lerr;
@@ -4520,7 +4526,7 @@ static ssize_t ossl_send(struct Curl_cfilter *cf,
      'size_t' */
   int err;
   char error_buffer[256];
-  unsigned long sslerror;
+  errcode_t sslerror;
   int memlen;
   int rc;
   struct ssl_connect_data *connssl = cf->ctx;