Sfoglia il codice sorgente

Can't build on Debian Stretch, openssl 1.1.0c

Fix for issue #93

Apparently, openssl 1.1.0c (at least on Debian Stretch, maybe other
platforms) no longer supports NRPE's old Diffie-Hellman key exchange.
Added a `--with-need-dh` configure parameter. Running configure like
	`./configure --with-need-dh=no`
will prevent the DH code from being included, and prevent the key
from being generated.
John C. Frickson 8 anni fa
parent
commit
da4d76a7f4
3 ha cambiato i file con 25 aggiunte e 2 eliminazioni
  1. 1 0
      Changelog
  2. 15 1
      configure
  3. 9 1
      configure.ac

+ 1 - 0
Changelog

@@ -10,6 +10,7 @@ FIXES
 - Alternate log file not being used soon enough (John Frickson)
 - Unable to compile v3.1.0rc1 with new SSL checks on rh5 (John Frickson)
 - Unable to compile nrpe-3.1.0 - undefined references to va_start, va_end (John Frickson)
+- Can't build on Debian Stretch, openssl 1.1.0c (John Frickson)
 
 
 3.1.0 - 2017-04-17

+ 15 - 1
configure

@@ -757,6 +757,7 @@ with_logdir
 with_piddir
 with_pipedir
 enable_ssl
+with_need_dh
 with_ssl
 with_ssl_inc
 with_ssl_lib
@@ -1422,6 +1423,7 @@ Optional Packages:
   --with-logdir=DIR       where log files should be placed
   --with-piddir=DIR       where the PID file should be placed
   --with-pipedir=DIR      where socket and pipe files should be placed
+  --with-need-dh          set to 'no' to not include Diffie-Hellman SSL logic
   --with-ssl=DIR          sets location of the SSL installation
   --with-ssl-inc=DIR      sets location of the SSL include files
   --with-ssl-lib=DIR      sets location of the SSL libraries
@@ -7278,9 +7280,21 @@ else
 fi
 
 
+need_dh=yes
+
+# Check whether --with-need_dh was given.
+if test "${with_need_dh+set}" = set; then :
+  withval=$with_need_dh; need_dh=$withval
+else
+  nrpe_group=need_dh
+fi
+
+
 if test x$check_for_ssl = xyes; then
 	# need_dh should only be set for NRPE
-	need_dh=yes
+#	need_dh=yes
+echo "need_dh = |$need_dh|"
+sleep 10;
 
 
 # -------------------------------

+ 9 - 1
configure.ac

@@ -304,10 +304,18 @@ AC_ARG_ENABLE([ssl],
 	fi
 	],check_for_ssl=yes)
 
+need_dh=yes
+AC_ARG_WITH([need_dh],
+	AS_HELP_STRING([--with-need-dh],[set to 'no' to not include Diffie-Hellman SSL logic]),
+	[need_dh=$withval],
+	[nrpe_group=need_dh])
+
 dnl Optional SSL library and include paths
 if test x$check_for_ssl = xyes; then
 	# need_dh should only be set for NRPE
-	need_dh=yes
+#	need_dh=yes
+echo "need_dh = |$need_dh|"
+sleep 10;
 	AC_NAGIOS_GET_SSL
 fi