commit 348ccf99076dbadf0099cc6f69866344ad1a5f38 Author: Danny Rawlins <monster.romster@gmail.com> Date: Thu Sep 22 08:54:40 2016 +1000 [notify]: crypto++: 5.6.3 -> 5.6.4 fixed CVE-2016-7420 (Info Disclosure due to assert) diff --git a/crypto++/.footprint b/crypto++/.footprint index e950c4e..dd2fc36 100644 --- a/crypto++/.footprint +++ b/crypto++/.footprint @@ -14,12 +14,14 @@ drwxr-xr-x root/root usr/include/cryptopp/ -rw-r--r-- root/root usr/include/cryptopp/base64.h -rw-r--r-- root/root usr/include/cryptopp/basecode.h -rw-r--r-- root/root usr/include/cryptopp/bench.h +-rw-r--r-- root/root usr/include/cryptopp/blake2.h -rw-r--r-- root/root usr/include/cryptopp/blowfish.h -rw-r--r-- root/root usr/include/cryptopp/blumshub.h -rw-r--r-- root/root usr/include/cryptopp/camellia.h -rw-r--r-- root/root usr/include/cryptopp/cast.h -rw-r--r-- root/root usr/include/cryptopp/cbcmac.h -rw-r--r-- root/root usr/include/cryptopp/ccm.h +-rw-r--r-- root/root usr/include/cryptopp/chacha.h -rw-r--r-- root/root usr/include/cryptopp/channels.h -rw-r--r-- root/root usr/include/cryptopp/cmac.h -rw-r--r-- root/root usr/include/cryptopp/config.h @@ -42,6 +44,7 @@ drwxr-xr-x root/root usr/include/cryptopp/ -rw-r--r-- root/root usr/include/cryptopp/eprecomp.h -rw-r--r-- root/root usr/include/cryptopp/esign.h -rw-r--r-- root/root usr/include/cryptopp/factory.h +-rw-r--r-- root/root usr/include/cryptopp/fhmqv.h -rw-r--r-- root/root usr/include/cryptopp/files.h -rw-r--r-- root/root usr/include/cryptopp/filters.h -rw-r--r-- root/root usr/include/cryptopp/fips140.h @@ -56,11 +59,13 @@ drwxr-xr-x root/root usr/include/cryptopp/ -rw-r--r-- root/root usr/include/cryptopp/hex.h -rw-r--r-- root/root usr/include/cryptopp/hkdf.h -rw-r--r-- root/root usr/include/cryptopp/hmac.h +-rw-r--r-- root/root usr/include/cryptopp/hmqv.h -rw-r--r-- root/root usr/include/cryptopp/hrtimer.h -rw-r--r-- root/root usr/include/cryptopp/ida.h -rw-r--r-- root/root usr/include/cryptopp/idea.h -rw-r--r-- root/root usr/include/cryptopp/integer.h -rw-r--r-- root/root usr/include/cryptopp/iterhash.h +-rw-r--r-- root/root usr/include/cryptopp/keccak.h -rw-r--r-- root/root usr/include/cryptopp/lubyrack.h -rw-r--r-- root/root usr/include/cryptopp/luc.h -rw-r--r-- root/root usr/include/cryptopp/mars.h diff --git a/crypto++/.md5sum b/crypto++/.md5sum index fe1ddee..ea68386 100644 --- a/crypto++/.md5sum +++ b/crypto++/.md5sum @@ -1,2 +1,2 @@ -3c5b70e2ec98b7a24988734446242d07 cryptopp563.zip +4ee7e5cdd4a45a14756c169eaf2a77fc cryptopp564.zip 5b2c116b1e1728f58afb8798b27df4e9 libcrypto++.pc.in diff --git a/crypto++/Pkgfile b/crypto++/Pkgfile index 0444de3..8af1e0a 100644 --- a/crypto++/Pkgfile +++ b/crypto++/Pkgfile @@ -4,7 +4,7 @@ # Packager: Antti Nykanen, aon at iki dot fi name=crypto++ -version=5.6.3 +version=5.6.4 release=1 source=(http://www.cryptopp.com/${name/++/pp}${version//\./}.zip libcrypto++.pc.in) @@ -13,6 +13,10 @@ build() { sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile export CXXFLAGS="$CXXFLAGS -DNDEBUG -fPIC" + # http://www.openwall.com/lists/oss-security/2016/09/19/6 + echo "#define CRYPTOPP_UNUSED(x) ((void)(x))" >> config.h + sed -i -e 's|assert[[:space:]]*(|CRYPTOPP_UNUSED(|g' *.h *.cpp + make -f GNUmakefile make libcryptopp.so