From owner-svn-src-stable@FreeBSD.ORG  Wed Jun 17 03:11:26 2015
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B8F24A45;
 Wed, 17 Jun 2015 03:11:26 +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 A66CFE0C;
 Wed, 17 Jun 2015 03:11:26 +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 t5H3BQC0085750;
 Wed, 17 Jun 2015 03:11:26 GMT (envelope-from gshapiro@FreeBSD.org)
Received: (from gshapiro@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5H3BQeA085749;
 Wed, 17 Jun 2015 03:11:26 GMT (envelope-from gshapiro@FreeBSD.org)
Message-Id: <201506170311.t5H3BQeA085749@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: Wed, 17 Jun 2015 03:11:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r284488 - stable/9/contrib/sendmail/src
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 17 Jun 2015 03:11:26 -0000

Author: gshapiro
Date: Wed Jun 17 03:11:25 2015
New Revision: 284488
URL: https://svnweb.freebsd.org/changeset/base/284488

Log:
  MFC: 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.

Modified:
  stable/9/contrib/sendmail/src/tls.c
Directory Properties:
  stable/9/contrib/sendmail/   (props changed)

Modified: stable/9/contrib/sendmail/src/tls.c
==============================================================================
--- stable/9/contrib/sendmail/src/tls.c	Wed Jun 17 02:47:30 2015	(r284487)
+++ stable/9/contrib/sendmail/src/tls.c	Wed Jun 17 03:11:25 2015	(r284488)
@@ -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 == '/')
 		{