summaryrefslogtreecommitdiff
path: root/lib/vtls
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2023-02-13 21:05:05 +0100
committerDaniel Stenberg <daniel@haxx.se>2023-02-14 08:25:11 +0100
commit964ff76863b63516fce94d547adbbbb7d0d5c7b2 (patch)
tree5eaa47f49d5669e7e84eaf4791d62ebbbec2695e /lib/vtls
parent1807eb5e1f87a20020af65d97709453d949f8b61 (diff)
downloadcurl-964ff76863b63516fce94d547adbbbb7d0d5c7b2.tar.gz
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
Diffstat (limited to 'lib/vtls')
-rw-r--r--lib/vtls/openssl.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 971398f4d..6557783a7 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;