Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/3f88c12315556d6f5f928c7e6a5e56357899ece7
...commit
http://git.netsurf-browser.org/netsurf.git/commit/3f88c12315556d6f5f928c7e6a5e56357899ece7
...tree
http://git.netsurf-browser.org/netsurf.git/tree/3f88c12315556d6f5f928c7e6a5e56357899ece7
The branch, master has been updated
via 3f88c12315556d6f5f928c7e6a5e56357899ece7 (commit)
from 356e92c604ec6ab218302cfc1704f04ae171ddeb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=3f88c12315556d6f5f928c7e6a5e56357899ece7
commit 3f88c12315556d6f5f928c7e6a5e56357899ece7
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
Fix OpenSSL X509 cert API detection
LibreSSL defines a OPENSSL_VERSION_NUMBER of 2.1 but only provides the
old OpenSSL 1.0.x API.
diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c
index 7ddf512..7d0e40c 100644
--- a/content/fetchers/curl.c
+++ b/content/fetchers/curl.c
@@ -128,8 +128,10 @@ 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)
+/* OpenSSL 1.0.x to 1.1.0 certificate reference counting changed
+ * LibreSSL declares its OpenSSL version as 2.1 but only supports the old way
+ */
+#if (defined(LIBRESSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER <
0x1010000fL))
static int ns_X509_up_ref(X509 *cert)
{
cert->references++;
-----------------------------------------------------------------------
Summary of changes:
content/fetchers/curl.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c
index 7ddf512..7d0e40c 100644
--- a/content/fetchers/curl.c
+++ b/content/fetchers/curl.c
@@ -128,8 +128,10 @@ 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)
+/* OpenSSL 1.0.x to 1.1.0 certificate reference counting changed
+ * LibreSSL declares its OpenSSL version as 2.1 but only supports the old way
+ */
+#if (defined(LIBRESSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER <
0x1010000fL))
static int ns_X509_up_ref(X509 *cert)
{
cert->references++;
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
