From owner-svn-ports-head@freebsd.org  Sat Apr 21 20:38:39 2018
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 004F5FA1E01;
 Sat, 21 Apr 2018 20:38:39 +0000 (UTC)
 (envelope-from brnrd@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 9BA906EAAA;
 Sat, 21 Apr 2018 20:38:38 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9694540DF;
 Sat, 21 Apr 2018 20:38:38 +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 w3LKccPo060163;
 Sat, 21 Apr 2018 20:38:38 GMT (envelope-from brnrd@FreeBSD.org)
Received: (from brnrd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3LKcceQ060162;
 Sat, 21 Apr 2018 20:38:38 GMT (envelope-from brnrd@FreeBSD.org)
Message-Id: <201804212038.w3LKcceQ060162@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: Sat, 21 Apr 2018 20:38:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r467906 - head/security/trousers/files
X-SVN-Group: ports-head
X-SVN-Commit-Author: brnrd
X-SVN-Commit-Paths: head/security/trousers/files
X-SVN-Commit-Revision: 467906
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Apr 2018 20:38:39 -0000

Author: brnrd
Date: Sat Apr 21 20:38:38 2018
New Revision: 467906
URL: https://svnweb.freebsd.org/changeset/ports/467906

Log:
  security/trousers: Fix build with LibreSSl 2.7
  
   - LibreSSL 2.7 adds OpenSSL 1.1 API
  
  PR:		227169
  Approved by:	maintainer time-out

Modified:
  head/security/trousers/files/patch-src_trspi_crypto_openssl_rsa.c

Modified: head/security/trousers/files/patch-src_trspi_crypto_openssl_rsa.c
==============================================================================
--- head/security/trousers/files/patch-src_trspi_crypto_openssl_rsa.c	Sat Apr 21 20:36:06 2018	(r467905)
+++ head/security/trousers/files/patch-src_trspi_crypto_openssl_rsa.c	Sat Apr 21 20:38:38 2018	(r467906)
@@ -5,7 +5,7 @@
  #endif
  
 -#if OPENSSL_VERSION_NUMBER < 0x10100001L
-+#if OPENSSL_VERSION_NUMBER < 0x10100001L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100001L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
  static int
  RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
  {