From owner-svn-ports-all@freebsd.org  Fri Nov  3 15:51:12 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1B947E55225;
 Fri,  3 Nov 2017 15:51:12 +0000 (UTC)
 (envelope-from brnrd@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 DF1E5697D9;
 Fri,  3 Nov 2017 15:51:11 +0000 (UTC)
 (envelope-from brnrd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA3FpB2Y019659;
 Fri, 3 Nov 2017 15:51:11 GMT (envelope-from brnrd@FreeBSD.org)
Received: (from brnrd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA3FpBa4019658;
 Fri, 3 Nov 2017 15:51:11 GMT (envelope-from brnrd@FreeBSD.org)
Message-Id: <201711031551.vA3FpBa4019658@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: brnrd set sender to
 brnrd@FreeBSD.org using -f
From: Bernard Spil <brnrd@FreeBSD.org>
Date: Fri, 3 Nov 2017 15:51:11 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r453409 - head/security/openssl/files
X-SVN-Group: ports-head
X-SVN-Commit-Author: brnrd
X-SVN-Commit-Paths: head/security/openssl/files
X-SVN-Commit-Revision: 453409
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Nov 2017 15:51:12 -0000

Author: brnrd
Date: Fri Nov  3 15:51:10 2017
New Revision: 453409
URL: https://svnweb.freebsd.org/changeset/ports/453409

Log:
  security/openssl: Unbreak build with No-SSLv3
  
   - Importing patch from upstream
  
  PR:		223388
  Submitted by:	tijl
  Reported by:	Laurence Parry <greenreaper@hotmail.com>

Added:
  head/security/openssl/files/patch-ssl_s23__clnt.c   (contents, props changed)

Added: head/security/openssl/files/patch-ssl_s23__clnt.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/openssl/files/patch-ssl_s23__clnt.c	Fri Nov  3 15:51:10 2017	(r453409)
@@ -0,0 +1,28 @@
+From 98fe34c30fe1fb7be3023e4c1458da73f8e55da9 Mon Sep 17 00:00:00 2001
+From: Kurt Roeckx <kurt@roeckx.be>
+Date: Thu, 2 Nov 2017 18:53:16 +0100
+Subject: [PATCH] Fix no-ssl3-method build
+
+Reviewed-by: Rich Salz <rsalz@openssl.org>
+GH: #4649
+---
+ ssl/s23_clnt.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/ssl/s23_clnt.c b/ssl/s23_clnt.c
+index 92f41dd549a..05b892b7238 100644
+--- ssl/s23_clnt.c.orig
++++ ssl/s23_clnt.c
+@@ -757,10 +757,12 @@ static int ssl23_get_server_hello(SSL *s)
+                 s->version = TLS1_VERSION;
+                 s->method = TLSv1_client_method();
+                 break;
++#ifndef OPENSSL_NO_SSL3_METHOD
+             case SSL3_VERSION:
+                 s->version = SSL3_VERSION;
+                 s->method = SSLv3_client_method();
+                 break;
++#endif
+             }
+             SSLerr(SSL_F_SSL23_GET_SERVER_HELLO, SSL_R_UNSUPPORTED_PROTOCOL);
+             ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_PROTOCOL_VERSION);