[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 111/150: curl-openssl.m4: Fix version check for Ope
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 111/150: curl-openssl.m4: Fix version check for OpenSSL 1.1.1 |
Date: |
Fri, 30 Mar 2018 16:49:25 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit 1b27fcfcf7424bbb866f6398b0c6070f82b6f73d
Author: Jay Satiro <address@hidden>
AuthorDate: Sat Feb 24 03:18:15 2018 -0500
curl-openssl.m4: Fix version check for OpenSSL 1.1.1
- Add OpenSSL 1.1.1 to the header/library version lists.
- Detect OpenSSL 1.1.1 library using its function ERR_clear_last_mark,
which was added in that version.
Prior to this change an erroneous header/library mismatch was caused by
lack of OpenSSL 1.1.1 detection. I tested using openssl-1.1.1-pre1.
---
m4/curl-openssl.m4 | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/m4/curl-openssl.m4 b/m4/curl-openssl.m4
index 20c312658..391099b69 100644
--- a/m4/curl-openssl.m4
+++ b/m4/curl-openssl.m4
@@ -29,7 +29,7 @@ dnl -------------------------------------------------
dnl Find out OpenSSL headers API version, as reported
dnl by OPENSSL_VERSION_NUMBER. No runtime checks
dnl allowed here for cross-compilation support.
-dnl HAVE_OPENSSL_API_HEADERS is defined as apprpriate
+dnl HAVE_OPENSSL_API_HEADERS is defined as appropriate
dnl only for systems which actually run the configure
dnl script. Config files generated manually or in any
dnl other way shall not define this.
@@ -66,6 +66,7 @@ AC_DEFUN([CURL_CHECK_OPENSSL_API_HEADERS], [
;;
esac
case $tst_api in
+ 0x111) tst_show="1.1.1" ;;
0x110) tst_show="1.1.0" ;;
0x102) tst_show="1.0.2" ;;
0x101) tst_show="1.0.1" ;;
@@ -122,6 +123,13 @@ AC_DEFUN([CURL_CHECK_OPENSSL_API_LIBRARY], [
#
AC_MSG_CHECKING([for OpenSSL library version])
if test "$tst_api" = "unknown"; then
+ AC_LINK_IFELSE([
+ AC_LANG_FUNC_LINK_TRY([ERR_clear_last_mark])
+ ],[
+ tst_api="0x111"
+ ])
+ fi
+ if test "$tst_api" = "unknown"; then
case $host in
*-*-vms*)
AC_LINK_IFELSE([
@@ -217,6 +225,7 @@ AC_DEFUN([CURL_CHECK_OPENSSL_API_LIBRARY], [
])
fi
case $tst_api in
+ 0x111) tst_show="1.1.1" ;;
0x110) tst_show="1.1.0" ;;
0x102) tst_show="1.0.2" ;;
0x101) tst_show="1.0.1" ;;
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 140/150: credits: Viktor prefers without accent, (continued)
- [GNUnet-SVN] [gnurl] 140/150: credits: Viktor prefers without accent, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 138/150: openldap: check ldap_get_attribute_ber() results for NULL before using, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 134/150: limit-rate: kick in even before "limit" data has been received, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 126/150: curl tool: accept --compressed also if Brotli is enabled and zlib is not., gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 146/150: Revert "hostip: fix compiler warning: 'variable set but not used'", gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 68/150: libcurl-security.3: split out from libcurl-tutorial.3, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 129/150: HTTP: allow "header; " to replace an internal header with a blank one, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 148/150: tests/.../spnego.py: fix identifier typo, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 71/150: libcurl-security.3: separate file:// section, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 66/150: tests: new tests for http raw mode, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 111/150: curl-openssl.m4: Fix version check for OpenSSL 1.1.1,
gnunet <=
- [GNUnet-SVN] [gnurl] 127/150: SECURITY: distros' max embargo time is 14 days now, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 110/150: lib655: silence compiler warning, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 105/150: curl_share_setopt.3: connection cache is shared within multi handles, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 121/150: krb5: use nondeprecated functions, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 74/150: TODO fixed: Detect when called from within callbacks, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 149/150: release: 7.59.0, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 108/150: projects/README: remove reference to dead IDN link/package, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 136/150: readwrite: make sure excess reads don't go beyond buffer end, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 139/150: openldap: white space changes, fixed up the copyright years, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 112/150: docs/MANUAL: formfind.pl is not accessible on the site anymore, gnunet, 2018/03/30