From 964ff76863b63516fce94d547adbbbb7d0d5c7b2 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 13 Feb 2023 21:05:05 +0100 Subject: [PATCH] openssl: rename 'errcode_t' to 'sslerr_t' Turns out "/usr/include/et/com_err.h" typedefs this type (without proper variable scoping). comerr is the "common error description library" that apparently might be used by krb5 code, which then makes this header get used in a curl build. Reported-by: Bruno Henrique Batista Cruz da Silva Fixed #10502 Closes #10500 --- lib/vtls/openssl.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c index 971398f4df..6557783a7f 100644 --- a/lib/vtls/openssl.c +++ b/lib/vtls/openssl.c @@ -262,9 +262,9 @@ #endif #ifdef OPENSSL_IS_BORINGSSL -typedef uint32_t errcode_t; +typedef uint32_t sslerr_t; #else -typedef unsigned long errcode_t; +typedef unsigned long sslerr_t; #endif /* @@ -1216,7 +1216,7 @@ SSL_CTX_use_certificate_chain_blob(SSL_CTX *ctx, const struct curl_blob *blob, if(ret) { X509 *ca; - errcode_t err; + sslerr_t err; if(!SSL_CTX_clear_chain_certs(ctx)) { ret = 0; @@ -3906,7 +3906,7 @@ static CURLcode ossl_connect_step2(struct Curl_cfilter *cf, } else { /* untreated error */ - errcode_t errdetail; + sslerr_t errdetail; char error_buffer[256]=""; CURLcode result; long lerr; @@ -4463,7 +4463,7 @@ static ssize_t ossl_send(struct Curl_cfilter *cf, 'size_t' */ int err; char error_buffer[256]; - errcode_t sslerror; + sslerr_t sslerror; int memlen; int rc; struct ssl_connect_data *connssl = cf->ctx; -- 2.47.2