From owner-svn-src-head@FreeBSD.ORG  Mon Mar 16 20:24:39 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 242B0308;
 Mon, 16 Mar 2015 20:24:39 +0000 (UTC)
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 0E984E6A;
 Mon, 16 Mar 2015 20:24:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2GKOcwW014428;
 Mon, 16 Mar 2015 20:24:38 GMT (envelope-from gshapiro@FreeBSD.org)
Received: (from gshapiro@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2GKOcGj014427;
 Mon, 16 Mar 2015 20:24:38 GMT (envelope-from gshapiro@FreeBSD.org)
Message-Id: <201503162024.t2GKOcGj014427@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: Mon, 16 Mar 2015 20:24:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r280155 - 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.18-1
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: Mon, 16 Mar 2015 20:24:39 -0000

Author: gshapiro
Date: Mon Mar 16 20:24:37 2015
New Revision: 280155
URL: https://svnweb.freebsd.org/changeset/base/280155

Log:
  Default to turning off OpenSSL SSL_OP_TLSEXT_PADDING as it breaks
  compatibility with some sites
  
  This change comes from 8.15 but is being backported to FreeBSD releases
  not yet using 8.15.
  
  MFC after:	3 days
  Noted by:	julian@

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

Modified: head/contrib/sendmail/src/readcf.c
==============================================================================
--- head/contrib/sendmail/src/readcf.c	Mon Mar 16 20:13:25 2015	(r280154)
+++ head/contrib/sendmail/src/readcf.c	Mon Mar 16 20:24:37 2015	(r280155)
@@ -124,6 +124,11 @@ readcf(cfname, safe, e)
 		| SSL_OP_NO_TICKET
 #endif
 		;
+# ifdef SSL_OP_TLSEXT_PADDING
+	/* SSL_OP_TLSEXT_PADDING breaks compatibility with some sites */
+	Srv_SSL_Options &= ~SSL_OP_TLSEXT_PADDING;
+	Clt_SSL_Options &= ~SSL_OP_TLSEXT_PADDING;
+# endif /* SSL_OP_TLSEXT_PADDING */
 #endif /* STARTTLS */
 	if (DontLockReadFiles)
 		sff |= SFF_NOLOCK;
@@ -2406,6 +2411,9 @@ static struct ssl_options
 #ifdef SSL_OP_CRYPTOPRO_TLSEXT_BUG
 	{ "SSL_OP_CRYPTOPRO_TLSEXT_BUG",	SSL_OP_CRYPTOPRO_TLSEXT_BUG	},
 #endif
+#ifdef SSL_OP_TLSEXT_PADDING
+	{ "SSL_OP_TLSEXT_PADDING",	SSL_OP_TLSEXT_PADDING	},
+#endif
 	{ NULL,		0		}
 };
 #endif /* STARTTLS && _FFR_TLS_1 */