svn commit: r284987 - in releng/8.4: . contrib/sendmail/src sys/conf

[Xin LI]

Author: delphij
Date: Tue Jun 30 23:21:59 2015
New Revision: 284987
URL: https://svnweb.freebsd.org/changeset/base/284987

Log:
  [EN-15:08] Revised: Improvements to sendmail TLS/DH interoperability.
  
  Approved by:	so

Modified:
  releng/8.4/UPDATING
  releng/8.4/contrib/sendmail/src/sendmail.h
  releng/8.4/sys/conf/newvers.sh

Modified: releng/8.4/UPDATING
==============================================================================
--- releng/8.4/UPDATING	Tue Jun 30 23:21:48 2015	(r284986)
+++ releng/8.4/UPDATING	Tue Jun 30 23:21:59 2015	(r284987)
@@ -15,6 +15,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
 	debugging tools present in HEAD were left in place because
 	sun4v support still needs work to become production ready.
 
+20150630:	p32	FreeBSD-EN-15:08.sendmail [revised]
+
+	Improvements to sendmail TLS/DH interoperability. [EN-15:08]
+
 20150618:	p31	FreeBSD-EN-15:08.sendmail
 	Improvements to sendmail TLS/DH interoperability. [EN-15:08]
 

Modified: releng/8.4/contrib/sendmail/src/sendmail.h
==============================================================================
--- releng/8.4/contrib/sendmail/src/sendmail.h	Tue Jun 30 23:21:48 2015	(r284986)
+++ releng/8.4/contrib/sendmail/src/sendmail.h	Tue Jun 30 23:21:59 2015	(r284987)
@@ -1929,7 +1929,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 */

Modified: releng/8.4/sys/conf/newvers.sh
==============================================================================
--- releng/8.4/sys/conf/newvers.sh	Tue Jun 30 23:21:48 2015	(r284986)
+++ releng/8.4/sys/conf/newvers.sh	Tue Jun 30 23:21:59 2015	(r284987)
@@ -32,7 +32,7 @@
 
 TYPE="FreeBSD"
 REVISION="8.4"
-BRANCH="RELEASE-p31"
+BRANCH="RELEASE-p32"
 if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi