<p>Joshua Colp <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/9016">View Change</a></p><div style="white-space:pre-wrap">Approvals:
George Joseph: Looks good to me, but someone else must approve
Joshua Colp: Looks good to me, approved; Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">tcptls: Repair ./configure --with-ssl=PATH.<br><br>SSL_OP_NO_TLSv1_1 and SSL_OP_NO_TLSv1_2 got discovered without honoring a PATH.<br><br>ASTERISK-27865<br><br>Change-Id: I8cd358eed7411726d08fa7b01691bef122fbeb71<br>---<br>M configure<br>M configure.ac<br>M include/asterisk/autoconfig.h.in<br>M main/tcptls.c<br>4 files changed, 1 insertion(+), 111 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/configure b/configure<br>index 223bd05..30aabfd 100755<br>--- a/configure<br>+++ b/configure<br>@@ -655,8 +655,6 @@<br> PBX_IXJUSER<br> GMIME_LIBS<br> GMIME_CFLAGS<br>-PBX_SSL_OP_NO_TLSV1_2<br>-PBX_SSL_OP_NO_TLSV1_1<br> PORTAUDIO_LIBS<br> PORTAUDIO_CFLAGS<br> PYTHONDEV_LIBS<br>@@ -30975,102 +30973,6 @@<br> fi<br> fi<br> fi<br>-<br>-<br>-fi<br>-<br>-if test "$PBX_OPENSSL" = "1";<br>-then<br>-<br>- if test "x${PBX_SSL_OP_NO_TLSV1_1}" != "x1"; then<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_OP_NO_TLSv1_1 in openssl/ssl.h" >&5<br>-$as_echo_n "checking for SSL_OP_NO_TLSv1_1 in openssl/ssl.h... " >&6; }<br>- saved_cppflags="${CPPFLAGS}"<br>- if test "x${SSL_OP_NO_TLSV1_1_DIR}" != "x"; then<br>- SSL_OP_NO_TLSV1_1_INCLUDE="-I${SSL_OP_NO_TLSV1_1_DIR}/include"<br>- fi<br>- CPPFLAGS="${CPPFLAGS} ${SSL_OP_NO_TLSV1_1_INCLUDE}"<br>-<br>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext<br>-/* end confdefs.h. */<br>- #include <openssl/ssl.h><br>-int<br>-main ()<br>-{<br>-#if defined(SSL_OP_NO_TLSv1_1)<br>- int foo = 0;<br>- #else<br>- int foo = bar;<br>- #endif<br>- 0<br>-<br>- ;<br>- return 0;<br>-}<br>-_ACEOF<br>-if ac_fn_c_try_compile "$LINENO"; then :<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5<br>-$as_echo "yes" >&6; }<br>- PBX_SSL_OP_NO_TLSV1_1=1<br>-<br>-$as_echo "#define HAVE_SSL_OP_NO_TLSV1_1 1" >>confdefs.h<br>-<br>-<br>-<br>-else<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5<br>-$as_echo "no" >&6; }<br>-<br>-fi<br>-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext<br>- CPPFLAGS="${saved_cppflags}"<br>- fi<br>-<br>-<br>-<br>- if test "x${PBX_SSL_OP_NO_TLSV1_2}" != "x1"; then<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_OP_NO_TLSv1_2 in openssl/ssl.h" >&5<br>-$as_echo_n "checking for SSL_OP_NO_TLSv1_2 in openssl/ssl.h... " >&6; }<br>- saved_cppflags="${CPPFLAGS}"<br>- if test "x${SSL_OP_NO_TLSV1_2_DIR}" != "x"; then<br>- SSL_OP_NO_TLSV1_2_INCLUDE="-I${SSL_OP_NO_TLSV1_2_DIR}/include"<br>- fi<br>- CPPFLAGS="${CPPFLAGS} ${SSL_OP_NO_TLSV1_2_INCLUDE}"<br>-<br>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext<br>-/* end confdefs.h. */<br>- #include <openssl/ssl.h><br>-int<br>-main ()<br>-{<br>-#if defined(SSL_OP_NO_TLSv1_2)<br>- int foo = 0;<br>- #else<br>- int foo = bar;<br>- #endif<br>- 0<br>-<br>- ;<br>- return 0;<br>-}<br>-_ACEOF<br>-if ac_fn_c_try_compile "$LINENO"; then :<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5<br>-$as_echo "yes" >&6; }<br>- PBX_SSL_OP_NO_TLSV1_2=1<br>-<br>-$as_echo "#define HAVE_SSL_OP_NO_TLSV1_2 1" >>confdefs.h<br>-<br>-<br>-<br>-else<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5<br>-$as_echo "no" >&6; }<br>-<br>-fi<br>-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext<br>- CPPFLAGS="${saved_cppflags}"<br>- fi<br> <br> <br> fi<br>diff --git a/configure.ac b/configure.ac<br>index 16459e0..d0d4c67 100644<br>--- a/configure.ac<br>+++ b/configure.ac<br>@@ -2527,12 +2527,6 @@<br> AST_EXT_LIB_CHECK([OPENSSL_EC], [ssl], [EC_KEY_new_by_curve_name], [openssl/ec.h], [-lcrypto])<br> fi<br> <br>-if test "$PBX_OPENSSL" = "1";<br>-then<br>- AST_C_DEFINE_CHECK([SSL_OP_NO_TLSV1_1], [SSL_OP_NO_TLSv1_1], [openssl/ssl.h])<br>- AST_C_DEFINE_CHECK([SSL_OP_NO_TLSV1_2], [SSL_OP_NO_TLSv1_2], [openssl/ssl.h])<br>-fi<br>-<br> AST_EXT_LIB_CHECK([SRTP], [srtp2], [srtp_init], [srtp2/srtp.h], [], [], [2])<br> AST_EXT_LIB_CHECK_SHARED([SRTP], [srtp2], [srtp_init], [srtp2/srtp.h], [], [], [], [<br> AC_MSG_WARN([***])<br>diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in<br>index 4d1624e..17ac89a 100644<br>--- a/include/asterisk/autoconfig.h.in<br>+++ b/include/asterisk/autoconfig.h.in<br>@@ -913,12 +913,6 @@<br> /* Define to 1 if you have the ISDN SS7 library. */<br> #undef HAVE_SS7<br> <br>-/* Define if your system has the SSL_OP_NO_TLSV1_1 headers. */<br>-#undef HAVE_SSL_OP_NO_TLSV1_1<br>-<br>-/* Define if your system has the SSL_OP_NO_TLSV1_2 headers. */<br>-#undef HAVE_SSL_OP_NO_TLSV1_2<br>-<br> /* Define to 1 if `stat' has the bug that it succeeds when given the<br> zero-length file name argument. */<br> #undef HAVE_STAT_EMPTY_STRING_BUG<br>diff --git a/main/tcptls.c b/main/tcptls.c<br>index 02a2af5..8ffeabb 100644<br>--- a/main/tcptls.c<br>+++ b/main/tcptls.c<br>@@ -385,7 +385,7 @@<br> if (ast_test_flag(&cfg->flags, AST_SSL_DISABLE_TLSV1)) {<br> ssl_opts |= SSL_OP_NO_TLSv1;<br> }<br>-#if defined(HAVE_SSL_OP_NO_TLSV1_1) && defined(HAVE_SSL_OP_NO_TLSV1_2)<br>+#if defined(SSL_OP_NO_TLSv1_1) && defined(SSL_OP_NO_TLSv1_2)<br> if (ast_test_flag(&cfg->flags, AST_SSL_DISABLE_TLSV11)) {<br> ssl_opts |= SSL_OP_NO_TLSv1_1;<br> }<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/9016">change 9016</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/9016"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I8cd358eed7411726d08fa7b01691bef122fbeb71 </div>
<div style="display:none"> Gerrit-Change-Number: 9016 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Alexander Traud <pabstraud@compuserve.com> </div>
<div style="display:none"> Gerrit-Reviewer: Alexander Traud <pabstraud@compuserve.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>