svn commit: r284717 - head/contrib/sendmail/src

[Gregory Neil Shapiro]

Author: gshapiro
Date: Tue Jun 23 04:33:54 2015
New Revision: 284717
URL: https://svnweb.freebsd.org/changeset/base/284717

Log:
  An additional fix for the openssl Weak DH remediation:
  
  The import of openssl to address the FreeBSD-SA-15:10.openssl security
  advisory includes a change which rejects handshakes with DH parameters
  below 768 bits.  sendmail releases prior to 8.15.2 (not yet released),
  defaulted to a 512 bit DH parameter setting for client connections.
  
  The first fix committed last week changed the default to 1024 bits.
  
  This commit fixes the case where the DHParameters option is set to a
  file which doesn't exist, which is the case on newer versions of
  FreeBSD which enable STARTTLS by default by auto-creating TLS
  certificates.
  
  MFC after:	2 days

Modified:
  head/contrib/sendmail/src/sendmail.h

Modified: head/contrib/sendmail/src/sendmail.h
==============================================================================
--- head/contrib/sendmail/src/sendmail.h	Tue Jun 23 04:17:12 2015	(r284716)
+++ head/contrib/sendmail/src/sendmail.h	Tue Jun 23 04:33:54 2015	(r284717)
@@ -1935,7 +1935,7 @@ struct termescape
 
 /* server requirements */
 #define TLS_I_SRV	(TLS_I_SRV_CERT | TLS_I_RSA_TMP | TLS_I_VRFY_PATH | \
-			 TLS_I_VRFY_LOC | TLS_I_TRY_DH | TLS_I_DH512 | \
+			 TLS_I_VRFY_LOC | TLS_I_TRY_DH | TLS_I_DH1024 | \
 			 TLS_I_CACHE)
 
 /* client requirements */