curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-16 09:02:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

openssl: rename 'errcode_t' to 'sslerr_t'

Browse Source 
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
This commit is contained in:
Daniel Stenberg 2023-02-13 21:05:05 +01:00
parent 1807eb5e1f
commit 964ff76863
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/vtls/openssl.c
View File

@ -262,9 +262,9 @@
#endif #endif
#ifdef OPENSSL_IS_BORINGSSL #ifdef OPENSSL_IS_BORINGSSL
typedef uint32_t errcode_t; typedef uint32_t sslerr_t;
#else #else
typedef unsigned long errcode_t; typedef unsigned long sslerr_t;
#endif #endif
/* /*
@ -1216,7 +1216,7 @@ SSL_CTX_use_certificate_chain_blob(SSL_CTX *ctx, const struct curl_blob *blob,
if(ret) { if(ret) {
X509 *ca; X509 *ca;
errcode_t err; sslerr_t err;
if(!SSL_CTX_clear_chain_certs(ctx)) { if(!SSL_CTX_clear_chain_certs(ctx)) {
ret = 0; ret = 0;
@ -3906,7 +3906,7 @@ static CURLcode ossl_connect_step2(struct Curl_cfilter *cf,
} }
else { else {
/* untreated error */ /* untreated error */
errcode_t errdetail; sslerr_t errdetail;
char error_buffer[256]=""; char error_buffer[256]="";
CURLcode result; CURLcode result;
long lerr; long lerr;
@ -4463,7 +4463,7 @@ static ssize_t ossl_send(struct Curl_cfilter *cf,
'size_t' */ 'size_t' */
int err; int err;
char error_buffer[256]; char error_buffer[256];
errcode_t sslerror; sslerr_t sslerror;
int memlen; int memlen;
int rc; int rc;
struct ssl_connect_data *connssl = cf->ctx; struct ssl_connect_data *connssl = cf->ctx;