Better SSL include ffile det

configure

@@ -2012,11 +2012,11 @@ if test x$check_for_ssl = xyes; then
 	echo $ac_n "checking for SSL""... $ac_c" 1>&6
 echo "configure:2014: checking for SSL" >&5
 	found_ssl=no
-	for dir in $ssl_inc_dir /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr; do
+	for dir in $ssl_inc_dir /usr/local/openssl /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr; do
 		ssldir="$dir"
 		if test -f "$dir/include/openssl/ssl.h"; then
 			found_ssl=yes
-			CFLAGS="$CFLAGS -I$ssldir/include/openssl"
+			CFLAGS="$CFLAGS -I$ssldir/include/openssl -I$ssldir/include"
 		        break
 		fi
 		if test -f "$dir/include/ssl.h"; then

configure.in

@@ -122,11 +122,11 @@ dnl Modified version of Mark Ethan Trostler's macro <trostler@juniper.net>
 if test x$check_for_ssl = xyes; then
 	AC_MSG_CHECKING(for SSL)
 	found_ssl=no
-	for dir in $ssl_inc_dir /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr; do
+	for dir in $ssl_inc_dir /usr/local/openssl /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr; do
 		ssldir="$dir"
 		if test -f "$dir/include/openssl/ssl.h"; then
 			found_ssl=yes
-			CFLAGS="$CFLAGS -I$ssldir/include/openssl"
+			CFLAGS="$CFLAGS -I$ssldir/include/openssl -I$ssldir/include"
 		        break
 		fi
 		if test -f "$dir/include/ssl.h"; then

src/dh.h

@@ -4,12 +4,12 @@
 DH *get_dh512()
 	{
 	static unsigned char dh512_p[]={
-		0xE5,0x53,0x72,0x1D,0x9D,0xD2,0x8A,0x29,0x25,0x1D,0x4C,0xB6,
-		0x54,0xE6,0xA2,0x46,0x5E,0x82,0xEF,0xC4,0x4D,0x15,0x91,0x82,
-		0x21,0xE7,0x5B,0xA9,0xC0,0x0E,0xB1,0xCE,0x3D,0x2E,0xDF,0xE3,
-		0xA4,0x94,0xBA,0x0A,0x35,0x0D,0x00,0xEA,0x75,0x06,0xB2,0x87,
-		0xF3,0x53,0x0A,0xB8,0xD9,0x6F,0xA7,0xFC,0x4A,0xF9,0x04,0x1B,
-		0x1A,0x19,0xFC,0xA3,
+		0xAC,0xDA,0x27,0xF4,0x96,0xEC,0x5D,0x76,0x1B,0xC9,0x67,0x6C,
+		0xD7,0x0B,0xDC,0x31,0x2E,0xCC,0x95,0x6F,0x55,0xF5,0x4F,0xD0,
+		0x45,0x4B,0xC1,0x49,0x5F,0x1C,0x00,0xE3,0xEE,0xED,0xD7,0x6F,
+		0x56,0x6D,0xF8,0xFD,0x33,0x23,0x06,0x53,0x2D,0x7B,0x47,0xB2,
+		0xE4,0x81,0x02,0xDB,0x19,0x69,0x0B,0x86,0xD9,0xDA,0x2B,0x37,
+		0x44,0xE4,0x0C,0x03,
 		};
 	static unsigned char dh512_g[]={
 		0x02,