MFH: r469336

security/nss: unbreak armv6 after r469333

cd FreeBSD11.1_OPT.OBJ ; sh 'nss/cmd/shlibsign/.'/sign.sh 'nss/cmd/shlibsign/../../../dist/FreeBSD11.1_OPT.OBJ' \
'nss/cmd/shlibsign/FreeBSD11.1_OPT.OBJ' FreeBSD \
'nss/cmd/shlibsign/../../../dist/FreeBSD11.1_OPT.OBJ/lib' 'nss/cmd/shlibsign/../../../dist/FreeBSD11.1_OPT.OBJ/lib/libsoftokn3.so'
nss/cmd/shlibsign/FreeBSD11.1_OPT.OBJ/shlibsign -v -i nss/cmd/shlibsign/../../../dist/FreeBSD11.1_OPT.OBJ/lib/libsoftokn3.so
C_Initialize failed: 0x00000030, CKR_DEVICE_ERROR
NSPR error code: -5977: Failure to load dynamic library
Initiailzing softoken failed: 0x00000030, CKR_DEVICE_ERROR
NSPR error code: -5977: Failure to load dynamic library
moduleSpec configdir='' certPrefix='' keyPrefix='' secmod='' flags=noCertDB, noModDB
gmake[3]: *** [Makefile:92: ../../../dist/FreeBSD11.1_OPT.OBJ/lib/libsoftokn3.chk] Error 1

Approved by:	ports-secteam blanket
This commit is contained in:
Jan Beich 2018-05-07 22:01:29 +00:00
parent ca0df0b832
commit b2ed969338
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/branches/2018Q2/; revision=469337

View File

@ -0,0 +1,14 @@
diff --git lib/freebl/Makefile lib/freebl/Makefile
index e6a94d35c4..0aecd2fbe7 100644
--- lib/freebl/Makefile
+++ lib/freebl/Makefile
@@ -539,6 +539,9 @@ ifeq (,$(filter-out i386 x386 x86 x86_64 aarch64,$(CPU_ARCH)))
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
#######################################################################