[Asterisk-code-review] tcptls: Repair ./configure --with-ssl=PATH. (asterisk[master])

[Alexander Traud]

Alexander Traud has uploaded this change for review. ( https://gerrit.asterisk.org/9016


Change subject: tcptls: Repair ./configure --with-ssl=PATH.
......................................................................

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
---
M configure
M configure.ac
M include/asterisk/autoconfig.h.in
M main/tcptls.c
4 files changed, 1 insertion(+), 111 deletions(-)



  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/16/9016/1

diff --git a/configure b/configure
index 223bd05..30aabfd 100755
--- a/configure
+++ b/configure
@@ -655,8 +655,6 @@
 PBX_IXJUSER
 GMIME_LIBS
 GMIME_CFLAGS
-PBX_SSL_OP_NO_TLSV1_2
-PBX_SSL_OP_NO_TLSV1_1
 PORTAUDIO_LIBS
 PORTAUDIO_CFLAGS
 PYTHONDEV_LIBS
@@ -30975,102 +30973,6 @@
       fi
    fi
 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
diff --git a/configure.ac b/configure.ac
index 16459e0..d0d4c67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2527,12 +2527,6 @@
 	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([***])
diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in
index 4d1624e..17ac89a 100644
--- a/include/asterisk/autoconfig.h.in
+++ b/include/asterisk/autoconfig.h.in
@@ -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
diff --git a/main/tcptls.c b/main/tcptls.c
index 02a2af5..8ffeabb 100644
--- a/main/tcptls.c
+++ b/main/tcptls.c
@@ -385,7 +385,7 @@
 	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;
 	}

-- 
To view, visit https://gerrit.asterisk.org/9016
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8cd358eed7411726d08fa7b01691bef122fbeb71
Gerrit-Change-Number: 9016
Gerrit-PatchSet: 1
Gerrit-Owner: Alexander Traud <pabstraud at compuserve.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180519/11f0eefb/attachment-0001.html>