From owner-svn-ports-all@freebsd.org Wed May 30 07:25:00 2018 Return-Path: Delivered-To: svn-ports-all@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 E4DC1F739CB; Wed, 30 May 2018 07:24:59 +0000 (UTC) (envelope-from jbeich@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 929F4740FB; Wed, 30 May 2018 07:24:59 +0000 (UTC) (envelope-from jbeich@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 720E22794B; Wed, 30 May 2018 07:24:59 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4U7Oxw4076719; Wed, 30 May 2018 07:24:59 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4U7OxQ7076718; Wed, 30 May 2018 07:24:59 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805300724.w4U7OxQ7076718@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 30 May 2018 07:24:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r471122 - branches/2018Q2/security/nss/files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q2/security/nss/files X-SVN-Commit-Revision: 471122 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.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 May 2018 07:25:00 -0000 Author: jbeich Date: Wed May 30 07:24:59 2018 New Revision: 471122 URL: https://svnweb.freebsd.org/changeset/ports/471122 Log: MFH: r471116 security/nss: switch r469336 to upstream fix Approved by: ports-secteam blanket Modified: branches/2018Q2/security/nss/files/patch-bug1459739 Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/security/nss/files/patch-bug1459739 ============================================================================== --- branches/2018Q2/security/nss/files/patch-bug1459739 Wed May 30 06:54:28 2018 (r471121) +++ branches/2018Q2/security/nss/files/patch-bug1459739 Wed May 30 07:24:59 2018 (r471122) @@ -1,14 +1,101 @@ +commit f54baf1791c6 +Author: Mike Hommey +Date: Sun May 27 16:20:00 2018 +0200 + + Bug 1432455 - Build FStar.c when not building with int128 support. r=fkiefer +--- + lib/freebl/Makefile | 6 +++++- + lib/freebl/freebl.gyp | 29 +++++++++++++++++------------ + lib/freebl/freebl_base.gypi | 4 +++- + 3 files changed, 25 insertions(+), 14 deletions(-) + diff --git lib/freebl/Makefile lib/freebl/Makefile -index e6a94d35c4..0aecd2fbe7 100644 +index e6a94d35c4..bff11c7c8e 100644 --- lib/freebl/Makefile +++ lib/freebl/Makefile -@@ -539,6 +539,9 @@ ifeq (,$(filter-out i386 x386 x86 x86_64 aarch64,$(CPU_ARCH))) +@@ -535,12 +535,16 @@ ifeq (,$(filter-out i386 x386 x86 x86_64 aarch64,$(CPU_ARCH))) + # All intel architectures get the 64 bit version + # With custom uint128 if necessary (faster than generic 32 bit version). + ECL_SRCS += curve25519_64.c +- VERIFIED_SRCS += Hacl_Curve25519.c FStar.c ++ VERIFIED_SRCS += Hacl_Curve25519.c else # All non intel architectures get the generic 32 bit implementation (slow!) ECL_SRCS += curve25519_32.c -+ifndef NSS_DISABLE_CHACHAPOLY -+ VERIFIED_SRCS += FStar.c -+endif endif ++ifndef HAVE_INT128_SUPPORT ++ VERIFIED_SRCS += FStar.c ++endif ++ ####################################################################### + # (5) Execute "global" rules. (OPTIONAL) # + ####################################################################### +diff --git lib/freebl/freebl.gyp lib/freebl/freebl.gyp +index 3760102ad8..004807483e 100644 +--- lib/freebl/freebl.gyp ++++ lib/freebl/freebl.gyp +@@ -277,18 +277,10 @@ + 'MP_IS_LITTLE_ENDIAN', + ], + }], +- [ 'OS!="win"', { +- 'conditions': [ +- [ 'target_arch=="x64" or target_arch=="arm64" or target_arch=="aarch64"', { +- 'defines': [ +- # The Makefile does version-tests on GCC, but we're not doing that here. +- 'HAVE_INT128_SUPPORT', +- ], +- }, { +- 'defines': [ +- 'KRML_NOUINT128', +- ], +- }], ++ [ 'have_int128_support==1', { ++ 'defines': [ ++ # The Makefile does version-tests on GCC, but we're not doing that here. ++ 'HAVE_INT128_SUPPORT', + ], + }, { + 'defines': [ +@@ -350,5 +342,18 @@ + }, + 'variables': { + 'module': 'nss', ++ 'conditions': [ ++ [ 'OS!="win"', { ++ 'conditions': [ ++ [ 'target_arch=="x64" or target_arch=="arm64" or target_arch=="aarch64"', { ++ 'have_int128_support%': 1, ++ }, { ++ 'have_int128_support%': 0, ++ }], ++ ], ++ }, { ++ 'have_int128_support%': 0, ++ }], ++ ], + } + } +diff --git lib/freebl/freebl_base.gypi lib/freebl/freebl_base.gypi +index 850c327c26..1372994f4c 100644 +--- lib/freebl/freebl_base.gypi ++++ lib/freebl/freebl_base.gypi +@@ -60,7 +60,6 @@ + 'shvfy.c', + 'sysrand.c', + 'tlsprfalg.c', +- 'verified/FStar.c', + ], + 'conditions': [ + [ 'OS=="linux" or OS=="android"', { +@@ -220,6 +219,9 @@ + }], + ], + }], ++ [ 'have_int128_support==0', { ++ 'sources': [ 'verified/FStar.c' ], ++ }], + ], + 'ldflags': [ + '-Wl,-Bsymbolic'