mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-23 04:26:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix openSSL 1.1.0 X509 certificate handling

Browse Source
This commit is contained in:
Vincent Sanders 2016-11-20 12:14:36 +00:00
parent 3ab8032f16
commit e8a9e37445
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
content/fetchers/curl.c
View File

@ -128,6 +128,26 @@ static char fetch_error_buffer[CURL_ERROR_SIZE];
static char fetch_proxy_userpwd[100];
/* OpenSSL 1.0.x to 1.1.0 certificate reference counting changed */
#if (OPENSSL_VERSION_NUMBER < 0x1010000fL)
static int ns_X509_up_ref(X509 *cert)
{
cert->references++;
return 1;
}
static void ns_X509_free(X509 *cert)
{
cert->references--;
if (cert->references == 0) {
X509_free(cert);
}
}
#else
#define ns_X509_up_ref X509_up_ref
#define ns_X509_free X509_free
#endif
/**
* Initialise a cURL fetcher.
*/
@ -438,7 +458,7 @@ fetch_curl_verify_callback(int verify_ok, X509_STORE_CTX *x509_ctx)
*/
if (!fetch->cert_data[depth].cert) {
fetch->cert_data[depth].cert = X509_STORE_CTX_get_current_cert(x509_ctx);
fetch->cert_data[depth].cert->references++;
ns_X509_up_ref(fetch->cert_data[depth].cert);
fetch->cert_data[depth].err = X509_STORE_CTX_get_error(x509_ctx);
}
@ -815,10 +835,7 @@ static void fetch_curl_free(void *vf)
}
for (i = 0; i < MAX_CERTS && f->cert_data[i].cert; i++) {
f->cert_data[i].cert->references--;
if (f->cert_data[i].cert->references == 0) {
X509_free(f->cert_data[i].cert);
}
ns_X509_free(f->cert_data[i].cert);
}
free(f);
@ -986,10 +1003,7 @@ curl_start_cert_validate(struct curl_fetch_info *f,
X509_get_pubkey(certs[depth].cert));
/* and clean up */
certs[depth].cert->references--;
if (certs[depth].cert->references == 0) {
X509_free(certs[depth].cert);
}
ns_X509_free(certs[depth].cert);
}
msg.type = FETCH_CERT_ERR;