diff --git a/security/cryptopp/Makefile b/security/cryptopp/Makefile index 489dc524d2b7..a3cb967767d7 100644 --- a/security/cryptopp/Makefile +++ b/security/cryptopp/Makefile @@ -1,115 +1,114 @@ # Created by: George Reid PORTNAME= cryptopp -PORTVERSION= 8.5.0 -PORTREVISION= 1 +PORTVERSION= 8.6.0 CATEGORIES= security MASTER_SITES= http://www.cryptopp.com/ DISTNAME= cryptopp${PORTVERSION:S/.//g} MAINTAINER= jhale@FreeBSD.org COMMENT= Free C++ class library of Cryptographic Primitives LICENSE= BSL LICENSE_FILE= ${WRKSRC}/License.txt USES= cpe compiler:c++11-lang gmake zip USE_LDCONFIG= yes CPE_PRODUCT= crypto++ CPE_VENDOR= cryptopp EXTRACT_BEFORE_ARGS= -aq NO_WRKSUBDIR= yes CXXFLAGS+= -Wno-deprecated-declarations -fPIC MAKEFILE= GNUmakefile ALL_TARGET= static shared libcryptopp.pc SOVERSION= ${PORTVERSION:R:R} PLIST_SUB+= SOVERSION=${SOVERSION} \ PORTVERSION=${PORTVERSION} OPTIONS_DEFINE= DEBUG DOCS FULL_DEBUG TOOLS OPTIONS_DEFINE_amd64= SIMD OPTIONS_DEFINE_i386= SIMD OPTIONS_DEFINE_powerpc= SIMD OPTIONS_DEFINE_powerpc64= SIMD OPTIONS_DEFINE_powerpc64le= SIMD OPTIONS_DEFAULT= TOOLS OPTIONS_DEFAULT_powerpc= SIMD OPTIONS_DEFAULT_powerpc64= SIMD OPTIONS_DEFAULT_powerpc64le= SIMD OPTIONS_SUB= yes # Always compile with -DNDEBUG for release. Otherwise, sensitive # information could be accessed if an assert triggers. # See ${WRKSRC}/Readme.txt for more details. FULL_DEBUG_DESC= Build with full debugging support (SECURITY RISK!!!) FULL_DEBUG_CXXFLAGS= -DCRYPTOPP_DEBUG FULL_DEBUG_CXXFLAGS_OFF=-DNDEBUG FULL_DEBUG_IMPLIES= DEBUG # Disable this option to run the regression tests. TOOLS_DESC= Install encryption/decryption tools TOOLS_MAKE_ENV= CRYPTOPP_DATA_DIR=${DATADIR}/ TOOLS_ALL_TARGET= cryptest.exe TOOLS_TEST_TARGET_OFF= test .include .if ${PORT_OPTIONS:MSIMD} . if ${ARCH} == i386 || ${ARCH} == amd64 . if !${MACHINE_CPU:Msse2} CXXFLAGS+= -DCRYPTOPP_DISABLE_ASM -DCRYPTOPP_DISABLE_SSE2 . endif . if !${MACHINE_CPU:Mssse3} CXXFLAGS+= -DCRYPTOPP_DISABLE_SSSE3 . endif . if !${MACHINE_CPU:Msse41} CXXFLAGS+= -DCRYPTOPP_DISABLE_SSE4 . endif . elif ${ARCH} == powerpc || ${ARCH:Mpowerpc64*} CXXFLAGS+= -DCRYPTOPP_ALTIVEC_AVAILABLE . endif .else CXXFLAGS+= -DCRYPTOPP_DISABLE_ASM -DCRYPTOPP_DISABLE_SSE2 \ -DCRYPTOPP_DISABLE_SSSE3 -DCRYPTOPP_DISABLE_SSE4 \ -DCRYPTOPP_DISABLE_ALTIVEC .endif pre-configure-FULL_DEBUG-on: @${ECHO_CMD} @${ECHO_CMD} "----------------------------- WARNING!!! ----------------------------" @${ECHO_CMD} "You have chosen to compile with full debugging support. If an assert" @${ECHO_CMD} "triggers, sensitive information could possibly be egressed to the" @${ECHO_CMD} "filesystem via a core dump. If this is not your intention, hit CTRL-C" @${ECHO_CMD} "now and run 'make config clean' and disable the FULL_DEBUG option." @${ECHO_CMD} "---------------------------------------------------------------------" @${ECHO_CMD} . if !(defined(PACKAGE_BUILDING) || defined(BATCH)) @sleep 10 . endif do-install: ${INSTALL_DATA} ${WRKSRC}/libcryptopp.a ${STAGEDIR}${PREFIX}/lib ${INSTALL_LIB} ${WRKSRC}/libcryptopp.so ${STAGEDIR}${PREFIX}/lib/libcryptopp.so.${PORTVERSION} ${LN} -fs libcryptopp.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libcryptopp.so.${SOVERSION} ${LN} -fs libcryptopp.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libcryptopp.so ${INSTALL_DATA} ${WRKSRC}/libcryptopp.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig @${MKDIR} ${STAGEDIR}${PREFIX}/include/cryptopp (for i in `${FIND} ${WRKSRC}/ -name '*.h' \ -and -not -name 'dll.h' \ -and -not -name 'resource.h'`; do \ ${INSTALL_DATA} $$i ${STAGEDIR}${PREFIX}/include/cryptopp; \ done) do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/Readme.txt ${STAGEDIR}${DOCSDIR}/README do-install-TOOLS-on: @${MKDIR} ${STAGEDIR}${DATADIR}/TestData ${INSTALL_PROGRAM} ${WRKSRC}/cryptest.exe ${STAGEDIR}${PREFIX}/bin/cryptest ${INSTALL_DATA} ${WRKSRC}/TestData/usage.dat ${STAGEDIR}${DATADIR}/TestData .include diff --git a/security/cryptopp/distinfo b/security/cryptopp/distinfo index c46f65cf67ac..136fac92348f 100644 --- a/security/cryptopp/distinfo +++ b/security/cryptopp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1615647859 -SHA256 (cryptopp850.zip) = 95fc50d59488ebf61a735cce2b2ec2c2561fc682077c7b496273d65a1ed93d9e -SIZE (cryptopp850.zip) = 9125575 +TIMESTAMP = 1645715486 +SHA256 (cryptopp860.zip) = 20aa413957d9c8ae353ee2f7747bd7ac392f933c60a53e3fd1e41cadbc48d193 +SIZE (cryptopp860.zip) = 9274149 diff --git a/security/cryptopp/files/patch-cpu.cpp b/security/cryptopp/files/patch-cpu.cpp deleted file mode 100644 index a8e71a174d54..000000000000 --- a/security/cryptopp/files/patch-cpu.cpp +++ /dev/null @@ -1,111 +0,0 @@ ---- cpu.cpp.orig 2021-03-08 03:42:24 UTC -+++ cpu.cpp -@@ -1172,6 +1172,11 @@ inline bool CPU_QueryAltivec() - unsigned int unused, arch; - GetAppleMachineInfo(unused, unused, arch); - return arch == AppleMachineInfo::PowerMac; -+#elif defined(__FreeBSD__) && defined(PPC_FEATURE_HAS_ALTIVEC) -+ unsigned long cpufeatures; -+ if (elf_aux_info(AT_HWCAP, &cpufeatures, sizeof(cpufeatures)) -+ return false; -+ else return cpufeatures & PPC_FEATURE_HAS_ALTIVEC; - #endif - return false; - } -@@ -1185,6 +1190,12 @@ inline bool CPU_QueryPower7() - #elif defined(_AIX) - if (__power_7_andup() != 0) - return true; -+ -+#elif defined(__FreeBSD__) && defined(PPC_FEATURE_ARCH_2_06) -+ unsigned long cpufeatures; -+ if (elf_aux_info(AT_HWCAP, &cpufeatures, sizeof(cpufeatures)) -+ return false; -+ else return cpufeatures & PPC_FEATURE_ARCH_2_06; - #endif - return false; - } -@@ -1198,6 +1209,11 @@ inline bool CPU_QueryPower8() - #elif defined(_AIX) - if (__power_8_andup() != 0) - return true; -+#elif defined(__FreeBSD__) && defined(PPC_FEATURE2_ARCH_2_07) -+ unsigned long cpufeatures; -+ if (elf_aux_info(AT_HWCAP, &cpufeatures, sizeof(cpufeatures)) -+ return false; -+ else return cpufeatures & PPC_FEATURE2_ARCH_2_07; - #endif - return false; - } -@@ -1211,6 +1227,11 @@ inline bool CPU_QueryPower9() - #elif defined(_AIX) - if (__power_9_andup() != 0) - return true; -+#elif defined(__FreeBSD__) && defined(PPC_FEATURE2_ARCH_3_00) -+ unsigned long cpufeatures; -+ if (elf_aux_info(AT_HWCAP2, &cpufeatures, sizeof(cpufeatures)) -+ return false; -+ else return cpufeatures & PPC_FEATURE_ARCH2_3_00; - #endif - return false; - } -@@ -1225,6 +1246,11 @@ inline bool CPU_QueryAES() - #elif defined(_AIX) - if (__power_8_andup() != 0) - return true; -+#elif defined(__FreeBSD__) && defined(PPC_FEATURE2_HAS_VEC_CRYPTO) -+ unsigned long cpufeatures; -+ if (elf_aux_info(AT_HWCAP2, &cpufeatures, sizeof(cpufeatures)) -+ return false; -+ else return cpufeatures & PPC_FEATURE2_HAS_VEC_CRYPTO; - #endif - return false; - } -@@ -1239,6 +1265,11 @@ inline bool CPU_QueryPMULL() - #elif defined(_AIX) - if (__power_8_andup() != 0) - return true; -+#elif defined(__FreeBSD__) && defined(PPC_FEATURE2_HAS_VEC_CRYPTO) -+ unsigned long cpufeatures; -+ if (elf_aux_info(AT_HWCAP2, &cpufeatures, sizeof(cpufeatures)) -+ return false; -+ else return cpufeatures & PPC_FEATURE2_HAS_VEC_CRYPTO; - #endif - return false; - } -@@ -1253,6 +1284,11 @@ inline bool CPU_QuerySHA256() - #elif defined(_AIX) - if (__power_8_andup() != 0) - return true; -+#elif defined(__FreeBSD__) && defined(PPC_FEATURE2_HAS_VEC_CRYPTO) -+ unsigned long cpufeatures; -+ if (elf_aux_info(AT_HWCAP2, &cpufeatures, sizeof(cpufeatures)) -+ return false; -+ else return cpufeatures & PPC_FEATURE2_HAS_VEC_CRYPTO; - #endif - return false; - } -@@ -1266,6 +1302,11 @@ inline bool CPU_QuerySHA512() - #elif defined(_AIX) - if (__power_8_andup() != 0) - return true; -+#elif defined(__FreeBSD__) && defined(PPC_FEATURE2_HAS_VEC_CRYPTO) -+ unsigned long cpufeatures; -+ if (elf_aux_info(AT_HWCAP2, &cpufeatures, sizeof(cpufeatures)) -+ return false; -+ else return cpufeatures & PPC_FEATURE2_HAS_VEC_CRYPTO; - #endif - return false; - } -@@ -1280,6 +1321,11 @@ inline bool CPU_QueryDARN() - #elif defined(_AIX) - if (__power_9_andup() != 0) - return true; -+#elif defined(__FreeBSD__) && defined(PPC_FEATURE2_ARCH_3_00) -+ unsigned long cpufeatures; -+ if (elf_aux_info(AT_HWCAP2, &cpufeatures, sizeof(cpufeatures)) -+ return false; -+ else return cpufeatures & PPC_FEATURE2_ARCH_3_00; - #endif - return false; - } diff --git a/security/cryptopp/pkg-plist b/security/cryptopp/pkg-plist index 846df409789b..9b43a14d50b2 100644 --- a/security/cryptopp/pkg-plist +++ b/security/cryptopp/pkg-plist @@ -1,197 +1,198 @@ %%TOOLS%%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/allocate.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 include/cryptopp/base64.h include/cryptopp/basecode.h include/cryptopp/bench.h include/cryptopp/blake2.h include/cryptopp/blowfish.h include/cryptopp/blumshub.h include/cryptopp/camellia.h include/cryptopp/cast.h 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/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 include/cryptopp/darn.h include/cryptopp/default.h include/cryptopp/des.h include/cryptopp/dh.h include/cryptopp/dh2.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 include/cryptopp/esign.h include/cryptopp/factory.h include/cryptopp/fhmqv.h include/cryptopp/files.h include/cryptopp/filters.h include/cryptopp/fips140.h include/cryptopp/fltrimpl.h include/cryptopp/gcm.h include/cryptopp/gf256.h include/cryptopp/gf2_32.h include/cryptopp/gf2n.h 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 include/cryptopp/hrtimer.h include/cryptopp/ida.h 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/lsh.h include/cryptopp/lubyrack.h include/cryptopp/luc.h include/cryptopp/mars.h include/cryptopp/md2.h include/cryptopp/md4.h include/cryptopp/md5.h include/cryptopp/mdc.h include/cryptopp/mersenne.h include/cryptopp/misc.h include/cryptopp/modarith.h include/cryptopp/modes.h include/cryptopp/modexppc.h include/cryptopp/mqueue.h include/cryptopp/mqv.h include/cryptopp/naclite.h include/cryptopp/nbtheory.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 include/cryptopp/rc5.h include/cryptopp/rc6.h include/cryptopp/rdrand.h include/cryptopp/rijndael.h include/cryptopp/ripemd.h include/cryptopp/rng.h include/cryptopp/rsa.h 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/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 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/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/trunhash.h include/cryptopp/ttmac.h include/cryptopp/tweetnacl.h include/cryptopp/twofish.h include/cryptopp/validate.h include/cryptopp/vmac.h include/cryptopp/wake.h include/cryptopp/whrlpool.h 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.%%SOVERSION%% lib/libcryptopp.so.%%PORTVERSION%% libdata/pkgconfig/libcryptopp.pc %%TOOLS%%%%DATADIR%%/TestData/usage.dat %%PORTDOCS%%%%DOCSDIR%%/README