瀏覽代碼

Fix for opensssl binary locatio

Ethan Galstad 23 年之前
父節點
當前提交
7694cc2bb6
共有 3 個文件被更改,包括 20 次插入10 次删除
  1. 8 3
      configure
  2. 6 1
      configure.in
  3. 6 6
      src/dh.h

+ 8 - 3
configure

@@ -1947,11 +1947,16 @@ EOF
 		
 		
 				echo ""
 				echo ""
 		echo "*** Generating DH Parameters for SSL/TLS ***"
 		echo "*** Generating DH Parameters for SSL/TLS ***"
-		$ssldir/bin/openssl dhparam -out /dev/null -C 512 > src/dh.h
+		if test -f "$ssldir/sbin/openssl"; then
+			sslbin=$ssldir/sbin/openssl
+		else
+			sslbin=$ssldir/bin/openssl
+		fi
+		$sslbin dhparam -out /dev/null -C 512 > src/dh.h
 	    fi
 	    fi
 
 
 		echo $ac_n "checking for Kerberos include files""... $ac_c" 1>&6
 		echo $ac_n "checking for Kerberos include files""... $ac_c" 1>&6
-echo "configure:1955: checking for Kerberos include files" >&5
+echo "configure:1960: checking for Kerberos include files" >&5
 	found_kerberos=no
 	found_kerberos=no
 	for dir in $kerberos_inc_dir /usr/kerberos/include; do
 	for dir in $kerberos_inc_dir /usr/kerberos/include; do
 		kerbdir="$dir"
 		kerbdir="$dir"
@@ -2021,7 +2026,7 @@ fi
 # Extract the first word of "perl", so it can be a program name with args.
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
 set dummy perl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2025: checking for $ac_word" >&5
+echo "configure:2030: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 else

+ 6 - 1
configure.in

@@ -144,7 +144,12 @@ if test x$check_for_ssl = xyes; then
 		dnl Generate DH parameters
 		dnl Generate DH parameters
 		echo ""
 		echo ""
 		echo "*** Generating DH Parameters for SSL/TLS ***"
 		echo "*** Generating DH Parameters for SSL/TLS ***"
-		$ssldir/bin/openssl dhparam -out /dev/null -C 512 > src/dh.h
+		if test -f "$ssldir/sbin/openssl"; then
+			sslbin=$ssldir/sbin/openssl
+		else
+			sslbin=$ssldir/bin/openssl
+		fi
+		$sslbin dhparam -out /dev/null -C 512 > src/dh.h
 	    fi
 	    fi
 
 
 	dnl RedHat 8.0 and 9.0 include openssl compiled with kerberos, so we must include header file
 	dnl RedHat 8.0 and 9.0 include openssl compiled with kerberos, so we must include header file

+ 6 - 6
src/dh.h

@@ -4,12 +4,12 @@
 DH *get_dh512()
 DH *get_dh512()
 	{
 	{
 	static unsigned char dh512_p[]={
 	static unsigned char dh512_p[]={
-		0xCF,0xFF,0x65,0xC2,0xC8,0xB4,0xD2,0x68,0x8C,0xC1,0x80,0xB1,
-		0x7B,0xD6,0xE8,0xB3,0x62,0x59,0x62,0xED,0xA7,0x45,0x6A,0xF8,
-		0xE9,0xD8,0xBE,0x3F,0x38,0x42,0x5F,0xB2,0xA5,0x36,0x03,0xD3,
-		0x06,0x27,0x81,0xC8,0x9B,0x88,0x50,0x3B,0x82,0x3D,0x31,0x45,
-		0x2C,0xB4,0xC5,0xA5,0xBE,0x6A,0xE3,0x2E,0xA6,0x86,0xFD,0x6A,
-		0x7E,0x1E,0x6A,0x73,
+		0xA8,0x3A,0x30,0xC2,0x7A,0xF8,0xEB,0xC5,0x01,0x11,0xB8,0x51,
+		0xBE,0x1A,0x6C,0x0D,0x62,0x0D,0xD5,0xED,0x7D,0x35,0x33,0xE9,
+		0xB7,0xB6,0x7C,0x14,0x3F,0x6B,0x1E,0xE5,0x73,0xB8,0x09,0x6C,
+		0xB2,0x06,0x7B,0x09,0x50,0xD5,0xCE,0xA2,0xFC,0x03,0x8D,0xD3,
+		0xDB,0x3F,0x2E,0x5B,0x98,0x49,0x25,0xDC,0x45,0x9B,0x92,0x84,
+		0x5F,0xAE,0x37,0x3B,
 		};
 		};
 	static unsigned char dh512_g[]={
 	static unsigned char dh512_g[]={
 		0x02,
 		0x02,