The package rpms/cryptopp.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/cryptopp.git/commit/?id=4b7eb167b8ae....
Change: -%ifarch i686 x86_64
Thanks.
Full change: ============
commit 4b7eb167b8ae7870a0ee8ab4668249b3f821582f Author: vascom vascom2@gmail.com Date: Wed Dec 30 08:42:41 2020 +0300
Update to 8.3.0. Disable LTO.
diff --git a/cryptopp-5.6.3-fix-RDSEED-test-exception.patch b/cryptopp-5.6.3-fix-RDSEED-test-exception.patch deleted file mode 100644 index 9cd1d0d..0000000 --- a/cryptopp-5.6.3-fix-RDSEED-test-exception.patch +++ /dev/null @@ -1,27 +0,0 @@ -## Patch to fix RDSEED exception during build tests -## Discussion at: -## http://comments.gmane.org/gmane.comp.encryption.cryptopp/8028 -## Original upstream commit: -## https://github.com/weidai11/cryptopp/commit/0059f486ad0467d5c4dc692db99a5a5f... -## This patch file has been manually regenerated for cryptopp-5.6.3 - ---- validat1.cpp.ORIGINAL 2015-11-19 17:25:32.000000000 -0600 -+++ validat1.cpp 2016-12-12 16:46:19.272200200 -0600 -@@ -459,6 +459,7 @@ - #if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64) - bool TestRDRAND() - { -+ // Testing on 6th generation i7 shows RDRAND needs less than 8 retries for 10K bytes. - RDRAND rdrand; - bool maurer = true, generate = true, discard = true; - static const unsigned int SIZE = 10000; -@@ -529,7 +530,8 @@ - #if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64) - bool TestRDSEED() - { -- RDSEED rdseed; -+ // Testing on 6th generation i7 shows RDSEED needs about 128 retries for 10K bytes. -+ RDSEED rdseed(1024); - bool maurer = true, generate = true, discard = true; - static const unsigned int SIZE = 10000; - diff --git a/cryptopp-autotools.patch b/cryptopp-autotools.patch deleted file mode 100644 index a6a2176..0000000 --- a/cryptopp-autotools.patch +++ /dev/null @@ -1,327 +0,0 @@ ---- cryptopp-5.6.1/configure.ac 1970-01-01 03:00:00.000000000 +0300 -+++ cryptopp-5.6.1/configure.ac 2010-10-21 15:20:14.000000000 +0300 -@@ -0,0 +1,13 @@ -+AC_INIT([cryptopp], [5.6.2], [cryptopp-users@googlegroups.com]) -+AM_INIT_AUTOMAKE -+AC_CONFIG_SRCDIR(configure.ac) -+AC_CONFIG_HEADER([local.h]) -+AM_MAINTAINER_MODE -+ -+AC_PROG_CXX -+AC_PROG_LIBTOOL -+AC_PROG_INSTALL -+ -+AC_C_BIGENDIAN -+ -+AC_OUTPUT(Makefile) ---- cryptopp-5.6.1/Makefile.am 1970-01-01 03:00:00.000000000 +0300 -+++ cryptopp-5.6.1/Makefile.am 2010-10-21 15:32:36.000000000 +0300 -@@ -0,0 +1,308 @@ -+AUTOMAKE_OPTIONS = foreign -+lib_LTLIBRARIES = libcryptopp.la -+libcryptopp_la_LIBADD = -lpthread -+libcryptopp_la_LDFLAGS = -version-info 6:0:0 -+libcryptopp_la_SOURCES = \ -+ 3way.cpp \ -+ adler32.cpp \ -+ algebra.cpp \ -+ algparam.cpp \ -+ arc4.cpp \ -+ asn.cpp \ -+ authenc.cpp \ -+ base32.cpp \ -+ base64.cpp \ -+ basecode.cpp \ -+ bfinit.cpp \ -+ blowfish.cpp \ -+ blumshub.cpp \ -+ camellia.cpp \ -+ cast.cpp \ -+ casts.cpp \ -+ cbcmac.cpp \ -+ ccm.cpp \ -+ channels.cpp \ -+ cmac.cpp \ -+ cpu.cpp \ -+ crc.cpp \ -+ cryptlib.cpp \ -+ default.cpp \ -+ des.cpp \ -+ dessp.cpp \ -+ dh.cpp \ -+ dh2.cpp \ -+ dll.cpp \ -+ dsa.cpp \ -+ eax.cpp \ -+ ec2n.cpp \ -+ eccrypto.cpp \ -+ ecp.cpp \ -+ elgamal.cpp \ -+ emsa2.cpp \ -+ eprecomp.cpp \ -+ esign.cpp \ -+ files.cpp \ -+ filters.cpp \ -+ fips140.cpp \ -+ fipstest.cpp \ -+ gcm.cpp \ -+ gf256.cpp \ -+ gf2_32.cpp \ -+ gf2n.cpp \ -+ gfpcrypt.cpp \ -+ gost.cpp \ -+ gzip.cpp \ -+ hex.cpp \ -+ hmac.cpp \ -+ hrtimer.cpp \ -+ ida.cpp \ -+ idea.cpp \ -+ integer.cpp \ -+ iterhash.cpp \ -+ luc.cpp \ -+ md2.cpp \ -+ md4.cpp \ -+ md5.cpp \ -+ misc.cpp \ -+ modes.cpp \ -+ mqueue.cpp \ -+ mqv.cpp \ -+ nbtheory.cpp \ -+ network.cpp \ -+ oaep.cpp \ -+ osrng.cpp \ -+ panama.cpp \ -+ pch.cpp \ -+ pkcspad.cpp \ -+ polynomi.cpp \ -+ pssr.cpp \ -+ pubkey.cpp \ -+ queue.cpp \ -+ rabin.cpp \ -+ randpool.cpp \ -+ rc2.cpp \ -+ rc5.cpp \ -+ rc6.cpp \ -+ rdrand.cpp \ -+ rdtables.cpp \ -+ rijndael.cpp \ -+ ripemd.cpp \ -+ rng.cpp \ -+ rsa.cpp \ -+ rw.cpp \ -+ safer.cpp \ -+ salsa.cpp \ -+ seal.cpp \ -+ seed.cpp \ -+ serpent.cpp \ -+ sha.cpp \ -+ shacal2.cpp \ -+ shark.cpp \ -+ sharkbox.cpp \ -+ simple.cpp \ -+ skipjack.cpp \ -+ socketft.cpp \ -+ sosemanuk.cpp \ -+ square.cpp \ -+ squaretb.cpp \ -+ strciphr.cpp \ -+ tea.cpp \ -+ tftables.cpp \ -+ tiger.cpp \ -+ tigertab.cpp \ -+ trdlocal.cpp \ -+ ttmac.cpp \ -+ twofish.cpp \ -+ vmac.cpp \ -+ wait.cpp \ -+ wake.cpp \ -+ whrlpool.cpp \ -+ winpipes.cpp \ -+ xtr.cpp \ -+ xtrcrypt.cpp \ -+ zdeflate.cpp \ -+ zinflate.cpp \ -+ zlib.cpp \ -+ sha3.cpp \ -+ mars.cpp \ -+ marss.cpp -+ -+pkginclude_HEADERS = \ -+ 3way.h \ -+ adler32.h \ -+ aes.h \ -+ algebra.h \ -+ algparam.h \ -+ arc4.h \ -+ argnames.h \ -+ asn.h \ -+ authenc.h \ -+ base32.h \ -+ base64.h \ -+ basecode.h \ -+ bench.h \ -+ blowfish.h \ -+ blumshub.h \ -+ camellia.h \ -+ cast.h \ -+ cbcmac.h \ -+ ccm.h \ -+ channels.h \ -+ cmac.h \ -+ config.h \ -+ cpu.h \ -+ crc.h \ -+ cryptlib.h \ -+ default.h \ -+ des.h \ -+ dh2.h \ -+ dh.h \ -+ dll.h \ -+ dmac.h \ -+ dsa.h \ -+ eax.h \ -+ ec2n.h \ -+ eccrypto.h \ -+ ecp.h \ -+ elgamal.h \ -+ emsa2.h \ -+ eprecomp.h \ -+ esign.h \ -+ factory.h \ -+ files.h \ -+ filters.h \ -+ fips140.h \ -+ fltrimpl.h \ -+ gcm.h \ -+ gf2_32.h \ -+ gf256.h \ -+ gf2n.h \ -+ gfpcrypt.h \ -+ gost.h \ -+ gzip.h \ -+ hex.h \ -+ hmac.h \ -+ hrtimer.h \ -+ ida.h \ -+ idea.h \ -+ integer.h \ -+ iterhash.h \ -+ lubyrack.h \ -+ luc.h \ -+ md2.h \ -+ md4.h \ -+ md5.h \ -+ mdc.h \ -+ misc.h \ -+ modarith.h \ -+ modes.h \ -+ modexppc.h \ -+ mqueue.h \ -+ mqv.h \ -+ nbtheory.h \ -+ network.h \ -+ nr.h \ -+ oaep.h \ -+ oids.h \ -+ osrng.h \ -+ panama.h \ -+ pch.h \ -+ pkcspad.h \ -+ polynomi.h \ -+ pssr.h \ -+ pubkey.h \ -+ pwdbased.h \ -+ queue.h \ -+ rabin.h \ -+ randpool.h \ -+ rc2.h \ -+ rc5.h \ -+ rc6.h \ -+ rijndael.h \ -+ ripemd.h \ -+ rng.h \ -+ rsa.h \ -+ rw.h \ -+ safer.h \ -+ salsa.h \ -+ seal.h \ -+ secblock.h \ -+ seckey.h \ -+ seed.h \ -+ serpent.h \ -+ shacal2.h \ -+ sha.h \ -+ shark.h \ -+ simple.h \ -+ skipjack.h \ -+ smartptr.h \ -+ socketft.h \ -+ sosemanuk.h \ -+ square.h \ -+ stdcpp.h \ -+ strciphr.h \ -+ tea.h \ -+ tiger.h \ -+ trdlocal.h \ -+ trunhash.h \ -+ ttmac.h \ -+ twofish.h \ -+ vmac.h \ -+ wait.h \ -+ wake.h \ -+ whrlpool.h \ -+ winpipes.h \ -+ words.h \ -+ xtrcrypt.h \ -+ xtr.h \ -+ zdeflate.h \ -+ zinflate.h \ -+ zlib.h \ -+ sha3.h \ -+ mars.h -+ -+ -+noinst_HEADERS = \ -+ local.h \ -+ resource.h \ -+ serpentp.h -+ validate.h -+ -+bin_PROGRAMS = cryptest cryptestcwd -+cryptest_CXXFLAGS = $(CXXFLAGS) -DPACKAGE_DATA_DIR='"/usr/share/cryptopp/"' -+cryptest_SOURCES = \ -+ bench.cpp \ -+ bench2.cpp \ -+ test.cpp \ -+ validat1.cpp \ -+ validat2.cpp \ -+ validat3.cpp \ -+ datatest.cpp \ -+ regtest.cpp \ -+ fipsalgt.cpp \ -+ dlltest.cpp -+nodist_cryptest_SOURCES = adhoc.cpp -+CLEANFILES = adhoc.cpp -+cryptest_LDADD = $(lib_LTLIBRARIES) -+cryptestcwd_CXXFLAGS = $(CXXFLAGS) -DPACKAGE_DATA_DIR='""' -+cryptestcwd_SOURCES = \ -+ bench.cpp \ -+ bench2.cpp \ -+ test.cpp \ -+ validat1.cpp \ -+ validat2.cpp \ -+ validat3.cpp \ -+ datatest.cpp \ -+ regtest.cpp \ -+ fipsalgt.cpp \ -+ dlltest.cpp -+nodist_cryptestcwd_SOURCES = adhoc.cpp -+CLEANFILES = adhoc.cpp -+cryptestcwd_LDADD = $(lib_LTLIBRARIES) -+ -+adhoc.cpp: Makefile -+ if test -f adhoc.cpp; then \ -+ touch adhoc.cpp; \ -+ else \ -+ cp adhoc.cpp.proto adhoc.cpp; \ -+ fi diff --git a/cryptopp-data-files-location.patch b/cryptopp-data-files-location.patch deleted file mode 100644 index bebc2de..0000000 --- a/cryptopp-data-files-location.patch +++ /dev/null @@ -1,562 +0,0 @@ -## cryptest-data-files-location.diff by Jens Peter Secher jps@debian.org -## -## Prefix data file names by PACKAGE_DATA_DIR which is set during build. - ---- libcrypto++-5.6.3.orig/bench2.cpp -+++ libcrypto++-5.6.3/bench2.cpp -@@ -257,44 +257,44 @@ void BenchmarkAll2(double t, double hert - cout << "<THEAD><TR><TH>Operation<TH>Milliseconds/Operation" << (g_hertz ? "<TH>Megacycles/Operation" : "") << endl; - - cout << "\n<TBODY style="background: yellow">"; -- BenchMarkCrypto<RSAES<OAEP<SHA> > >("TestData/rsa1024.dat", "RSA 1024", t); -- BenchMarkCrypto<LUCES<OAEP<SHA> > >("TestData/luc1024.dat", "LUC 1024", t); -- BenchMarkCrypto<DLIES<> >("TestData/dlie1024.dat", "DLIES 1024", t); -- BenchMarkCrypto<LUC_IES<> >("TestData/lucc512.dat", "LUCELG 512", t); -+ BenchMarkCrypto<RSAES<OAEP<SHA> > >(PACKAGE_DATA_DIR "TestData/rsa1024.dat", "RSA 1024", t); -+ BenchMarkCrypto<LUCES<OAEP<SHA> > >(PACKAGE_DATA_DIR "TestData/luc1024.dat", "LUC 1024", t); -+ BenchMarkCrypto<DLIES<> >(PACKAGE_DATA_DIR "TestData/dlie1024.dat", "DLIES 1024", t); -+ BenchMarkCrypto<LUC_IES<> >(PACKAGE_DATA_DIR "TestData/lucc512.dat", "LUCELG 512", t); - - cout << "\n<TBODY style="background: white">"; -- BenchMarkCrypto<RSAES<OAEP<SHA> > >("TestData/rsa2048.dat", "RSA 2048", t); -- BenchMarkCrypto<LUCES<OAEP<SHA> > >("TestData/luc2048.dat", "LUC 2048", t); -- BenchMarkCrypto<DLIES<> >("TestData/dlie2048.dat", "DLIES 2048", t); -- BenchMarkCrypto<LUC_IES<> >("TestData/lucc1024.dat", "LUCELG 1024", t); -+ BenchMarkCrypto<RSAES<OAEP<SHA> > >(PACKAGE_DATA_DIR "TestData/rsa2048.dat", "RSA 2048", t); -+ BenchMarkCrypto<LUCES<OAEP<SHA> > >(PACKAGE_DATA_DIR "TestData/luc2048.dat", "LUC 2048", t); -+ BenchMarkCrypto<DLIES<> >(PACKAGE_DATA_DIR "TestData/dlie2048.dat", "DLIES 2048", t); -+ BenchMarkCrypto<LUC_IES<> >(PACKAGE_DATA_DIR "TestData/lucc1024.dat", "LUCELG 1024", t); - - cout << "\n<TBODY style="background: yellow">"; -- BenchMarkSignature<RSASS<PSSR, SHA> >("TestData/rsa1024.dat", "RSA 1024", t); -- BenchMarkSignature<RWSS<PSSR, SHA> >("TestData/rw1024.dat", "RW 1024", t); -- BenchMarkSignature<LUCSS<PSSR, SHA> >("TestData/luc1024.dat", "LUC 1024", t); -- BenchMarkSignature<NR<SHA> >("TestData/nr1024.dat", "NR 1024", t); -- BenchMarkSignature<DSA>("TestData/dsa1024.dat", "DSA 1024", t); -- BenchMarkSignature<LUC_HMP<SHA> >("TestData/lucs512.dat", "LUC-HMP 512", t); -- BenchMarkSignature<ESIGN<SHA> >("TestData/esig1023.dat", "ESIGN 1023", t); -- BenchMarkSignature<ESIGN<SHA> >("TestData/esig1536.dat", "ESIGN 1536", t); -+ BenchMarkSignature<RSASS<PSSR, SHA> >(PACKAGE_DATA_DIR "TestData/rsa1024.dat", "RSA 1024", t); -+ BenchMarkSignature<RWSS<PSSR, SHA> >(PACKAGE_DATA_DIR "TestData/rw1024.dat", "RW 1024", t); -+ BenchMarkSignature<LUCSS<PSSR, SHA> >(PACKAGE_DATA_DIR "TestData/luc1024.dat", "LUC 1024", t); -+ BenchMarkSignature<NR<SHA> >(PACKAGE_DATA_DIR "TestData/nr1024.dat", "NR 1024", t); -+ BenchMarkSignature<DSA>(PACKAGE_DATA_DIR "TestData/dsa1024.dat", "DSA 1024", t); -+ BenchMarkSignature<LUC_HMP<SHA> >(PACKAGE_DATA_DIR "TestData/lucs512.dat", "LUC-HMP 512", t); -+ BenchMarkSignature<ESIGN<SHA> >(PACKAGE_DATA_DIR "TestData/esig1023.dat", "ESIGN 1023", t); -+ BenchMarkSignature<ESIGN<SHA> >(PACKAGE_DATA_DIR "TestData/esig1536.dat", "ESIGN 1536", t); - - cout << "\n<TBODY style="background: white">"; -- BenchMarkSignature<RSASS<PSSR, SHA> >("TestData/rsa2048.dat", "RSA 2048", t); -- BenchMarkSignature<RWSS<PSSR, SHA> >("TestData/rw2048.dat", "RW 2048", t); -- BenchMarkSignature<LUCSS<PSSR, SHA> >("TestData/luc2048.dat", "LUC 2048", t); -- BenchMarkSignature<NR<SHA> >("TestData/nr2048.dat", "NR 2048", t); -- BenchMarkSignature<LUC_HMP<SHA> >("TestData/lucs1024.dat", "LUC-HMP 1024", t); -- BenchMarkSignature<ESIGN<SHA> >("TestData/esig2046.dat", "ESIGN 2046", t); -+ BenchMarkSignature<RSASS<PSSR, SHA> >(PACKAGE_DATA_DIR "TestData/rsa2048.dat", "RSA 2048", t); -+ BenchMarkSignature<RWSS<PSSR, SHA> >(PACKAGE_DATA_DIR "TestData/rw2048.dat", "RW 2048", t); -+ BenchMarkSignature<LUCSS<PSSR, SHA> >(PACKAGE_DATA_DIR "TestData/luc2048.dat", "LUC 2048", t); -+ BenchMarkSignature<NR<SHA> >(PACKAGE_DATA_DIR "TestData/nr2048.dat", "NR 2048", t); -+ BenchMarkSignature<LUC_HMP<SHA> >(PACKAGE_DATA_DIR "TestData/lucs1024.dat", "LUC-HMP 1024", t); -+ BenchMarkSignature<ESIGN<SHA> >(PACKAGE_DATA_DIR "TestData/esig2046.dat", "ESIGN 2046", t); - - cout << "\n<TBODY style="background: yellow">"; -- BenchMarkKeyAgreement<XTR_DH>("TestData/xtrdh171.dat", "XTR-DH 171", t); -- BenchMarkKeyAgreement<XTR_DH>("TestData/xtrdh342.dat", "XTR-DH 342", t); -- BenchMarkKeyAgreement<DH>("TestData/dh1024.dat", "DH 1024", t); -- BenchMarkKeyAgreement<DH>("TestData/dh2048.dat", "DH 2048", t); -- BenchMarkKeyAgreement<LUC_DH>("TestData/lucd512.dat", "LUCDIF 512", t); -- BenchMarkKeyAgreement<LUC_DH>("TestData/lucd1024.dat", "LUCDIF 1024", t); -- BenchMarkKeyAgreement<MQV>("TestData/mqv1024.dat", "MQV 1024", t); -- BenchMarkKeyAgreement<MQV>("TestData/mqv2048.dat", "MQV 2048", t); -+ BenchMarkKeyAgreement<XTR_DH>(PACKAGE_DATA_DIR "TestData/xtrdh171.dat", "XTR-DH 171", t); -+ BenchMarkKeyAgreement<XTR_DH>(PACKAGE_DATA_DIR "TestData/xtrdh342.dat", "XTR-DH 342", t); -+ BenchMarkKeyAgreement<DH>(PACKAGE_DATA_DIR "TestData/dh1024.dat", "DH 1024", t); -+ BenchMarkKeyAgreement<DH>(PACKAGE_DATA_DIR "TestData/dh2048.dat", "DH 2048", t); -+ BenchMarkKeyAgreement<LUC_DH>(PACKAGE_DATA_DIR "TestData/lucd512.dat", "LUCDIF 512", t); -+ BenchMarkKeyAgreement<LUC_DH>(PACKAGE_DATA_DIR "TestData/lucd1024.dat", "LUCDIF 1024", t); -+ BenchMarkKeyAgreement<MQV>(PACKAGE_DATA_DIR "TestData/mqv1024.dat", "MQV 1024", t); -+ BenchMarkKeyAgreement<MQV>(PACKAGE_DATA_DIR "TestData/mqv2048.dat", "MQV 2048", t); - - cout << "\n<TBODY style="background: white">"; - { ---- libcrypto++-5.6.3.orig/test.cpp -+++ libcrypto++-5.6.3/test.cpp -@@ -281,7 +281,7 @@ int CRYPTOPP_API main(int argc, char *ar - { - std::string fname = (argv[2] ? argv[2] : "all"); - if (fname.find(".txt") == std::string::npos) -- fname = "TestVectors/" + fname + ".txt"; -+ fname = PACKAGE_DATA_DIR "TestVectors/" + fname + ".txt"; - - PrintSeedAndThreads(seed); - return !RunTestDataFile(fname.c_str()); -@@ -369,7 +369,7 @@ int CRYPTOPP_API main(int argc, char *ar - AES_CTR_Encrypt(argv[2], argv[3], argv[4], argv[5]); - else if (command == "h") - { -- FileSource usage("TestData/usage.dat", true, new FileSink(cout)); -+ FileSource usage(PACKAGE_DATA_DIR "TestData/usage.dat", true, new FileSink(cout)); - return 1; - } - else if (command == "V") ---- libcrypto++-5.6.3.orig/validat1.cpp -+++ libcrypto++-5.6.3/validat1.cpp -@@ -83,7 +83,7 @@ bool ValidateAll(bool thorough) - pass=ValidateMD2() && pass; - pass=ValidateMD5() && pass; - pass=ValidateSHA() && pass; -- pass=RunTestDataFile("TestVectors/sha3.txt") && pass; -+ pass=RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/sha3.txt") && pass; - pass=ValidateTiger() && pass; - pass=ValidateRIPEMD() && pass; - pass=ValidatePanama() && pass; -@@ -123,8 +123,8 @@ bool ValidateAll(bool thorough) - pass=ValidateCCM() && pass; - pass=ValidateGCM() && pass; - pass=ValidateCMAC() && pass; -- pass=RunTestDataFile("TestVectors/eax.txt") && pass; -- pass=RunTestDataFile("TestVectors/seed.txt") && pass; -+ pass=RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/eax.txt") && pass; -+ pass=RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/seed.txt") && pass; - - pass=ValidateBBS() && pass; - pass=ValidateDH() && pass; -@@ -735,12 +735,12 @@ bool ValidateDES() - { - cout << "\nDES validation suite running...\n\n"; - -- FileSource valdata("TestData/descert.dat", true, new HexDecoder); -+ FileSource valdata(PACKAGE_DATA_DIR "TestData/descert.dat", true, new HexDecoder); - bool pass = BlockTransformationTest(FixedRoundsCipherFactory<DESEncryption, DESDecryption>(), valdata); - - cout << "\nTesting EDE2, EDE3, and XEX3 variants...\n\n"; - -- FileSource valdata1("TestData/3desval.dat", true, new HexDecoder); -+ FileSource valdata1(PACKAGE_DATA_DIR "TestData/3desval.dat", true, new HexDecoder); - pass = BlockTransformationTest(FixedRoundsCipherFactory<DES_EDE2_Encryption, DES_EDE2_Decryption>(), valdata1, 1) && pass; - pass = BlockTransformationTest(FixedRoundsCipherFactory<DES_EDE3_Encryption, DES_EDE3_Decryption>(), valdata1, 1) && pass; - pass = BlockTransformationTest(FixedRoundsCipherFactory<DES_XEX3_Encryption, DES_XEX3_Decryption>(), valdata1, 1) && pass; -@@ -1084,7 +1084,7 @@ bool ValidateIDEA() - { - cout << "\nIDEA validation suite running...\n\n"; - -- FileSource valdata("TestData/ideaval.dat", true, new HexDecoder); -+ FileSource valdata(PACKAGE_DATA_DIR "TestData/ideaval.dat", true, new HexDecoder); - return BlockTransformationTest(FixedRoundsCipherFactory<IDEAEncryption, IDEADecryption>(), valdata); - } - -@@ -1092,7 +1092,7 @@ bool ValidateSAFER() - { - cout << "\nSAFER validation suite running...\n\n"; - -- FileSource valdata("TestData/saferval.dat", true, new HexDecoder); -+ FileSource valdata(PACKAGE_DATA_DIR "TestData/saferval.dat", true, new HexDecoder); - bool pass = true; - pass = BlockTransformationTest(VariableRoundsCipherFactory<SAFER_K_Encryption, SAFER_K_Decryption>(8,6), valdata, 4) && pass; - pass = BlockTransformationTest(VariableRoundsCipherFactory<SAFER_K_Encryption, SAFER_K_Decryption>(16,12), valdata, 4) && pass; -@@ -1105,7 +1105,7 @@ bool ValidateRC2() - { - cout << "\nRC2 validation suite running...\n\n"; - -- FileSource valdata("TestData/rc2val.dat", true, new HexDecoder); -+ FileSource valdata(PACKAGE_DATA_DIR "TestData/rc2val.dat", true, new HexDecoder); - HexEncoder output(new FileSink(cout)); - SecByteBlock plain(RC2Encryption::BLOCKSIZE), cipher(RC2Encryption::BLOCKSIZE), out(RC2Encryption::BLOCKSIZE), outplain(RC2Encryption::BLOCKSIZE); - SecByteBlock key(128); -@@ -1315,7 +1315,7 @@ bool ValidateRC5() - { - cout << "\nRC5 validation suite running...\n\n"; - -- FileSource valdata("TestData/rc5val.dat", true, new HexDecoder); -+ FileSource valdata(PACKAGE_DATA_DIR "TestData/rc5val.dat", true, new HexDecoder); - return BlockTransformationTest(VariableRoundsCipherFactory<RC5Encryption, RC5Decryption>(16, 12), valdata); - } - -@@ -1323,7 +1323,7 @@ bool ValidateRC6() - { - cout << "\nRC6 validation suite running...\n\n"; - -- FileSource valdata("TestData/rc6val.dat", true, new HexDecoder); -+ FileSource valdata(PACKAGE_DATA_DIR "TestData/rc6val.dat", true, new HexDecoder); - bool pass = true; - pass = BlockTransformationTest(FixedRoundsCipherFactory<RC6Encryption, RC6Decryption>(16), valdata, 2) && pass; - pass = BlockTransformationTest(FixedRoundsCipherFactory<RC6Encryption, RC6Decryption>(24), valdata, 2) && pass; -@@ -1335,7 +1335,7 @@ bool ValidateMARS() - { - cout << "\nMARS validation suite running...\n\n"; - -- FileSource valdata("TestData/marsval.dat", true, new HexDecoder); -+ FileSource valdata(PACKAGE_DATA_DIR "TestData/marsval.dat", true, new HexDecoder); - bool pass = true; - pass = BlockTransformationTest(FixedRoundsCipherFactory<MARSEncryption, MARSDecryption>(16), valdata, 4) && pass; - pass = BlockTransformationTest(FixedRoundsCipherFactory<MARSEncryption, MARSDecryption>(24), valdata, 3) && pass; -@@ -1347,12 +1347,12 @@ bool ValidateRijndael() - { - cout << "\nRijndael (AES) validation suite running...\n\n"; - -- FileSource valdata("TestData/rijndael.dat", true, new HexDecoder); -+ FileSource valdata(PACKAGE_DATA_DIR "TestData/rijndael.dat", true, new HexDecoder); - bool pass = true; - pass = BlockTransformationTest(FixedRoundsCipherFactory<RijndaelEncryption, RijndaelDecryption>(16), valdata, 4) && pass; - pass = BlockTransformationTest(FixedRoundsCipherFactory<RijndaelEncryption, RijndaelDecryption>(24), valdata, 3) && pass; - pass = BlockTransformationTest(FixedRoundsCipherFactory<RijndaelEncryption, RijndaelDecryption>(32), valdata, 2) && pass; -- pass = RunTestDataFile("TestVectors/aes.txt") && pass; -+ pass = RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/aes.txt") && pass; - return pass; - } - -@@ -1360,7 +1360,7 @@ bool ValidateTwofish() - { - cout << "\nTwofish validation suite running...\n\n"; - -- FileSource valdata("TestData/twofishv.dat", true, new HexDecoder); -+ FileSource valdata(PACKAGE_DATA_DIR "TestData/twofishv.dat", true, new HexDecoder); - bool pass = true; - pass = BlockTransformationTest(FixedRoundsCipherFactory<TwofishEncryption, TwofishDecryption>(16), valdata, 4) && pass; - pass = BlockTransformationTest(FixedRoundsCipherFactory<TwofishEncryption, TwofishDecryption>(24), valdata, 3) && pass; -@@ -1372,7 +1372,7 @@ bool ValidateSerpent() - { - cout << "\nSerpent validation suite running...\n\n"; - -- FileSource valdata("TestData/serpentv.dat", true, new HexDecoder); -+ FileSource valdata(PACKAGE_DATA_DIR "TestData/serpentv.dat", true, new HexDecoder); - bool pass = true; - pass = BlockTransformationTest(FixedRoundsCipherFactory<SerpentEncryption, SerpentDecryption>(16), valdata, 5) && pass; - pass = BlockTransformationTest(FixedRoundsCipherFactory<SerpentEncryption, SerpentDecryption>(24), valdata, 4) && pass; -@@ -1418,7 +1418,7 @@ bool ValidateThreeWay() - { - cout << "\n3-WAY validation suite running...\n\n"; - -- FileSource valdata("TestData/3wayval.dat", true, new HexDecoder); -+ FileSource valdata(PACKAGE_DATA_DIR "TestData/3wayval.dat", true, new HexDecoder); - return BlockTransformationTest(FixedRoundsCipherFactory<ThreeWayEncryption, ThreeWayDecryption>(), valdata); - } - -@@ -1426,7 +1426,7 @@ bool ValidateGOST() - { - cout << "\nGOST validation suite running...\n\n"; - -- FileSource valdata("TestData/gostval.dat", true, new HexDecoder); -+ FileSource valdata(PACKAGE_DATA_DIR "TestData/gostval.dat", true, new HexDecoder); - return BlockTransformationTest(FixedRoundsCipherFactory<GOSTEncryption, GOSTDecryption>(), valdata); - } - -@@ -1434,7 +1434,7 @@ bool ValidateSHARK() - { - cout << "\nSHARK validation suite running...\n\n"; - -- FileSource valdata("TestData/sharkval.dat", true, new HexDecoder); -+ FileSource valdata(PACKAGE_DATA_DIR "TestData/sharkval.dat", true, new HexDecoder); - return BlockTransformationTest(FixedRoundsCipherFactory<SHARKEncryption, SHARKDecryption>(), valdata); - } - -@@ -1444,14 +1444,14 @@ bool ValidateCAST() - - cout << "\nCAST-128 validation suite running...\n\n"; - -- FileSource val128("TestData/cast128v.dat", true, new HexDecoder); -+ FileSource val128(PACKAGE_DATA_DIR "TestData/cast128v.dat", true, new HexDecoder); - pass = BlockTransformationTest(FixedRoundsCipherFactory<CAST128Encryption, CAST128Decryption>(16), val128, 1) && pass; - pass = BlockTransformationTest(FixedRoundsCipherFactory<CAST128Encryption, CAST128Decryption>(10), val128, 1) && pass; - pass = BlockTransformationTest(FixedRoundsCipherFactory<CAST128Encryption, CAST128Decryption>(5), val128, 1) && pass; - - cout << "\nCAST-256 validation suite running...\n\n"; - -- FileSource val256("TestData/cast256v.dat", true, new HexDecoder); -+ FileSource val256(PACKAGE_DATA_DIR "TestData/cast256v.dat", true, new HexDecoder); - pass = BlockTransformationTest(FixedRoundsCipherFactory<CAST256Encryption, CAST256Decryption>(16), val256, 1) && pass; - pass = BlockTransformationTest(FixedRoundsCipherFactory<CAST256Encryption, CAST256Decryption>(24), val256, 1) && pass; - pass = BlockTransformationTest(FixedRoundsCipherFactory<CAST256Encryption, CAST256Decryption>(32), val256, 1) && pass; -@@ -1463,7 +1463,7 @@ bool ValidateSquare() - { - cout << "\nSquare validation suite running...\n\n"; - -- FileSource valdata("TestData/squareva.dat", true, new HexDecoder); -+ FileSource valdata(PACKAGE_DATA_DIR "TestData/squareva.dat", true, new HexDecoder); - return BlockTransformationTest(FixedRoundsCipherFactory<SquareEncryption, SquareDecryption>(), valdata); - } - -@@ -1471,7 +1471,7 @@ bool ValidateSKIPJACK() - { - cout << "\nSKIPJACK validation suite running...\n\n"; - -- FileSource valdata("TestData/skipjack.dat", true, new HexDecoder); -+ FileSource valdata(PACKAGE_DATA_DIR "TestData/skipjack.dat", true, new HexDecoder); - return BlockTransformationTest(FixedRoundsCipherFactory<SKIPJACKEncryption, SKIPJACKDecryption>(), valdata); - } - -@@ -1575,7 +1575,7 @@ bool ValidateSHACAL2() - cout << "\nSHACAL-2 validation suite running...\n\n"; - - bool pass = true; -- FileSource valdata("TestData/shacal2v.dat", true, new HexDecoder); -+ FileSource valdata(PACKAGE_DATA_DIR "TestData/shacal2v.dat", true, new HexDecoder); - pass = BlockTransformationTest(FixedRoundsCipherFactory<SHACAL2Encryption, SHACAL2Decryption>(16), valdata, 4) && pass; - pass = BlockTransformationTest(FixedRoundsCipherFactory<SHACAL2Encryption, SHACAL2Decryption>(64), valdata, 10) && pass; - return pass; -@@ -1586,7 +1586,7 @@ bool ValidateCamellia() - cout << "\nCamellia validation suite running...\n\n"; - - bool pass = true; -- FileSource valdata("TestData/camellia.dat", true, new HexDecoder); -+ FileSource valdata(PACKAGE_DATA_DIR "TestData/camellia.dat", true, new HexDecoder); - pass = BlockTransformationTest(FixedRoundsCipherFactory<CamelliaEncryption, CamelliaDecryption>(16), valdata, 15) && pass; - pass = BlockTransformationTest(FixedRoundsCipherFactory<CamelliaEncryption, CamelliaDecryption>(24), valdata, 15) && pass; - pass = BlockTransformationTest(FixedRoundsCipherFactory<CamelliaEncryption, CamelliaDecryption>(32), valdata, 15) && pass; -@@ -1597,38 +1597,38 @@ bool ValidateSalsa() - { - cout << "\nSalsa validation suite running...\n"; - -- return RunTestDataFile("TestVectors/salsa.txt"); -+ return RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/salsa.txt"); - } - - bool ValidateSosemanuk() - { - cout << "\nSosemanuk validation suite running...\n"; -- return RunTestDataFile("TestVectors/sosemanuk.txt"); -+ return RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/sosemanuk.txt"); - } - - bool ValidateVMAC() - { - cout << "\nVMAC validation suite running...\n"; -- return RunTestDataFile("TestVectors/vmac.txt"); -+ return RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/vmac.txt"); - } - - bool ValidateCCM() - { - cout << "\nAES/CCM validation suite running...\n"; -- return RunTestDataFile("TestVectors/ccm.txt"); -+ return RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/ccm.txt"); - } - - bool ValidateGCM() - { - cout << "\nAES/GCM validation suite running...\n"; - cout << "\n2K tables:"; -- bool pass = RunTestDataFile("TestVectors/gcm.txt", MakeParameters(Name::TableSize(), (int)2048)); -+ bool pass = RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/gcm.txt", MakeParameters(Name::TableSize(), (int)2048)); - cout << "\n64K tables:"; -- return RunTestDataFile("TestVectors/gcm.txt", MakeParameters(Name::TableSize(), (int)64*1024)) && pass; -+ return RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/gcm.txt", MakeParameters(Name::TableSize(), (int)64*1024)) && pass; - } - - bool ValidateCMAC() - { - cout << "\nCMAC validation suite running...\n"; -- return RunTestDataFile("TestVectors/cmac.txt"); -+ return RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/cmac.txt"); - } ---- libcrypto++-5.6.3.orig/validat2.cpp -+++ libcrypto++-5.6.3/validat2.cpp -@@ -283,7 +283,7 @@ bool ValidateRSA() - "\x69\x94\xac\x04\xf3\x41\xb5\x7d\x05\x20\x2d\x42\x8f\xb2\xa2\x7b" - "\x5c\x77\xdf\xd9\xb1\x5b\xfc\x3d\x55\x93\x53\x50\x34\x10\xc1\xe1"; - -- FileSource keys("TestData/rsa512a.dat", true, new HexDecoder); -+ FileSource keys(PACKAGE_DATA_DIR "TestData/rsa512a.dat", true, new HexDecoder); - Weak::RSASSA_PKCS1v15_MD2_Signer rsaPriv(keys); - Weak::RSASSA_PKCS1v15_MD2_Verifier rsaPub(rsaPriv); - -@@ -308,7 +308,7 @@ bool ValidateRSA() - cout << "invalid signature verification\n"; - } - { -- FileSource keys("TestData/rsa1024.dat", true, new HexDecoder); -+ FileSource keys(PACKAGE_DATA_DIR "TestData/rsa1024.dat", true, new HexDecoder); - RSAES_PKCS1v15_Decryptor rsaPriv(keys); - RSAES_PKCS1v15_Encryptor rsaPub(rsaPriv); - -@@ -335,8 +335,8 @@ bool ValidateRSA() - bq.Put(oaepSeed, 20); - FixedRNG rng(bq); - -- FileSource privFile("TestData/rsa400pv.dat", true, new HexDecoder); -- FileSource pubFile("TestData/rsa400pb.dat", true, new HexDecoder); -+ FileSource privFile(PACKAGE_DATA_DIR "TestData/rsa400pv.dat", true, new HexDecoder); -+ FileSource pubFile(PACKAGE_DATA_DIR "TestData/rsa400pb.dat", true, new HexDecoder); - RSAES_OAEP_SHA_Decryptor rsaPriv; - rsaPriv.AccessKey().BERDecodePrivateKey(privFile, false, 0); - RSAES_OAEP_SHA_Encryptor rsaPub(pubFile); -@@ -359,7 +359,7 @@ bool ValidateDH() - { - cout << "\nDH validation suite running...\n\n"; - -- FileSource f("TestData/dh1024.dat", true, new HexDecoder()); -+ FileSource f(PACKAGE_DATA_DIR "TestData/dh1024.dat", true, new HexDecoder()); - DH dh(f); - return SimpleKeyAgreementValidate(dh); - } -@@ -368,7 +368,7 @@ bool ValidateMQV() - { - cout << "\nMQV validation suite running...\n\n"; - -- FileSource f("TestData/mqv1024.dat", true, new HexDecoder()); -+ FileSource f(PACKAGE_DATA_DIR "TestData/mqv1024.dat", true, new HexDecoder()); - MQV mqv(f); - return AuthenticatedKeyAgreementValidate(mqv); - } -@@ -377,7 +377,7 @@ bool ValidateLUC_DH() - { - cout << "\nLUC-DH validation suite running...\n\n"; - -- FileSource f("TestData/lucd512.dat", true, new HexDecoder()); -+ FileSource f(PACKAGE_DATA_DIR "TestData/lucd512.dat", true, new HexDecoder()); - LUC_DH dh(f); - return SimpleKeyAgreementValidate(dh); - } -@@ -386,7 +386,7 @@ bool ValidateXTR_DH() - { - cout << "\nXTR-DH validation suite running...\n\n"; - -- FileSource f("TestData/xtrdh171.dat", true, new HexDecoder()); -+ FileSource f(PACKAGE_DATA_DIR "TestData/xtrdh171.dat", true, new HexDecoder()); - XTR_DH dh(f); - return SimpleKeyAgreementValidate(dh); - } -@@ -396,7 +396,7 @@ bool ValidateElGamal() - cout << "\nElGamal validation suite running...\n\n"; - bool pass = true; - { -- FileSource fc("TestData/elgc1024.dat", true, new HexDecoder); -+ FileSource fc(PACKAGE_DATA_DIR "TestData/elgc1024.dat", true, new HexDecoder); - ElGamalDecryptor privC(fc); - ElGamalEncryptor pubC(privC); - privC.AccessKey().Precompute(); -@@ -414,7 +414,7 @@ bool ValidateDLIES() - cout << "\nDLIES validation suite running...\n\n"; - bool pass = true; - { -- FileSource fc("TestData/dlie1024.dat", true, new HexDecoder); -+ FileSource fc(PACKAGE_DATA_DIR "TestData/dlie1024.dat", true, new HexDecoder); - DLIES<>::Decryptor privC(fc); - DLIES<>::Encryptor pubC(privC); - pass = CryptoSystemValidate(privC, pubC) && pass; -@@ -437,7 +437,7 @@ bool ValidateNR() - cout << "\nNR validation suite running...\n\n"; - bool pass = true; - { -- FileSource f("TestData/nr2048.dat", true, new HexDecoder); -+ FileSource f(PACKAGE_DATA_DIR "TestData/nr2048.dat", true, new HexDecoder); - NR<SHA>::Signer privS(f); - privS.AccessKey().Precompute(); - NR<SHA>::Verifier pubS(privS); -@@ -459,10 +459,10 @@ bool ValidateDSA(bool thorough) - cout << "\nDSA validation suite running...\n\n"; - - bool pass = true; -- FileSource fs1("TestData/dsa1024.dat", true, new HexDecoder()); -+ FileSource fs1(PACKAGE_DATA_DIR "TestData/dsa1024.dat", true, new HexDecoder()); - DSA::Signer priv(fs1); - DSA::Verifier pub(priv); -- FileSource fs2("TestData/dsa1024b.dat", true, new HexDecoder()); -+ FileSource fs2(PACKAGE_DATA_DIR "TestData/dsa1024b.dat", true, new HexDecoder()); - DSA::Verifier pub1(fs2); - assert(pub.GetKey() == pub1.GetKey()); - pass = SignatureValidate(priv, pub, thorough) && pass; -@@ -477,7 +477,7 @@ bool ValidateLUC() - bool pass=true; - - { -- FileSource f("TestData/luc1024.dat", true, new HexDecoder); -+ FileSource f(PACKAGE_DATA_DIR "TestData/luc1024.dat", true, new HexDecoder); - LUCSSA_PKCS1v15_SHA_Signer priv(f); - LUCSSA_PKCS1v15_SHA_Verifier pub(priv); - pass = SignatureValidate(priv, pub) && pass; -@@ -494,14 +494,14 @@ bool ValidateLUC_DL() - { - cout << "\nLUC-HMP validation suite running...\n\n"; - -- FileSource f("TestData/lucs512.dat", true, new HexDecoder); -+ FileSource f(PACKAGE_DATA_DIR "TestData/lucs512.dat", true, new HexDecoder); - LUC_HMP<SHA>::Signer privS(f); - LUC_HMP<SHA>::Verifier pubS(privS); - bool pass = SignatureValidate(privS, pubS); - - cout << "\nLUC-IES validation suite running...\n\n"; - -- FileSource fc("TestData/lucc512.dat", true, new HexDecoder); -+ FileSource fc(PACKAGE_DATA_DIR "TestData/lucc512.dat", true, new HexDecoder); - LUC_IES<>::Decryptor privC(fc); - LUC_IES<>::Encryptor pubC(privC); - pass = CryptoSystemValidate(privC, pubC) && pass; -@@ -515,7 +515,7 @@ bool ValidateRabin() - bool pass=true; - - { -- FileSource f("TestData/rabi1024.dat", true, new HexDecoder); -+ FileSource f(PACKAGE_DATA_DIR "TestData/rabi1024.dat", true, new HexDecoder); - RabinSS<PSSR, SHA>::Signer priv(f); - RabinSS<PSSR, SHA>::Verifier pub(priv); - pass = SignatureValidate(priv, pub) && pass; -@@ -532,7 +532,7 @@ bool ValidateRW() - { - cout << "\nRW validation suite running...\n\n"; - -- FileSource f("TestData/rw1024.dat", true, new HexDecoder); -+ FileSource f(PACKAGE_DATA_DIR "TestData/rw1024.dat", true, new HexDecoder); - RWSS<PSSR, SHA>::Signer priv(f); - RWSS<PSSR, SHA>::Verifier pub(priv); - -@@ -544,7 +544,7 @@ bool ValidateBlumGoldwasser() - { - cout << "\nBlumGoldwasser validation suite running...\n\n"; - -- FileSource f("TestData/blum512.dat", true, new HexDecoder); -+ FileSource f(PACKAGE_DATA_DIR "TestData/blum512.dat", true, new HexDecoder); - BlumGoldwasserPrivateKey priv(f); - BlumGoldwasserPublicKey pub(priv); - -@@ -828,7 +828,7 @@ bool ValidateESIGN() - "\x74\x02\x37\x0E\xED\x0A\x06\xAD\xF4\x15\x65\xB8\xE1\xD1\x45\xAE\x39\x19\xB4\xFF\x5D\xF1\x45\x7B\xE0\xFE\x72\xED\x11\x92\x8F\x61\x41\x4F\x02\x00\xF2\x76\x6F\x7C" - "\x79\xA2\xE5\x52\x20\x5D\x97\x5E\xFE\x39\xAE\x21\x10\xFB\x35\xF4\x80\x81\x41\x13\xDD\xE8\x5F\xCA\x1E\x4F\xF8\x9B\xB2\x68\xFB\x28"; - -- FileSource keys("TestData/esig1536.dat", true, new HexDecoder); -+ FileSource keys(PACKAGE_DATA_DIR "TestData/esig1536.dat", true, new HexDecoder); - ESIGN<SHA>::Signer signer(keys); - ESIGN<SHA>::Verifier verifier(signer); - ---- libcrypto++-5.6.3.orig/validat3.cpp -+++ libcrypto++-5.6.3/validat3.cpp -@@ -187,13 +187,13 @@ bool ValidateMD5() - bool ValidateSHA() - { - cout << "\nSHA validation suite running...\n\n"; -- return RunTestDataFile("TestVectors/sha.txt"); -+ return RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/sha.txt"); - } - - bool ValidateSHA2() - { - cout << "\nSHA validation suite running...\n\n"; -- return RunTestDataFile("TestVectors/sha.txt"); -+ return RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/sha.txt"); - } - - bool ValidateTiger() -@@ -340,12 +340,12 @@ bool ValidateHAVAL() - - bool ValidatePanama() - { -- return RunTestDataFile("TestVectors/panama.txt"); -+ return RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/panama.txt"); - } - - bool ValidateWhirlpool() - { -- return RunTestDataFile("TestVectors/whrlpool.txt"); -+ return RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/whrlpool.txt"); - } - - #ifdef CRYPTOPP_REMOVED -@@ -412,7 +412,7 @@ bool ValidateMD5MAC() - - bool ValidateHMAC() - { -- return RunTestDataFile("TestVectors/hmac.txt"); -+ return RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/hmac.txt"); - } - - #ifdef CRYPTOPP_REMOVED diff --git a/cryptopp-fix_the_Rijndael_timing_attack_counter_measure.patch b/cryptopp-fix_the_Rijndael_timing_attack_counter_measure.patch deleted file mode 100644 index b35cffd..0000000 --- a/cryptopp-fix_the_Rijndael_timing_attack_counter_measure.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 9f335d719ebc27f58251559240de0077ec42c583 Mon Sep 17 00:00:00 2001 -From: Pierre Lestringant plt@amossys.fr -Date: Wed, 6 Apr 2016 15:51:17 +0200 -Subject: [PATCH] Fix the Rijndael timing attack counter measure - ---- - rijndael.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/rijndael.cpp b/rijndael.cpp -index f394960..92f9dea 100644 ---- a/rijndael.cpp -+++ b/rijndael.cpp -@@ -391,7 +391,7 @@ void Rijndael::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock - // timing attack countermeasure. see comments at top for more details - const int cacheLineSize = GetCacheLineSize(); - unsigned int i; -- word32 u = 0; -+ volatile word32 u = 0; - #if defined(CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS) || defined(CRYPTOPP_ALLOW_RIJNDAEL_UNALIGNED_DATA_ACCESS) - for (i=0; i<2048; i+=cacheLineSize) - #else -@@ -467,7 +467,7 @@ void Rijndael::Dec::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock - // timing attack countermeasure. see comments at top for more details - const int cacheLineSize = GetCacheLineSize(); - unsigned int i; -- word32 u = 0; -+ volatile word32 u = 0; - #if defined(CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS) || defined(CRYPTOPP_ALLOW_RIJNDAEL_UNALIGNED_DATA_ACCESS) - for (i=0; i<2048; i+=cacheLineSize) - #else diff --git a/cryptopp-improve_constant_propagation.patch b/cryptopp-improve_constant_propagation.patch deleted file mode 100644 index 95a0d2f..0000000 --- a/cryptopp-improve_constant_propagation.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 50e5c14c18671726d23479b5e0cadc4224100259 Mon Sep 17 00:00:00 2001 -From: Jeffrey Walton noloader@gmail.com -Date: Thu, 7 Apr 2016 19:20:33 -0400 -Subject: [PATCH] Improve constant propagation of fix for Issue 146 - ---- - rijndael.cpp | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/rijndael.cpp b/rijndael.cpp -index 92f9dea..ab9f70a 100644 ---- a/rijndael.cpp -+++ b/rijndael.cpp -@@ -388,10 +388,12 @@ void Rijndael::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock - t3 = rk[7]; - rk += 8; - -- // timing attack countermeasure. see comments at top for more details -+ // timing attack countermeasure. see comments at top for more details. -+ // also see http://github.com/weidai11/cryptopp/issues/146 - const int cacheLineSize = GetCacheLineSize(); - unsigned int i; -- volatile word32 u = 0; -+ volatile word32 _u = 0; -+ word32 u = _u; - #if defined(CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS) || defined(CRYPTOPP_ALLOW_RIJNDAEL_UNALIGNED_DATA_ACCESS) - for (i=0; i<2048; i+=cacheLineSize) - #else -@@ -464,10 +466,12 @@ void Rijndael::Dec::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock - t3 = rk[7]; - rk += 8; - -- // timing attack countermeasure. see comments at top for more details -+ // timing attack countermeasure. see comments at top for more details. -+ // also see http://github.com/weidai11/cryptopp/issues/146 - const int cacheLineSize = GetCacheLineSize(); - unsigned int i; -- volatile word32 u = 0; -+ volatile word32 _u = 0; -+ word32 u = _u; - #if defined(CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS) || defined(CRYPTOPP_ALLOW_RIJNDAEL_UNALIGNED_DATA_ACCESS) - for (i=0; i<2048; i+=cacheLineSize) - #else diff --git a/cryptopp-soversion.patch b/cryptopp-soversion.patch deleted file mode 100644 index 65a5b03..0000000 --- a/cryptopp-soversion.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up cryptopp-5.6.5/GNUmakefile.soversion cryptopp-5.6.5/GNUmakefile ---- cryptopp-5.6.5/GNUmakefile.soversion 2016-10-11 01:49:54.000000000 +0200 -+++ cryptopp-5.6.5/GNUmakefile 2018-02-19 16:15:40.891402342 +0100 -@@ -404,7 +404,7 @@ ifeq ($(HAS_SOLIB_VERSION),1) - # Full version suffix for shared library - SOLIB_VERSION_SUFFIX=.$(LIB_MAJOR).$(LIB_MINOR).$(LIB_PATCH) - # Different patchlevels are compatible, minor versions are not --SOLIB_COMPAT_SUFFIX=.$(LIB_MAJOR).$(LIB_MINOR) -+SOLIB_COMPAT_SUFFIX=.6 - SOLIB_FLAGS=-Wl,-soname,libcryptopp.so$(SOLIB_COMPAT_SUFFIX) - endif # HAS_SOLIB_VERSION - diff --git a/cryptopp.spec b/cryptopp.spec index 57520ab..01c9f04 100644 --- a/cryptopp.spec +++ b/cryptopp.spec @@ -1,17 +1,19 @@ +%define _lto_cflags %{nil} + Name: cryptopp -Version: 8.2.0 -Release: 4%{?dist} +Version: 8.3.0 +Release: 1%{?dist} Summary: C++ class library of cryptographic schemes License: Boost URL: http://www.cryptopp.com/ -Source0: http://www.cryptopp.com/cryptopp820.zip +Source0: http://www.cryptopp.com/cryptopp830.zip Source1: cryptopp.pc
BuildRequires: doxygen BuildRequires: gcc-c++ -%ifarch i686 x86_64 -BuildRequires: nasm -%endif +# %ifarch i686 x86_64 +# BuildRequires: nasm +# %endif BuildRequires: make
# Obsoletes pycryptopp to avoid breaking upgrades @@ -61,9 +63,9 @@ perl -pi -e 's/\r$//g' License.txt Readme.txt
%build -%ifarch i686 x86_64 -./rdrand-nasm.sh -%endif +# %ifarch i686 x86_64 +# ./rdrand-nasm.sh +# %endif
%{set_build_flags} %make_build -f GNUmakefile \ @@ -118,6 +120,9 @@ rm %{buildroot}%{_libdir}/libcryptopp.a %{_datadir}/%{name}
%changelog +* Wed Dec 30 2020 Vasiliy N. Glazov vascom2@gmail.com 8.3.0-1 +- Update to 8.3.0 + * Mon Jul 27 2020 Fedora Release Engineering releng@fedoraproject.org - 8.2.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources index f490932..59e4938 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptopp820.zip) = 753513a4ec8dd0fff2f551853ce6bd265d82219c28b033565b565b5e567fbee17adb419f4cde58a97e62b7d6533f4099aa4996cd0ba4775c6a2e7ae63a879da5 +SHA512 (cryptopp830.zip) = ad5219a66c5924d330d3646d0ff996dd235006f6812074bc4eb9e8c662a4f000ba20449d377f24b133d19ce682f7b2a3b2eb4c08857ce0f5bb39743d1d425147
arch-excludes@lists.fedoraproject.org
-
githook-noreply＠fedoraproject.org