diff options
author | Daniel Stenberg <daniel@haxx.se> | 2022-01-14 18:09:28 +0100 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2022-01-14 18:09:28 +0100 |
commit | d5d3c8d41daae348a035af3f6aa3d605421c58e7 (patch) | |
tree | 261dd09dc2f9f7287ae25fa513e22231d572ff30 | |
parent | 84853d94f2b8ac1cfd2ed3e3849e2af0f464d22c (diff) | |
download | curl-bagder/configure-rm-check-openssl.tar.gz |
curl-openssl: remove the OpenSSL headers and library versions checkbagder/configure-rm-check-openssl
It is more work to maintain that check than the (any?) benefit it
brings.
Fixes #8279
Reported-by: Satadru Pramanik
-rw-r--r-- | m4/curl-openssl.m4 | 281 |
1 files changed, 1 insertions, 280 deletions
diff --git a/m4/curl-openssl.m4 b/m4/curl-openssl.m4 index ee23c9d6f..9c283829b 100644 --- a/m4/curl-openssl.m4 +++ b/m4/curl-openssl.m4 @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -23,284 +23,6 @@ # File version for 'aclocal' use. Keep it a single number. # serial 5 - -dnl CURL_CHECK_OPENSSL_API_HEADERS -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 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. - -AC_DEFUN([CURL_CHECK_OPENSSL_API_HEADERS], [ - # - tst_api="unknown" - # - AC_MSG_CHECKING([for OpenSSL headers version]) - CURL_CHECK_DEF([OPENSSL_VERSION_NUMBER], [ -# ifdef USE_OPENSSL -# include <openssl/crypto.h> -# else -# include <crypto.h> -# endif - ], [silent]) - CURL_CHECK_DEF([OPENSSL_VERSION_STR], [ -# include <openssl/crypto.h> - ], [silent]) - if test "$curl_cv_have_def_OPENSSL_VERSION_NUMBER" = "yes"; then - tst_verlen=`expr "$curl_cv_def_OPENSSL_VERSION_NUMBER" : '.*'` - case "x$tst_verlen" in - x6) - tst_vermaj=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 3` - tst_vermin=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 4` - tst_verfix=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 5` - tst_api=0x$tst_vermaj$tst_vermin$tst_verfix - ;; - x11|x10) - tst_vermaj=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 3` - tst_vermin=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 5` - tst_verfix=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 7` - tst_api=0x$tst_vermaj$tst_vermin$tst_verfix - ;; - *) - if test "$curl_cv_have_def_OPENSSL_VERSION_STR" = "yes"; then - ver=`echo $curl_cv_def_OPENSSL_VERSION_STR | sed 's/"//g'`; - tst_vermaj=`echo $ver | cut -d. -f1` - tst_vermin=`echo $ver | cut -d. -f2` - tst_verfix=`echo $ver | cut -d. -f3` - tst_show="$ver" - tst_api=0x$tst_vermaj$tst_vermin$tst_verfix - else - tst_api="unknown" - fi - ;; - 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" ;; - 0x100) tst_show="1.0.0" ;; - 0x099) tst_show="0.9.9" ;; - 0x098) tst_show="0.9.8" ;; - 0x097) tst_show="0.9.7" ;; - 0x096) tst_show="0.9.6" ;; - 0x095) tst_show="0.9.5" ;; - 0x094) tst_show="0.9.4" ;; - 0x093) tst_show="0.9.3" ;; - 0x092) tst_show="0.9.2" ;; - 0x091) tst_show="0.9.1" ;; - *) - if test -z "$tst_show"; then - tst_show="unknown" - fi - ;; - esac - tst_show="$tst_show - $tst_api" - else - tst_show="unknown" - fi - AC_MSG_RESULT([$tst_show]) - # -dnl if test "$tst_api" != "unknown"; then -dnl AC_DEFINE_UNQUOTED(HAVE_OPENSSL_API_HEADERS, $tst_api, -dnl [OpenSSL headers configure time API. Defined only by configure script. -dnl No matter what, do not ever define this manually or by any other means.]) -dnl fi - curl_openssl_api_headers=$tst_api -]) - - -dnl CURL_CHECK_OPENSSL_API_LIBRARY -dnl ------------------------------------------------- -dnl Find out OpenSSL library API version, performing -dnl only link tests in order to avoid getting fooled -dnl by mismatched OpenSSL headers. No runtime checks -dnl allowed here for cross-compilation support. -dnl HAVE_OPENSSL_API_LIBRARY 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. -dnl -dnl Most probably we should not bother attempting to -dnl detect OpenSSL library development API versions -dnl 0.9.9 and 1.1.0. For our intended use, detecting -dnl released versions should be good enough. -dnl -dnl Given that currently we are not using the result -dnl of this check, except for informative purposes, -dnl lets try to figure out everything. - -AC_DEFUN([CURL_CHECK_OPENSSL_API_LIBRARY], [ - # - tst_api="unknown" - # - AC_MSG_CHECKING([for OpenSSL library version]) - if test "$tst_api" = "unknown"; then - AC_LINK_IFELSE([ - AC_LANG_FUNC_LINK_TRY([SSL_CTX_load_verify_dir]) - ],[ - tst_api="0x300" - ]) - fi - 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([ - AC_LANG_FUNC_LINK_TRY([SSL_CTX_set_not_resumbl_sess_cb]) - ],[ - tst_api="0x110" - ]) - ;; - *) - AC_LINK_IFELSE([ - AC_LANG_FUNC_LINK_TRY([SSL_CTX_set_not_resumable_session_callback]) - ],[ - tst_api="0x110" - ]) - ;; - esac - fi - if test "$tst_api" = "unknown"; then - AC_LINK_IFELSE([ - AC_LANG_FUNC_LINK_TRY([SSL_CONF_CTX_new]) - ],[ - tst_api="0x102" - ]) - fi - if test "$tst_api" = "unknown"; then - AC_LINK_IFELSE([ - AC_LANG_FUNC_LINK_TRY([SSL_renegotiate_abbreviated]) - ],[ - tst_api="0x101" - ]) - fi - if test "$tst_api" = "unknown"; then - AC_LINK_IFELSE([ - AC_LANG_FUNC_LINK_TRY([OBJ_add_sigid]) - ],[ - tst_api="0x100" - ]) - fi - if test "$tst_api" = "unknown"; then - AC_LINK_IFELSE([ - AC_LANG_FUNC_LINK_TRY([ERR_set_mark]) - ],[ - tst_api="0x098" - ]) - fi - if test "$tst_api" = "unknown"; then - AC_LINK_IFELSE([ - AC_LANG_FUNC_LINK_TRY([ERR_peek_last_error]) - ],[ - tst_api="0x097" - ]) - fi - if test "$tst_api" = "unknown"; then - AC_LINK_IFELSE([ - AC_LANG_FUNC_LINK_TRY([c2i_ASN1_OBJECT]) - ],[ - tst_api="0x096" - ]) - fi - if test "$tst_api" = "unknown"; then - AC_LINK_IFELSE([ - AC_LANG_FUNC_LINK_TRY([SSL_CTX_set_purpose]) - ],[ - tst_api="0x095" - ]) - fi - if test "$tst_api" = "unknown"; then - AC_LINK_IFELSE([ - AC_LANG_FUNC_LINK_TRY([OBJ_obj2txt]) - ],[ - tst_api="0x094" - ]) - fi - if test "$tst_api" = "unknown"; then - AC_LINK_IFELSE([ - AC_LANG_FUNC_LINK_TRY([SSL_get_verify_depth]) - ],[ - tst_api="0x093" - ]) - fi - if test "$tst_api" = "unknown"; then - AC_LINK_IFELSE([ - AC_LANG_FUNC_LINK_TRY([SSL_library_init]) - ],[ - tst_api="0x092" - ]) - fi - if test "$tst_api" = "unknown"; then - AC_LINK_IFELSE([ - AC_LANG_FUNC_LINK_TRY([SSL_CTX_set_cipher_list]) - ],[ - tst_api="0x091" - ]) - fi - case $tst_api in - 0x300) tst_show="3.0.0" ;; - 0x111) tst_show="1.1.1" ;; - 0x110) tst_show="1.1.0" ;; - 0x102) tst_show="1.0.2" ;; - 0x101) tst_show="1.0.1" ;; - 0x100) tst_show="1.0.0" ;; - 0x099) tst_show="0.9.9" ;; - 0x098) tst_show="0.9.8" ;; - 0x097) tst_show="0.9.7" ;; - 0x096) tst_show="0.9.6" ;; - 0x095) tst_show="0.9.5" ;; - 0x094) tst_show="0.9.4" ;; - 0x093) tst_show="0.9.3" ;; - 0x092) tst_show="0.9.2" ;; - 0x091) tst_show="0.9.1" ;; - *) tst_show="unknown" ;; - esac - AC_MSG_RESULT([$tst_show]) - # -dnl if test "$tst_api" != "unknown"; then -dnl AC_DEFINE_UNQUOTED(HAVE_OPENSSL_API_LIBRARY, $tst_api, -dnl [OpenSSL library link time API. Defined only by configure script. -dnl No matter what, do not ever define this manually or by any other means.]) -dnl fi - curl_openssl_api_library=$tst_api -]) - - -dnl CURL_CHECK_OPENSSL_API -dnl ------------------------------------------------- - -AC_DEFUN([CURL_CHECK_OPENSSL_API], [ - # - CURL_CHECK_OPENSSL_API_HEADERS - CURL_CHECK_OPENSSL_API_LIBRARY - # - tst_match="yes" - # - AC_MSG_CHECKING([for OpenSSL headers and library versions matching]) - if test "$curl_openssl_api_headers" = "unknown" || - test "$curl_openssl_api_library" = "unknown"; then - tst_match="fail" - tst_warns="Can not compare OpenSSL headers and library versions." - elif test "$curl_openssl_api_headers" != "$curl_openssl_api_library"; then - tst_match="no" - tst_warns="OpenSSL headers and library versions do not match." - fi - AC_MSG_RESULT([$tst_match]) - if test "$tst_match" != "yes"; then - AC_MSG_WARN([$tst_warns]) - fi -]) - dnl ********************************************************************** dnl Check for OpenSSL libraries and headers dnl ********************************************************************** @@ -609,7 +331,6 @@ if test "x$OPT_OPENSSL" != xno; then AC_MSG_NOTICE([Added $LIB_OPENSSL to CURL_LIBRARY_PATH]) fi fi - CURL_CHECK_OPENSSL_API check_for_ca_bundle=1 fi |