Received: by mail.netbsd.org (Postfix, from userid 605) id EBCA484E5E; Sun, 2 Oct 2022 16:20:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 27BA684CD9 for ; Sun, 2 Oct 2022 16:20:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id XuENcAaIU0iH for ; Sun, 2 Oct 2022 16:20:26 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 8BD6684CBC for ; Sun, 2 Oct 2022 16:20:26 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 84E04FA90; Sun, 2 Oct 2022 16:20:26 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1664727626126550" MIME-Version: 1.0 Date: Sun, 2 Oct 2022 16:20:26 +0000 From: "Niclas Rosenvik" Subject: CVS commit: pkgsrc/security/crypto++ To: pkgsrc-changes@NetBSD.org Reply-To: nros@netbsd.org X-Mailer: log_accum Message-Id: <20221002162026.84E04FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1664727626126550 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nros Date: Sun Oct 2 16:20:26 UTC 2022 Modified Files: pkgsrc/security/crypto++: Makefile PLIST buildlink3.mk distinfo pkgsrc/security/crypto++/patches: patch-GNUmakefile Log Message: Update security/crypto++ to version 8.7.0 Changes according to Changelog: 8.7.0 - August 7, 2022 - minor release, recompile of programs required - expanded community input and support * 81 unique contributors as of this release - fix RSA key generation for small moduli - fix AES-GCM with AESNI but without CLMUL - fix Clang warning with C++17 - fix MinGW builds due to use of O_NOFOLLOW - rework CFB_CipherTemplate::ProcessData and AdditiveCipherTemplate::ProcessData * restored performance and avoided performance penalty of a temp buffer - fix undersized SecBlock buffer in Integer bit operations - work around several GCC 11 & 12 problems 8.6.0 - September 21, 2021 - minor release, recompile of programs required - expanded community input and support * 74 unique contributors as of this release - fix ElGamal encryption - fix ChaCha20 AVX2 implementation - add octal and decimal literal prefix parsing to Integer - add missing overload in ed25519Signer and ed25519Verifier - make SHA-NI independent of AVX and AVX2 - fix OldRandomPool GenerateWord32 - use CPPFLAGS during feature testing - fix compile on CentOS 5 - fix compile on FreeBSD - fix feature testing on ARM A-32 and Aarch64 - enable inline ASM for CRC and PMULL on Apple M1 - fix Intel oneAPI compile - rename test files with *.cpp extension - fix GCC compile error due to missing _mm256_set_m128i - add LSH-256 and LSH-512 hash functions - add ECIES_P1363 for backwards compatibility - fix AdditiveCipherTemplate ProcessData - remove CRYPTOPP_NO_CXX11 define - add -fno-common for Darwin builds - update documentation 8.5.0 - March 7, 2021 - minor release, no recompile of programs required - expanded community input and support * 70 unique contributors as of this release - port to Apple M1 hardware 8.4.0 - January 2, 2021 - minor release, recompile of programs required - expanded community input and support * 67 unique contributors as of this release - fix SIGILL on POWER8 when compiling with GCC 10 - fix potential out-of-bounds write in FixedSizeAllocatorWithCleanup - fix compile on AIX POWER7 with IBM XLC 12.01 - fix compile on Solaris with SunCC 12.6 - revert changes for constant-time elliptic curve algorithms - fix makefile clean and distclean recipes 8.3.0 - December 20, 2020 - minor release, recompile of programs required - expanded community input and support * 66 unique contributors as of this release - fix use of macro CRYPTOPP_ALIGN_DATA - fix potential out-of-bounds read in ECDSA - fix std::bad_alloc when using ByteQueue in pipeline - fix missing CRYPTOPP_CXX17_EXCEPTIONS with Clang - fix potential out-of-bounds read in GCM mode - add configure.sh when preprocessor macros fail - fix potential out-of-bounds read in SipHash - fix compile error on POWER9 due to vec_xl_be - fix K233 curve on POWER8 - add Cirrus CI testing - fix broken encryption for some 64-bit ciphers - fix Android cpu-features.c using C++ compiler - disable RDRAND and RDSEED for some AMD processors - fix BLAKE2 hash calculation using Salt and Personalization - refresh Android and iOS build scripts - add XTS mode - fix circular dependency between misc.h and secblock.h - add Certificate interface - fix recursion in AES::Encryption without AESNI - add missing OID for ElGamal encryption - fix missing override in KeyDerivationFunction-derived classes - fix RDSEED assemble under MSVC - fix elliptic curve timing leaks (CVE-2019-14318) - add link-library variable to Makefiles - fix SIZE_MAX definition in misc.h - add GetWord64 and PutWord64 to BufferedTransformation - use HKDF in AutoSeededX917RNG::Reseed - fix Asan finding in VMAC on i686 in inline asm - fix undeclared identifier _mm_roti_epi64 on Gentoo - fix ECIES and GetSymmetricKeyLength - fix possible divide by zero in PKCS5_PBKDF2_HMAC - refine ASN.1 encoders and decoders - disable BMI2 code paths in Integer class - fix use of CRYPTOPP_CLANG_VERSION - add NEON SHA1, SHA256 and SHA512 from Cryptogams - add ARM SHA1, SHA256 and SHA512 from Cryptogams - make config.h more autoconf friendly - handle Clang triplet armv8l-unknown-linux-gnueabihf - fix reference binding to misaligned address in xed25519 - clear asserts in TestDataNameValuePairs To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 pkgsrc/security/crypto++/Makefile cvs rdiff -u -r1.9 -r1.10 pkgsrc/security/crypto++/PLIST cvs rdiff -u -r1.13 -r1.14 pkgsrc/security/crypto++/buildlink3.mk cvs rdiff -u -r1.16 -r1.17 pkgsrc/security/crypto++/distinfo cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/crypto++/patches/patch-GNUmakefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1664727626126550 Content-Disposition: inline Content-Length: 10295 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/security/crypto++/Makefile diff -u pkgsrc/security/crypto++/Makefile:1.24 pkgsrc/security/crypto++/Makefile:1.25 --- pkgsrc/security/crypto++/Makefile:1.24 Sun Mar 22 17:52:51 2020 +++ pkgsrc/security/crypto++/Makefile Sun Oct 2 16:20:26 2022 @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.24 2020/03/22 17:52:51 tnn Exp $ +# $NetBSD: Makefile,v 1.25 2022/10/02 16:20:26 nros Exp $ -DISTNAME= cryptopp820 -PKGNAME= cryptopp-8.2.0 -PKGREVISION= 1 +DISTNAME= cryptopp870 +PKGNAME= cryptopp-8.7.0 CATEGORIES= security MASTER_SITES= ${HOMEPAGE} EXTRACT_SUFX= .zip Index: pkgsrc/security/crypto++/PLIST diff -u pkgsrc/security/crypto++/PLIST:1.9 pkgsrc/security/crypto++/PLIST:1.10 --- pkgsrc/security/crypto++/PLIST:1.9 Sun Mar 22 17:52:51 2020 +++ pkgsrc/security/crypto++/PLIST Sun Oct 2 16:20:26 2022 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2020/03/22 17:52:51 tnn Exp $ +@comment $NetBSD: PLIST,v 1.10 2022/10/02 16:20:26 nros Exp $ bin/cryptest include/cryptopp/3way.h include/cryptopp/adler32.h @@ -7,6 +7,7 @@ include/cryptopp/aes.h include/cryptopp/aes_armv4.h include/cryptopp/algebra.h include/cryptopp/algparam.h +include/cryptopp/allocate.h include/cryptopp/arc4.h include/cryptopp/argnames.h include/cryptopp/aria.h @@ -30,6 +31,16 @@ include/cryptopp/cham.h include/cryptopp/channels.h include/cryptopp/cmac.h include/cryptopp/config.h +include/cryptopp/config_align.h +include/cryptopp/config_asm.h +include/cryptopp/config_cpu.h +include/cryptopp/config_cxx.h +include/cryptopp/config_dll.h +include/cryptopp/config_int.h +include/cryptopp/config_misc.h +include/cryptopp/config_ns.h +include/cryptopp/config_os.h +include/cryptopp/config_ver.h include/cryptopp/cpu.h include/cryptopp/crc.h include/cryptopp/cryptlib.h @@ -84,6 +95,7 @@ include/cryptopp/iterhash.h include/cryptopp/kalyna.h include/cryptopp/keccak.h include/cryptopp/lea.h +include/cryptopp/lsh.h include/cryptopp/lubyrack.h include/cryptopp/luc.h include/cryptopp/mars.h @@ -134,12 +146,16 @@ include/cryptopp/salsa.h include/cryptopp/scrypt.h include/cryptopp/seal.h include/cryptopp/secblock.h +include/cryptopp/secblockfwd.h include/cryptopp/seckey.h include/cryptopp/seed.h include/cryptopp/serpent.h include/cryptopp/serpentp.h include/cryptopp/sha.h +include/cryptopp/sha1_armv4.h +include/cryptopp/sha256_armv4.h include/cryptopp/sha3.h +include/cryptopp/sha512_armv4.h include/cryptopp/shacal2.h include/cryptopp/shake.h include/cryptopp/shark.h @@ -172,13 +188,14 @@ include/cryptopp/words.h include/cryptopp/xed25519.h include/cryptopp/xtr.h include/cryptopp/xtrcrypt.h +include/cryptopp/xts.h include/cryptopp/zdeflate.h include/cryptopp/zinflate.h include/cryptopp/zlib.h lib/libcryptopp.a lib/libcryptopp.so lib/libcryptopp.so.8 -lib/libcryptopp.so.8.2 +lib/libcryptopp.so.8.7 share/cryptopp/TestData/3desval.dat share/cryptopp/TestData/3wayval.dat share/cryptopp/TestData/aria.dat @@ -193,6 +210,8 @@ share/cryptopp/TestData/dlie2048.dat share/cryptopp/TestData/dsa1024.dat share/cryptopp/TestData/dsa1024b.dat share/cryptopp/TestData/dsa512.dat +share/cryptopp/TestData/ecies_p160.dat +share/cryptopp/TestData/ecies_t163.dat share/cryptopp/TestData/ed25519.dat share/cryptopp/TestData/ed25519v0.dat share/cryptopp/TestData/ed25519v1.dat @@ -280,6 +299,10 @@ share/cryptopp/TestVectors/hmac.txt share/cryptopp/TestVectors/kalyna.txt share/cryptopp/TestVectors/keccak.txt share/cryptopp/TestVectors/lea.txt +share/cryptopp/TestVectors/lsh.txt +share/cryptopp/TestVectors/lsh256.txt +share/cryptopp/TestVectors/lsh512.txt +share/cryptopp/TestVectors/lsh512_256.txt share/cryptopp/TestVectors/mars.txt share/cryptopp/TestVectors/nr.txt share/cryptopp/TestVectors/panama.txt @@ -325,3 +348,4 @@ share/cryptopp/TestVectors/vmac.txt share/cryptopp/TestVectors/wake.txt share/cryptopp/TestVectors/whrlpool.txt share/cryptopp/TestVectors/xchacha.txt +share/cryptopp/TestVectors/xts.txt Index: pkgsrc/security/crypto++/buildlink3.mk diff -u pkgsrc/security/crypto++/buildlink3.mk:1.13 pkgsrc/security/crypto++/buildlink3.mk:1.14 --- pkgsrc/security/crypto++/buildlink3.mk:1.13 Thu May 18 21:20:23 2017 +++ pkgsrc/security/crypto++/buildlink3.mk Sun Oct 2 16:20:26 2022 @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2017/05/18 21:20:23 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2022/10/02 16:20:26 nros Exp $ BUILDLINK_TREE+= cryptopp @@ -6,7 +6,7 @@ BUILDLINK_TREE+= cryptopp CRYPTOPP_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.cryptopp+= cryptopp>=5.6.2 -BUILDLINK_ABI_DEPENDS.cryptopp+= cryptopp>=5.6.2 +BUILDLINK_ABI_DEPENDS.cryptopp+= cryptopp>=8.7.0 BUILDLINK_PKGSRCDIR.cryptopp?= ../../security/crypto++ .endif # CRYPTOPP_BUILDLINK3_MK Index: pkgsrc/security/crypto++/distinfo diff -u pkgsrc/security/crypto++/distinfo:1.16 pkgsrc/security/crypto++/distinfo:1.17 --- pkgsrc/security/crypto++/distinfo:1.16 Tue Oct 26 11:17:02 2021 +++ pkgsrc/security/crypto++/distinfo Sun Oct 2 16:20:26 2022 @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.16 2021/10/26 11:17:02 nia Exp $ +$NetBSD: distinfo,v 1.17 2022/10/02 16:20:26 nros Exp $ -BLAKE2s (cryptopp820.zip) = ef59ff24ff3b62b64cde97904243ac4958b001825c87d97ffdc8d19d908f7e6c -SHA512 (cryptopp820.zip) = 753513a4ec8dd0fff2f551853ce6bd265d82219c28b033565b565b5e567fbee17adb419f4cde58a97e62b7d6533f4099aa4996cd0ba4775c6a2e7ae63a879da5 -Size (cryptopp820.zip) = 8859815 bytes -SHA1 (patch-GNUmakefile) = 1f33abf6889a094cf249ca25bead7c533e9ba5aa +BLAKE2s (cryptopp870.zip) = fd5a150b2213d7cec9f559ff64b56daed853f49a64a83a42dbe3c95415171a6e +SHA512 (cryptopp870.zip) = cb85e10118b247be016b40ecf79cf3ff933a174e2e3d9280c426e57eb1ad936db42eafc19a30ec9bf5d7f08c335b1fee4dc149e1bda00d44d40d84d010f6af11 +Size (cryptopp870.zip) = 9277791 bytes +SHA1 (patch-GNUmakefile) = 7d9ed45142c7da319cdf76e01fc97cb064a282c6 Index: pkgsrc/security/crypto++/patches/patch-GNUmakefile diff -u pkgsrc/security/crypto++/patches/patch-GNUmakefile:1.3 pkgsrc/security/crypto++/patches/patch-GNUmakefile:1.4 --- pkgsrc/security/crypto++/patches/patch-GNUmakefile:1.3 Sun Mar 22 17:52:52 2020 +++ pkgsrc/security/crypto++/patches/patch-GNUmakefile Sun Oct 2 16:20:26 2022 @@ -1,21 +1,21 @@ -$NetBSD: patch-GNUmakefile,v 1.3 2020/03/22 17:52:52 tnn Exp $ +$NetBSD: patch-GNUmakefile,v 1.4 2022/10/02 16:20:26 nros Exp $ Avoid -march=native compiler flag. On Darwin, use absolute path to avoid conflict with devel/libtool. Fix dylib name. ---- GNUmakefile.orig 2019-04-28 23:36:50.000000000 +0000 +--- GNUmakefile.orig 2022-08-07 19:52:03.000000000 +0000 +++ GNUmakefile -@@ -27,7 +27,7 @@ CHMOD ?= chmod +@@ -33,7 +33,7 @@ CHMOD ?= chmod MKDIR ?= mkdir -p LN ?= ln -sf -LDCONF ?= /sbin/ldconfig -n +LDCONF ?= true - # Solaris provides a non-Posix grep at /usr/bin - ifneq ($(wildcard /usr/xpg4/bin/grep),) -@@ -83,7 +83,7 @@ endif + # Solaris provides a non-Posix sed and grep at /usr/bin + # Solaris 10 is missing AR in /usr/bin +@@ -87,7 +87,7 @@ INTEL_COMPILER := $(shell $(CXX) --versi # Enable shared object versioning for Linux and Solaris HAS_SOLIB_VERSION ?= 0 @@ -24,49 +24,50 @@ Fix dylib name. HAS_SOLIB_VERSION := 1 endif -@@ -140,7 +140,7 @@ endif - ifneq ($(IS_DARWIN),0) - CXX ?= c++ - # CXXFLAGS += -stdlib=libc++ -- AR = libtool -+ AR = /usr/bin/libtool - ARFLAGS = -static -o +@@ -969,42 +969,6 @@ ARFLAGS = -xar -o + RANLIB = true endif -@@ -846,32 +846,6 @@ ifeq ($(findstring no-asm,$(MAKECMDGOALS - endif # CXXFLAGS - endif # No ASM - -# Native build testing. Issue 'make native'. -ifeq ($(findstring native,$(MAKECMDGOALS)),native) - NATIVE_OPT = - - # Try GCC and compatibles first -- TPROG = TestPrograms/test_cxx.cxx +- TPROG = TestPrograms/test_cxx.cpp - TOPT = -march=native -- HAVE_OPT = $(shell $(CXX) $(TCXXFLAGS) $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | tr ' ' '\n' | wc -l) +- HAVE_OPT = $(shell $(TCOMMAND) 2>&1 | wc -w) - ifeq ($(strip $(HAVE_OPT)),0) - NATIVE_OPT = -march=native - endif # NATIVE_OPT - +- # And tune +- ifeq ($(NATIVE_OPT),) +- TOPT = -mtune=native +- HAVE_OPT = $(shell $(TCOMMAND) 2>&1 | wc -w) +- ifeq ($(strip $(HAVE_OPT)),0) +- NATIVE_OPT = -mtune=native +- endif # NATIVE_OPT +- endif +- - # Try SunCC next - ifeq ($(NATIVE_OPT),) - TOPT = -native -- HAVE_OPT = $(shell $(CXX) $(TCXXFLAGS) $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | tr ' ' '\n' | wc -l) +- HAVE_OPT = $(shell $(TCOMMAND) 2>&1 | wc -w) - ifeq ($(strip $(HAVE_OPT)),0) - NATIVE_OPT = -native - endif # NATIVE_OPT - endif - - ifneq ($(NATIVE_OPT),) -- CXXFLAGS += $(NATIVE_OPT) +- CRYPTOPP_CXXFLAGS += $(NATIVE_OPT) - endif - -endif # Native - +- # Undefined Behavior Sanitizer (UBsan) testing. Issue 'make ubsan'. ifeq ($(findstring ubsan,$(MAKECMDGOALS)),ubsan) -@@ -1006,9 +980,9 @@ ifeq ($(HAS_SOLIB_VERSION),1) + CRYPTOPP_CXXFLAGS := $(CRYPTOPP_CXXFLAGS:-g%=-g3) +@@ -1139,9 +1103,9 @@ ifeq ($(HAS_SOLIB_VERSION),1) # Different patchlevels and minors are compatible since 6.1 SOLIB_COMPAT_SUFFIX=.$(LIB_MAJOR) # Linux uses -Wl,-soname @@ -78,20 +79,12 @@ Fix dylib name. SOLIB_FLAGS=-Wl,-soname,libcryptopp.so$(SOLIB_COMPAT_SUFFIX) endif # Solaris uses -Wl,-h -@@ -1248,7 +1222,7 @@ ifneq ($(wildcard libcryptopp.dylib),) +@@ -1443,7 +1407,7 @@ ifneq ($(wildcard libcryptopp.dylib),) @-$(MKDIR) $(DESTDIR)$(LIBDIR) $(CP) libcryptopp.dylib $(DESTDIR)$(LIBDIR) - $(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.dylib + $(CHMOD) u=rwx,go=rx $(DESTDIR)$(LIBDIR)/libcryptopp.dylib - -install_name_tool -id $(DESTDIR)$(LIBDIR)/libcryptopp.dylib $(DESTDIR)$(LIBDIR)/libcryptopp.dylib + -install_name_tool -id $(LIBDIR)/libcryptopp.dylib $(DESTDIR)$(LIBDIR)/libcryptopp.dylib endif ifneq ($(wildcard libcryptopp.so$(SOLIB_VERSION_SUFFIX)),) @-$(MKDIR) $(DESTDIR)$(LIBDIR) -@@ -1256,6 +1230,7 @@ ifneq ($(wildcard libcryptopp.so$(SOLIB_ - $(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX) - ifeq ($(HAS_SOLIB_VERSION),1) - -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so -+ -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX) - $(LDCONF) $(DESTDIR)$(LIBDIR) - endif - endif --_----------=_1664727626126550--