moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-23 16:48:49 -05:00
Code Issues Releases Wiki Activity

curl-openssl.m4: Fix version check for OpenSSL 1.1.1

Browse Source 
- 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.
This commit is contained in:
Jay Satiro 2018-02-24 03:18:15 -05:00
parent a1d78ffc8d
commit 1b27fcfcf7
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
m4/curl-openssl.m4
View File

@ -29,7 +29,7 @@ dnl -------------------------------------------------
dnl Find out OpenSSL headers API version, as reported dnl Find out OpenSSL headers API version, as reported
dnl by OPENSSL_VERSION_NUMBER. No runtime checks dnl by OPENSSL_VERSION_NUMBER. No runtime checks
dnl allowed here for cross-compilation support. 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 only for systems which actually run the configure
dnl script. Config files generated manually or in any dnl script. Config files generated manually or in any
dnl other way shall not define this. dnl other way shall not define this.
@ -66,6 +66,7 @@ AC_DEFUN([CURL_CHECK_OPENSSL_API_HEADERS], [
;; ;;
esac esac
case $tst_api in case $tst_api in
0x111) tst_show="1.1.1" ;;
0x110) tst_show="1.1.0" ;; 0x110) tst_show="1.1.0" ;;
0x102) tst_show="1.0.2" ;; 0x102) tst_show="1.0.2" ;;
0x101) tst_show="1.0.1" ;; 0x101) tst_show="1.0.1" ;;
@ -121,6 +122,13 @@ AC_DEFUN([CURL_CHECK_OPENSSL_API_LIBRARY], [
tst_api="unknown" tst_api="unknown"
# #
AC_MSG_CHECKING([for OpenSSL library version]) 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 if test "$tst_api" = "unknown"; then
case $host in case $host in
*-*-vms*) *-*-vms*)
@ -217,6 +225,7 @@ AC_DEFUN([CURL_CHECK_OPENSSL_API_LIBRARY], [
]) ])
fi fi
case $tst_api in case $tst_api in
0x111) tst_show="1.1.1" ;;
0x110) tst_show="1.1.0" ;; 0x110) tst_show="1.1.0" ;;
0x102) tst_show="1.0.2" ;; 0x102) tst_show="1.0.2" ;;
0x101) tst_show="1.0.1" ;; 0x101) tst_show="1.0.1" ;;