From owner-svn-src-head@FreeBSD.ORG  Tue Jun 16 02:58:51 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2DB3941E;
 Tue, 16 Jun 2015 02:58:51 +0000 (UTC)
 (envelope-from gshapiro@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1B92CA7F;
 Tue, 16 Jun 2015 02:58:51 +0000 (UTC)
 (envelope-from gshapiro@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5G2woZU055793;
 Tue, 16 Jun 2015 02:58:50 GMT (envelope-from gshapiro@FreeBSD.org)
Received: (from gshapiro@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5G2wo3a055792;
 Tue, 16 Jun 2015 02:58:50 GMT (envelope-from gshapiro@FreeBSD.org)
Message-Id: <201506160258.t5G2wo3a055792@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gshapiro set sender to
 gshapiro@FreeBSD.org using -f
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Date: Tue, 16 Jun 2015 02:58:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r284436 - head/contrib/sendmail/src
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 16 Jun 2015 02:58:51 -0000

Author: gshapiro
Date: Tue Jun 16 02:58:50 2015
New Revision: 284436
URL: https://svnweb.freebsd.org/changeset/base/284436

Log:
  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.
  This commit chages that default to 1024 bits.  sendmail 8.15.2, when
  released well use a default of 2048 bits.
  
  MFC after:	1 day

Modified:
  head/contrib/sendmail/src/tls.c

Modified: head/contrib/sendmail/src/tls.c
==============================================================================
--- head/contrib/sendmail/src/tls.c	Tue Jun 16 02:31:11 2015	(r284435)
+++ head/contrib/sendmail/src/tls.c	Tue Jun 16 02:58:50 2015	(r284436)
@@ -650,7 +650,7 @@ inittls(ctx, req, options, srv, certfile
 	**  1024	generate 1024 bit parameters
 	**  2048	generate 2048 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))
@@ -676,8 +676,8 @@ inittls(ctx, req, options, srv, certfile
 		}
 		if (dhparam == NULL)
 		{
-			dhparam = srv ? "1" : "5";
-			req |= (srv ? TLS_I_DH1024 : TLS_I_DH512);
+			dhparam = "1";
+			req |= TLS_I_DH1024;
 		}
 		else if (*dhparam == '/')
 		{