From b4b9bf0a4d61dbf563eb013a8ef32561dc322f68 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Tue, 4 Dec 2018 19:09:04 +0100 Subject: [PATCH] Update crypto++ to version 7.0.0 --- lib/mk/cryptopp.mk | 8 +++++--- ports/cryptopp.hash | 2 +- ports/cryptopp.port | 6 +++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/mk/cryptopp.mk b/lib/mk/cryptopp.mk index 076fdfc..2af80e8 100644 --- a/lib/mk/cryptopp.mk +++ b/lib/mk/cryptopp.mk @@ -2,11 +2,13 @@ CRYPTOPP_SRC_DIR = $(call select_from_ports,cryptopp)/src/lib/cryptopp LIBS += stdcxx -CRYPTOPP_SRC_CC := $(notdir $(wildcard $(CRYPTOPP_SRC_DIR)/*.cpp)) +CRYPTOPP_FILTER := adhoc.cpp test.cpp bench1.cpp bench2.cpp validat0.cpp validat1.cpp validat2.cpp validat3.cpp validat4.cpp datatest.cpp regtest1.cpp regtest2.cpp regtest3.cpp dlltest.cpp fipsalgt.cpp tweetnacl.cpp simon-simd.cpp simon.cpp speck-simd.cpp speck.cpp -CRYPTOPP_FILTER = bench.cpp bench2.cpp test.cpp validat1.cpp +CRYPTOPP_SRC := $(notdir $(wildcard $(CRYPTOPP_SRC_DIR)/*.cpp)) -SRC_CC := $(filter-out $(CRYPTOPP_FILTER),$(CRYPTOPP_SRC_CC)) +SRC_CC += $(filter-out $(CRYPTOPP_FILTER),$(CRYPTOPP_SRC)) + +CXX_DEF += -DCRYPTOPP_DISABLE_SSSE3 CC_WARN += -Wno-delete-non-virtual-dtor diff --git a/ports/cryptopp.hash b/ports/cryptopp.hash index 0aab005..12f702c 100644 --- a/ports/cryptopp.hash +++ b/ports/cryptopp.hash @@ -1 +1 @@ -133d5abcafa233367e324f95618ead570d30b259 +b3cb6d2f0ef36bca79d5c93d2158119eee465b0b diff --git a/ports/cryptopp.port b/ports/cryptopp.port index cb0f955..73f5276 100644 --- a/ports/cryptopp.port +++ b/ports/cryptopp.port @@ -1,9 +1,9 @@ LICENSE := boost -VERSION := 5.6.3 +VERSION := 7.0 DOWNLOADS := cryptopp.archive -URL(cryptopp) := http://www.cryptopp.com/cryptopp563.zip -SHA(cryptopp) := 9390670a14170dd0f48a6b6b06f74269ef4b056d4718a1a329f6f6069dc957c9 +URL(cryptopp) := https://www.cryptopp.com/cryptopp700.zip +SHA(cryptopp) := a4bc939910edd3d29fb819a6fc0dfdc293f686fa62326f61c56d72d0a366ceb0 DIR(cryptopp) := src/lib/cryptopp DIRS := include/cryptopp