tcptls: Repair ./configure --with-ssl=PATH.
SSL_OP_NO_TLSv1_1 and SSL_OP_NO_TLSv1_2 got discovered without honoring a PATH. ASTERISK-27865 Change-Id: I8cd358eed7411726d08fa7b01691bef122fbeb71
This commit is contained in:
Alexander Traud
parent
be9a1952d8
commit
2228ae3f27
|
|
@ -655,8 +655,6 @@ PBX_MSG_NOSIGNAL
|
|||
PBX_IXJUSER
|
||||
GMIME_LIBS
|
||||
GMIME_CFLAGS
|
||||
PBX_SSL_OP_NO_TLSV1_2
|
||||
PBX_SSL_OP_NO_TLSV1_1
|
||||
PORTAUDIO_LIBS
|
||||
PORTAUDIO_CFLAGS
|
||||
PYTHONDEV_LIBS
|
||||
|
|
@ -30977,102 +30975,6 @@ _ACEOF
|
|||
fi
|
||||
|
||||
|
||||
fi
|
||||
|
||||
if test "$PBX_OPENSSL" = "1";
|
||||
then
|
||||
|
||||
if test "x${PBX_SSL_OP_NO_TLSV1_1}" != "x1"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_OP_NO_TLSv1_1 in openssl/ssl.h" >&5
|
||||
$as_echo_n "checking for SSL_OP_NO_TLSv1_1 in openssl/ssl.h... " >&6; }
|
||||
saved_cppflags="${CPPFLAGS}"
|
||||
if test "x${SSL_OP_NO_TLSV1_1_DIR}" != "x"; then
|
||||
SSL_OP_NO_TLSV1_1_INCLUDE="-I${SSL_OP_NO_TLSV1_1_DIR}/include"
|
||||
fi
|
||||
CPPFLAGS="${CPPFLAGS} ${SSL_OP_NO_TLSV1_1_INCLUDE}"
|
||||
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#include <openssl/ssl.h>
|
||||
int
|
||||
main ()
|
||||
{
|
||||
#if defined(SSL_OP_NO_TLSv1_1)
|
||||
int foo = 0;
|
||||
#else
|
||||
int foo = bar;
|
||||
#endif
|
||||
0
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_compile "$LINENO"; then :
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
PBX_SSL_OP_NO_TLSV1_1=1
|
||||
|
||||
$as_echo "#define HAVE_SSL_OP_NO_TLSV1_1 1" >>confdefs.h
|
||||
|
||||
|
||||
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
CPPFLAGS="${saved_cppflags}"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
if test "x${PBX_SSL_OP_NO_TLSV1_2}" != "x1"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_OP_NO_TLSv1_2 in openssl/ssl.h" >&5
|
||||
$as_echo_n "checking for SSL_OP_NO_TLSv1_2 in openssl/ssl.h... " >&6; }
|
||||
saved_cppflags="${CPPFLAGS}"
|
||||
if test "x${SSL_OP_NO_TLSV1_2_DIR}" != "x"; then
|
||||
SSL_OP_NO_TLSV1_2_INCLUDE="-I${SSL_OP_NO_TLSV1_2_DIR}/include"
|
||||
fi
|
||||
CPPFLAGS="${CPPFLAGS} ${SSL_OP_NO_TLSV1_2_INCLUDE}"
|
||||
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#include <openssl/ssl.h>
|
||||
int
|
||||
main ()
|
||||
{
|
||||
#if defined(SSL_OP_NO_TLSv1_2)
|
||||
int foo = 0;
|
||||
#else
|
||||
int foo = bar;
|
||||
#endif
|
||||
0
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_compile "$LINENO"; then :
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
PBX_SSL_OP_NO_TLSV1_2=1
|
||||
|
||||
$as_echo "#define HAVE_SSL_OP_NO_TLSV1_2 1" >>confdefs.h
|
||||
|
||||
|
||||
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
CPPFLAGS="${saved_cppflags}"
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -2527,12 +2527,6 @@ then
|
|||
AST_EXT_LIB_CHECK([OPENSSL_EC], [ssl], [EC_KEY_new_by_curve_name], [openssl/ec.h], [-lcrypto])
|
||||
fi
|
||||
|
||||
if test "$PBX_OPENSSL" = "1";
|
||||
then
|
||||
AST_C_DEFINE_CHECK([SSL_OP_NO_TLSV1_1], [SSL_OP_NO_TLSv1_1], [openssl/ssl.h])
|
||||
AST_C_DEFINE_CHECK([SSL_OP_NO_TLSV1_2], [SSL_OP_NO_TLSv1_2], [openssl/ssl.h])
|
||||
fi
|
||||
|
||||
AST_EXT_LIB_CHECK([SRTP], [srtp2], [srtp_init], [srtp2/srtp.h], [], [], [2])
|
||||
AST_EXT_LIB_CHECK_SHARED([SRTP], [srtp2], [srtp_init], [srtp2/srtp.h], [], [], [], [
|
||||
AC_MSG_WARN([***])
|
||||
|
|
|
|||
|
|
@ -913,12 +913,6 @@
|
|||
/* Define to 1 if you have the ISDN SS7 library. */
|
||||
#undef HAVE_SS7
|
||||
|
||||
/* Define if your system has the SSL_OP_NO_TLSV1_1 headers. */
|
||||
#undef HAVE_SSL_OP_NO_TLSV1_1
|
||||
|
||||
/* Define if your system has the SSL_OP_NO_TLSV1_2 headers. */
|
||||
#undef HAVE_SSL_OP_NO_TLSV1_2
|
||||
|
||||
/* Define to 1 if `stat' has the bug that it succeeds when given the
|
||||
zero-length file name argument. */
|
||||
#undef HAVE_STAT_EMPTY_STRING_BUG
|
||||
|
|
|
|||
|
|
@ -385,7 +385,7 @@ static int __ssl_setup(struct ast_tls_config *cfg, int client)
|
|||
if (ast_test_flag(&cfg->flags, AST_SSL_DISABLE_TLSV1)) {
|
||||
ssl_opts |= SSL_OP_NO_TLSv1;
|
||||
}
|
||||
#if defined(HAVE_SSL_OP_NO_TLSV1_1) && defined(HAVE_SSL_OP_NO_TLSV1_2)
|
||||
#if defined(SSL_OP_NO_TLSv1_1) && defined(SSL_OP_NO_TLSv1_2)
|
||||
if (ast_test_flag(&cfg->flags, AST_SSL_DISABLE_TLSV11)) {
|
||||
ssl_opts |= SSL_OP_NO_TLSv1_1;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue