[Midnightbsd-cvs] src [7037] trunk: increase the default DH parameters for client conections to 1024 to match server and work with modern openssl

[laffer1 at midnightbsd.org]

Revision: 7037
          http://svnweb.midnightbsd.org/src/?rev=7037
Author:   laffer1
Date:     2015-06-18 13:00:55 -0400 (Thu, 18 Jun 2015)
Log Message:
-----------
increase the default DH parameters for client conections to 1024 to match server and work with modern openssl

Modified Paths:
--------------
    trunk/UPDATING
    trunk/contrib/sendmail/src/tls.c

Modified: trunk/UPDATING
===================================================================
--- trunk/UPDATING	2015-06-14 20:48:59 UTC (rev 7036)
+++ trunk/UPDATING	2015-06-18 17:00:55 UTC (rev 7037)
@@ -1,5 +1,13 @@
 Updating Information for MidnightBSD users.
 
+
+20150618:
+        With the recent changes to OpenSSL to block 512 bit certificates,
+        sendmail can't connect with TLS to some servers.
+
+        Increase the default size to 1024 bit for client connections to
+        match the server configuration.
+
 20150613:
 	tzdata 2015d
 

Modified: trunk/contrib/sendmail/src/tls.c
===================================================================
--- trunk/contrib/sendmail/src/tls.c	2015-06-14 20:48:59 UTC (rev 7036)
+++ trunk/contrib/sendmail/src/tls.c	2015-06-18 17:00:55 UTC (rev 7037)
@@ -648,7 +648,7 @@
 	**  512		generate 512 bit parameters (fixed)
 	**  1024	generate 1024 bit parameters
 	**  /file/name	read parameters from /file/name
-	**  default is: 1024 for server, 512 for client (OK? XXX)
+	**  default is: 1024
 	*/
 
 	if (bitset(TLS_I_TRY_DH, req))
@@ -672,8 +672,8 @@
 		}
 		if (dhparam == NULL)
 		{
-			dhparam = srv ? "1" : "5";
-			req |= (srv ? TLS_I_DH1024 : TLS_I_DH512);
+			dhparam = "1";
+			req |= TLS_I_DH1024;
 		}
 		else if (*dhparam == '/')
 		{