Wed Jun 5 19:06:07 2019 UTC ()
crypto++: updated to 8.2.0
Version 8.2.0
minor release, no recompile of programs required
expanded community input and support
56 unique contributors as of this release
use PowerPC unaligned loads and stores with Power8
add SKIPJACK test vectors
fix SHAKE-128 and SHAKE-256 compile
removed IS_NEON from Makefile
fix Aarch64 build on Fedora 29
fix missing GF2NT_233_Multiply_Reduce_CLMUL in FIPS DLL
add missing BLAKE2 constructors
fix missing BlockSize() in BLAKE2 classes
Version 8.1.0
minor release, no recompile of programs required
expanded community input and support
56 unique contributors as of this release
fix OS X PowerPC builds with Clang
add Microsoft ARM64 support
fix iPhone Simulator build due to missign symbols
add CRYPTOPP_BUGGY_SIMD_LOAD_AND_STORE
add carryless multiplies for NIST b233 and k233 curves
fix OpenMP build due to use of OpenMP 4 with down-level compilers
add SignStream and VerifyStream for ed25519 and large files
fix missing AlgorithmProvider in PanamaHash
add SHAKE-128 and SHAKE-256
fix AVX2 build due to _mm256_broadcastsi128_si256
add IETF ChaCha, XChaCha, ChaChaPoly1305 and XChaChaPoly1305
Version 8.0.0
major release, recompile of programs required
expanded community input and support
54 unique contributors as of this release
add x25519 key exchange and ed25519 signature scheme
add limited Asymmetric Key Package support from RFC 5958
add Power9 DARN random number generator support
add CHAM, HC-128, HC-256, Hight, LEA, Rabbit, Simeck
fix FixedSizeAllocatorWithCleanup may be unaligned on some platforms
cutover to GNU Make-based cpu feature tests
rename files with dashes to underscores
fix LegacyDecryptor and LegacyDecryptorWithMAC use wrong MAC
fix incorrect AES/CBC decryption on Windows
avoid Singleton<T> when possible, avoid std::call_once completely
fix SPARC alignment problems due to GetAlignmentOf<T>() on word64
add ARM AES asm implementation from Cryptogams
remove CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS support
(adam)
diff -r1.22 -r1.23 pkgsrc/security/crypto++/Makefile
diff -r1.7 -r1.8 pkgsrc/security/crypto++/PLIST
diff -r1.12 -r1.13 pkgsrc/security/crypto++/distinfo
diff -r1.1 -r1.2 pkgsrc/security/crypto++/patches/patch-GNUmakefile
--- pkgsrc/security/crypto++/Makefile 2017/08/01 14:59:04 1.22
+++ pkgsrc/security/crypto++/Makefile 2019/06/05 19:06:07 1.23
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2017/08/01 14:59:04 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2019/06/05 19:06:07 adam Exp $
-DISTNAME= cryptopp565
-PKGNAME= cryptopp-5.6.5
+DISTNAME= cryptopp820
+PKGNAME= cryptopp-8.2.0
CATEGORIES= security
MASTER_SITES= ${HOMEPAGE}
EXTRACT_SUFX= .zip
@@ -16,7 +16,6 @@
MAKE_FILE= GNUmakefile
WRKSRC= ${WRKDIR}
CPPFLAGS+= -DCRYPTOPP_DISABLE_ASM -fPIC
-BUILD_TARGET= all static shared
post-install:
${MV} ${DESTDIR}${PREFIX}/bin/cryptest.exe ${DESTDIR}${PREFIX}/bin/cryptest
--- pkgsrc/security/crypto++/PLIST 2017/05/18 21:20:23 1.7
+++ pkgsrc/security/crypto++/PLIST 2019/06/05 19:06:07 1.8
@@ -1,12 +1,16 @@
-@comment $NetBSD: PLIST,v 1.7 2017/05/18 21:20:23 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2019/06/05 19:06:07 adam Exp $
bin/cryptest
include/cryptopp/3way.h
include/cryptopp/adler32.h
+include/cryptopp/adv_simd.h
include/cryptopp/aes.h
+include/cryptopp/aes_armv4.h
include/cryptopp/algebra.h
include/cryptopp/algparam.h
include/cryptopp/arc4.h
include/cryptopp/argnames.h
+include/cryptopp/aria.h
+include/cryptopp/arm_simd.h
include/cryptopp/asn.h
include/cryptopp/authenc.h
include/cryptopp/base32.h
@@ -21,23 +25,32 @@
include/cryptopp/cbcmac.h
include/cryptopp/ccm.h
include/cryptopp/chacha.h
+include/cryptopp/chachapoly.h
+include/cryptopp/cham.h
include/cryptopp/channels.h
include/cryptopp/cmac.h
include/cryptopp/config.h
include/cryptopp/cpu.h
include/cryptopp/crc.h
include/cryptopp/cryptlib.h
+include/cryptopp/darn.h
include/cryptopp/default.h
include/cryptopp/des.h
include/cryptopp/dh.h
include/cryptopp/dh2.h
include/cryptopp/dll.h
include/cryptopp/dmac.h
+include/cryptopp/donna.h
+include/cryptopp/donna_32.h
+include/cryptopp/donna_64.h
+include/cryptopp/donna_sse.h
+include/cryptopp/drbg.h
include/cryptopp/dsa.h
include/cryptopp/eax.h
include/cryptopp/ec2n.h
include/cryptopp/eccrypto.h
include/cryptopp/ecp.h
+include/cryptopp/ecpoint.h
include/cryptopp/elgamal.h
include/cryptopp/emsa2.h
include/cryptopp/eprecomp.h
@@ -55,7 +68,11 @@
include/cryptopp/gfpcrypt.h
include/cryptopp/gost.h
include/cryptopp/gzip.h
+include/cryptopp/hashfwd.h
+include/cryptopp/hc128.h
+include/cryptopp/hc256.h
include/cryptopp/hex.h
+include/cryptopp/hight.h
include/cryptopp/hkdf.h
include/cryptopp/hmac.h
include/cryptopp/hmqv.h
@@ -64,7 +81,9 @@
include/cryptopp/idea.h
include/cryptopp/integer.h
include/cryptopp/iterhash.h
+include/cryptopp/kalyna.h
include/cryptopp/keccak.h
+include/cryptopp/lea.h
include/cryptopp/lubyrack.h
include/cryptopp/luc.h
include/cryptopp/mars.h
@@ -79,21 +98,25 @@
include/cryptopp/modexppc.h
include/cryptopp/mqueue.h
include/cryptopp/mqv.h
+include/cryptopp/naclite.h
include/cryptopp/nbtheory.h
-include/cryptopp/network.h
include/cryptopp/nr.h
include/cryptopp/oaep.h
include/cryptopp/oids.h
include/cryptopp/osrng.h
include/cryptopp/ossig.h
+include/cryptopp/padlkrng.h
include/cryptopp/panama.h
include/cryptopp/pch.h
include/cryptopp/pkcspad.h
+include/cryptopp/poly1305.h
include/cryptopp/polynomi.h
+include/cryptopp/ppc_simd.h
include/cryptopp/pssr.h
include/cryptopp/pubkey.h
include/cryptopp/pwdbased.h
include/cryptopp/queue.h
+include/cryptopp/rabbit.h
include/cryptopp/rabin.h
include/cryptopp/randpool.h
include/cryptopp/rc2.h
@@ -108,6 +131,7 @@
include/cryptopp/rw.h
include/cryptopp/safer.h
include/cryptopp/salsa.h
+include/cryptopp/scrypt.h
include/cryptopp/seal.h
include/cryptopp/secblock.h
include/cryptopp/seckey.h
@@ -117,29 +141,35 @@
include/cryptopp/sha.h
include/cryptopp/sha3.h
include/cryptopp/shacal2.h
+include/cryptopp/shake.h
include/cryptopp/shark.h
+include/cryptopp/simeck.h
+include/cryptopp/simon.h
include/cryptopp/simple.h
+include/cryptopp/siphash.h
include/cryptopp/skipjack.h
+include/cryptopp/sm3.h
+include/cryptopp/sm4.h
include/cryptopp/smartptr.h
-include/cryptopp/socketft.h
include/cryptopp/sosemanuk.h
+include/cryptopp/speck.h
include/cryptopp/square.h
include/cryptopp/stdcpp.h
include/cryptopp/strciphr.h
include/cryptopp/tea.h
+include/cryptopp/threefish.h
include/cryptopp/tiger.h
include/cryptopp/trap.h
-include/cryptopp/trdlocal.h
include/cryptopp/trunhash.h
include/cryptopp/ttmac.h
+include/cryptopp/tweetnacl.h
include/cryptopp/twofish.h
include/cryptopp/validate.h
include/cryptopp/vmac.h
-include/cryptopp/wait.h
include/cryptopp/wake.h
include/cryptopp/whrlpool.h
-include/cryptopp/winpipes.h
include/cryptopp/words.h
+include/cryptopp/xed25519.h
include/cryptopp/xtr.h
include/cryptopp/xtrcrypt.h
include/cryptopp/zdeflate.h
@@ -149,6 +179,7 @@
lib/libcryptopp.so
share/cryptopp/TestData/3desval.dat
share/cryptopp/TestData/3wayval.dat
+share/cryptopp/TestData/aria.dat
share/cryptopp/TestData/camellia.dat
share/cryptopp/TestData/cast128v.dat
share/cryptopp/TestData/cast256v.dat
@@ -160,6 +191,9 @@
share/cryptopp/TestData/dsa1024.dat
share/cryptopp/TestData/dsa1024b.dat
share/cryptopp/TestData/dsa512.dat
+share/cryptopp/TestData/ed25519.dat
+share/cryptopp/TestData/ed25519v0.dat
+share/cryptopp/TestData/ed25519v1.dat
share/cryptopp/TestData/elgc1024.dat
share/cryptopp/TestData/esig1023.dat
share/cryptopp/TestData/esig1536.dat
@@ -195,6 +229,7 @@
share/cryptopp/TestData/rijndael.dat
share/cryptopp/TestData/rsa1024.dat
share/cryptopp/TestData/rsa2048.dat
+share/cryptopp/TestData/rsa2048a.dat
share/cryptopp/TestData/rsa400pb.dat
share/cryptopp/TestData/rsa400pv.dat
share/cryptopp/TestData/rsa512a.dat
@@ -208,17 +243,25 @@
share/cryptopp/TestData/squareva.dat
share/cryptopp/TestData/twofishv.dat
share/cryptopp/TestData/usage.dat
+share/cryptopp/TestData/x25519.dat
+share/cryptopp/TestData/x25519v0.dat
+share/cryptopp/TestData/x25519v1.dat
share/cryptopp/TestData/xtrdh171.dat
share/cryptopp/TestData/xtrdh342.dat
share/cryptopp/TestVectors/Readme.txt
+share/cryptopp/TestVectors/aead.txt
share/cryptopp/TestVectors/aes.txt
share/cryptopp/TestVectors/all.txt
+share/cryptopp/TestVectors/aria.txt
share/cryptopp/TestVectors/blake2.txt
share/cryptopp/TestVectors/blake2b.txt
share/cryptopp/TestVectors/blake2s.txt
share/cryptopp/TestVectors/camellia.txt
share/cryptopp/TestVectors/ccm.txt
share/cryptopp/TestVectors/chacha.txt
+share/cryptopp/TestVectors/chacha20poly1305.txt
+share/cryptopp/TestVectors/chacha_tls.txt
+share/cryptopp/TestVectors/cham.txt
share/cryptopp/TestVectors/cmac.txt
share/cryptopp/TestVectors/dlies.txt
share/cryptopp/TestVectors/dsa.txt
@@ -227,12 +270,20 @@
share/cryptopp/TestVectors/eax.txt
share/cryptopp/TestVectors/esign.txt
share/cryptopp/TestVectors/gcm.txt
+share/cryptopp/TestVectors/hc128.txt
+share/cryptopp/TestVectors/hc256.txt
+share/cryptopp/TestVectors/hight.txt
share/cryptopp/TestVectors/hkdf.txt
share/cryptopp/TestVectors/hmac.txt
+share/cryptopp/TestVectors/kalyna.txt
share/cryptopp/TestVectors/keccak.txt
+share/cryptopp/TestVectors/lea.txt
share/cryptopp/TestVectors/mars.txt
share/cryptopp/TestVectors/nr.txt
share/cryptopp/TestVectors/panama.txt
+share/cryptopp/TestVectors/poly1305_tls.txt
+share/cryptopp/TestVectors/poly1305aes.txt
+share/cryptopp/TestVectors/rabbit.txt
share/cryptopp/TestVectors/rsa_oaep.txt
share/cryptopp/TestVectors/rsa_pkcs1_1_5.txt
share/cryptopp/TestVectors/rsa_pss.txt
@@ -241,15 +292,34 @@
share/cryptopp/TestVectors/seal.txt
share/cryptopp/TestVectors/seed.txt
share/cryptopp/TestVectors/sha.txt
+share/cryptopp/TestVectors/sha1_160_fips_180.txt
+share/cryptopp/TestVectors/sha1_fips_180.txt
+share/cryptopp/TestVectors/sha2.txt
+share/cryptopp/TestVectors/sha2_224_fips_180.txt
+share/cryptopp/TestVectors/sha2_256_fips_180.txt
+share/cryptopp/TestVectors/sha2_384_fips_180.txt
+share/cryptopp/TestVectors/sha2_512_fips_180.txt
+share/cryptopp/TestVectors/sha2_fips_180.txt
+share/cryptopp/TestVectors/sha3.txt
share/cryptopp/TestVectors/sha3_224_fips_202.txt
share/cryptopp/TestVectors/sha3_256_fips_202.txt
share/cryptopp/TestVectors/sha3_384_fips_202.txt
share/cryptopp/TestVectors/sha3_512_fips_202.txt
share/cryptopp/TestVectors/sha3_fips_202.txt
share/cryptopp/TestVectors/shacal2.txt
+share/cryptopp/TestVectors/shake.txt
+share/cryptopp/TestVectors/simeck.txt
+share/cryptopp/TestVectors/simon.txt
+share/cryptopp/TestVectors/siphash.txt
+share/cryptopp/TestVectors/skipjack.txt
+share/cryptopp/TestVectors/sm3.txt
+share/cryptopp/TestVectors/sm4.txt
share/cryptopp/TestVectors/sosemanuk.txt
+share/cryptopp/TestVectors/speck.txt
share/cryptopp/TestVectors/tea.txt
+share/cryptopp/TestVectors/threefish.txt
share/cryptopp/TestVectors/ttmac.txt
share/cryptopp/TestVectors/vmac.txt
share/cryptopp/TestVectors/wake.txt
share/cryptopp/TestVectors/whrlpool.txt
+share/cryptopp/TestVectors/xchacha.txt
--- pkgsrc/security/crypto++/distinfo 2017/05/18 21:20:23 1.12
+++ pkgsrc/security/crypto++/distinfo 2019/06/05 19:06:07 1.13
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.12 2017/05/18 21:20:23 adam Exp $
+$NetBSD: distinfo,v 1.13 2019/06/05 19:06:07 adam Exp $
-SHA1 (cryptopp565.zip) = a74f207a315b6a133af9640a45bde9d6e378af4d
+SHA1 (cryptopp820.zip) = b042d2f0c93410abdec7c12bcd92787d019f8da1
-RMD160 (cryptopp565.zip) = 4c13bb99dd205d54598527386e88b0dd436fc524
+RMD160 (cryptopp820.zip) = cdb5f1b9152cfccc35c5cca3027437e60cf63dea
-SHA512 (cryptopp565.zip) = f13718d02ca69b0129aaf9e767c9d2e0333aa7538355f9c63d9eaf1ff369062084a18dc01489439ebf37797b3ea81b01beb072057d47ec962bfb824ddc72abc7
+SHA512 (cryptopp820.zip) = 753513a4ec8dd0fff2f551853ce6bd265d82219c28b033565b565b5e567fbee17adb419f4cde58a97e62b7d6533f4099aa4996cd0ba4775c6a2e7ae63a879da5
-Size (cryptopp565.zip) = 4220843 bytes
+Size (cryptopp820.zip) = 8859815 bytes
-SHA1 (patch-GNUmakefile) = a83b221092685721c30ba00d152e11a73cf20f1e
+SHA1 (patch-GNUmakefile) = 9a3a0d09a458730c6c9a5d9300c96417261173bc
--- pkgsrc/security/crypto++/patches/patch-GNUmakefile 2017/05/18 21:20:23 1.1
+++ pkgsrc/security/crypto++/patches/patch-GNUmakefile 2019/06/05 19:06:07 1.2
@@ -1,37 +1,59 @@
-$NetBSD: patch-GNUmakefile,v 1.1 2017/05/18 21:20:23 adam Exp $
+$NetBSD: patch-GNUmakefile,v 1.2 2019/06/05 19:06:07 adam Exp $
Avoid -march=native compiler flag.
On Darwin, use absolute path to avoid conflict with devel/libtool.
+Fix dylib name.
---- GNUmakefile.orig 2016-10-10 23:49:54.000000000 +0000
+--- GNUmakefile.orig 2019-04-28 23:36:50.000000000 +0000
+++ GNUmakefile
-@@ -125,12 +125,6 @@ ifeq ($(IS_X86)$(IS_X32)$(IS_CYGWIN)$(IS
- endif
+@@ -140,7 +140,7 @@ endif
+ ifneq ($(IS_DARWIN),0)
+ CXX ?= c++
+ # CXXFLAGS += -stdlib=libc++
+- AR = libtool
++ AR = /usr/bin/libtool
+ ARFLAGS = -static -o
endif
--# Guard use of -march=native
--ifeq ($(GCC42_OR_LATER)$(IS_NETBSD),10)
-- CXXFLAGS += -march=native
--else ifneq ($(CLANG_COMPILER)$(INTEL_COMPILER),00)
-- CXXFLAGS += -march=native
--else
- # GCC 3.3 and "unknown option -march="
- # Ubuntu GCC 4.1 compiler crash with -march=native
- # NetBSD GCC 4.8 compiler and "bad value (native) for -march= switch"
-@@ -140,7 +134,6 @@ else
- else ifeq ($(SUN_COMPILER)$(IS_X86),01)
- CXXFLAGS += -m32
- endif # X86/X32/X64
--endif
+@@ -846,32 +846,6 @@ ifeq ($(findstring no-asm,$(MAKECMDGOALS
+ endif # CXXFLAGS
+ endif # No ASM
- # Aligned access required for -O3 and above due to vectorization
- UNALIGNED_ACCESS := $(shell $(EGREP) -c "^[[:space:]]*//[[:space:]]*\#[[:space:]]*define[[:space:]]*CRYPTOPP_NO_UNALIGNED_DATA_ACCESS" config.h)
-@@ -271,7 +264,7 @@ endif # OpenMP
- endif # IS_LINUX
+-# Native build testing. Issue 'make native'.
+-ifeq ($(findstring native,$(MAKECMDGOALS)),native)
+- NATIVE_OPT =
+-
+- # Try GCC and compatibles first
+- TPROG = TestPrograms/test_cxx.cxx
+- TOPT = -march=native
+- HAVE_OPT = $(shell $(CXX) $(TCXXFLAGS) $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | tr ' ' '\n' | wc -l)
+- ifeq ($(strip $(HAVE_OPT)),0)
+- NATIVE_OPT = -march=native
+- endif # NATIVE_OPT
+-
+- # Try SunCC next
+- ifeq ($(NATIVE_OPT),)
+- TOPT = -native
+- HAVE_OPT = $(shell $(CXX) $(TCXXFLAGS) $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | tr ' ' '\n' | wc -l)
+- ifeq ($(strip $(HAVE_OPT)),0)
+- NATIVE_OPT = -native
+- endif # NATIVE_OPT
+- endif
+-
+- ifneq ($(NATIVE_OPT),)
+- CXXFLAGS += $(NATIVE_OPT)
+- endif
+-
+-endif # Native
- ifneq ($(IS_DARWIN),0)
+ # Undefined Behavior Sanitizer (UBsan) testing. Issue 'make ubsan'.
--AR = libtool
+ ifeq ($(findstring ubsan,$(MAKECMDGOALS)),ubsan)
-+AR = /usr/bin/libtool
+@@ -1248,7 +1222,7 @@ ifneq ($(wildcard libcryptopp.dylib),)
- ARFLAGS = -static -o
+ @-$(MKDIR) $(DESTDIR)$(LIBDIR)
- CXX ?= c++
+ $(CP) libcryptopp.dylib $(DESTDIR)$(LIBDIR)
- ifeq ($(IS_GCC_29),1)
+ $(CHMOD) 0755 $(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)