diff --git a/.gitignore b/.gitignore index 702d4f2..c60cea0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ cryptopp-5.6.1.svn479.tar.bz2 /cryptopp561.zip +/cryptopp562.zip diff --git a/cryptopp-5.6.1-autotools.patch b/cryptopp-5.6.1-autotools.patch deleted file mode 100644 index 4900aac..0000000 --- a/cryptopp-5.6.1-autotools.patch +++ /dev/null @@ -1,324 +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.1], [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,305 @@ -+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 \ -+ 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 \ -+ 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 \ -+ 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-5.6.1-gcc-4.7.0.patch b/cryptopp-5.6.1-gcc-4.7.0.patch deleted file mode 100644 index 968dda1..0000000 --- a/cryptopp-5.6.1-gcc-4.7.0.patch +++ /dev/null @@ -1,97 +0,0 @@ ---- cryptopp/algebra.cpp 2010-08-06 18:44:32.000000000 +0300 -+++ cryptopp/algebra.cpp 2012-01-05 03:32:21.337004210 +0200 -@@ -58,7 +58,7 @@ - Element g[3]={b, a}; - unsigned int i0=0, i1=1, i2=2; - -- while (!Equal(g[i1], this->Identity())) -+ while (!this->Equal(g[i1], this->Identity())) - { - g[i2] = Mod(g[i0], g[i1]); - unsigned int t = i0; i0 = i1; i1 = i2; i2 = t; ---- cryptopp/eccrypto.cpp 2010-08-06 18:44:28.000000000 +0300 -+++ cryptopp/eccrypto.cpp 2012-01-05 04:04:08.055499801 +0200 -@@ -435,7 +435,7 @@ - StringSource ssG(param.g, true, new HexDecoder); - Element G; - bool result = GetCurve().DecodePoint(G, ssG, (size_t)ssG.MaxRetrievable()); -- SetSubgroupGenerator(G); -+ this->SetSubgroupGenerator(G); - assert(result); - - StringSource ssN(param.n, true, new HexDecoder); -@@ -591,7 +591,7 @@ - if (level >= 2 && pass) - { - const Integer &q = GetSubgroupOrder(); -- Element gq = gpc ? gpc->Exponentiate(this->GetGroupPrecomputation(), q) : ExponentiateElement(g, q); -+ Element gq = gpc ? gpc->Exponentiate(this->GetGroupPrecomputation(), q) : this->ExponentiateElement(g, q); - pass = pass && IsIdentity(gq); - } - return pass; -@@ -629,7 +629,7 @@ - typename EC::Point P; - if (!this->GetGroupParameters().GetCurve().DecodePoint(P, bt, size)) - BERDecodeError(); -- SetPublicElement(P); -+ this->SetPublicElement(P); - } - - template ---- cryptopp/eccrypto.h 2010-08-06 18:46:24.000000000 +0300 -+++ cryptopp/eccrypto.h 2012-01-05 04:04:54.672022639 +0200 -@@ -43,7 +43,7 @@ - void Initialize(const EllipticCurve &ec, const Point &G, const Integer &n, const Integer &k = Integer::Zero()) - { - this->m_groupPrecomputation.SetCurve(ec); -- SetSubgroupGenerator(G); -+ this->SetSubgroupGenerator(G); - m_n = n; - m_k = k; - } -@@ -145,9 +145,9 @@ - typedef typename EC::Point Element; - - void Initialize(const DL_GroupParameters_EC ¶ms, const Element &Q) -- {this->AccessGroupParameters() = params; SetPublicElement(Q);} -+ {this->AccessGroupParameters() = params; this->SetPublicElement(Q);} - void Initialize(const EC &ec, const Element &G, const Integer &n, const Element &Q) -- {this->AccessGroupParameters().Initialize(ec, G, n); SetPublicElement(Q);} -+ {this->AccessGroupParameters().Initialize(ec, G, n); this->SetPublicElement(Q);} - - // X509PublicKey - void BERDecodePublicKey(BufferedTransformation &bt, bool parametersPresent, size_t size); -@@ -166,9 +166,9 @@ - void Initialize(const EC &ec, const Element &G, const Integer &n, const Integer &x) - {this->AccessGroupParameters().Initialize(ec, G, n); this->SetPrivateExponent(x);} - void Initialize(RandomNumberGenerator &rng, const DL_GroupParameters_EC ¶ms) -- {GenerateRandom(rng, params);} -+ {this->GenerateRandom(rng, params);} - void Initialize(RandomNumberGenerator &rng, const EC &ec, const Element &G, const Integer &n) -- {GenerateRandom(rng, DL_GroupParameters_EC(ec, G, n));} -+ {this->GenerateRandom(rng, DL_GroupParameters_EC(ec, G, n));} - - // PKCS8PrivateKey - void BERDecodePrivateKey(BufferedTransformation &bt, bool parametersPresent, size_t size); ---- cryptopp/panama.cpp 2010-08-09 14:22:42.000000000 +0300 -+++ cryptopp/panama.cpp 2012-01-05 04:10:36.356525599 +0200 -@@ -422,7 +422,7 @@ - { - this->ThrowIfInvalidTruncatedSize(size); - -- PadLastBlock(this->BLOCKSIZE, 0x01); -+ this->PadLastBlock(this->BLOCKSIZE, 0x01); - - HashEndianCorrectedBlock(this->m_data); - ---- cryptopp/secblock.h 2012-01-03 23:15:48.287022036 +0200 -+++ cryptopp/secblock.h 2012-01-05 03:22:06.097299323 +0200 -@@ -89,7 +89,7 @@ - - pointer allocate(size_type n, const void * = NULL) - { -- CheckSize(n); -+ this->CheckSize(n); - if (n == 0) - return NULL; - diff --git a/cryptopp-5.6.1-s390.patch b/cryptopp-5.6.1-s390.patch deleted file mode 100644 index 7f20db0..0000000 --- a/cryptopp-5.6.1-s390.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- cryptopp-5.6.1/config.h 2009-09-04 13:37:59.000000000 +0300 -+++ cryptopp-5.6.1/config.h 2009-11-26 03:47:15.000000000 +0200 -@@ -4,7 +4,7 @@ - // ***************** Important Settings ******************** - - // define this if running on a big-endian CPU --#if !defined(IS_LITTLE_ENDIAN) && (defined(__BIG_ENDIAN__) || defined(__sparc) || defined(__sparc__) || defined(__hppa__) || defined(__MIPSEB__) || defined(__ARMEB__) || (defined(__MWERKS__) && !defined(__INTEL__))) -+#if !defined(IS_LITTLE_ENDIAN) && (defined(__BIG_ENDIAN__) || defined(__sparc) || defined(__sparc__) || defined(__hppa__) || defined(__MIPSEB__) || defined(__s390__) || defined(__ARMEB__) || (defined(__MWERKS__) && !defined(__INTEL__))) - # define IS_BIG_ENDIAN - #endif - -@@ -127,7 +127,7 @@ - typedef word64 word; - #else - #define CRYPTOPP_NATIVE_DWORD_AVAILABLE -- #if defined(__alpha__) || defined(__ia64__) || defined(_ARCH_PPC64) || defined(__x86_64__) || defined(__mips64) || defined(__sparc64__) -+ #if defined(__alpha__) || defined(__ia64__) || defined(_ARCH_PPC64) || defined(__x86_64__) || defined(__mips64) || defined(__sparc64__) || defined(__s390x__) - #if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !(CRYPTOPP_GCC_VERSION == 40001 && defined(__APPLE__)) && CRYPTOPP_GCC_VERSION >= 30400 - // GCC 4.0.1 on MacOS X is missing __umodti3 and __udivti3 - // mode(TI) division broken on amd64 with GCC earlier than GCC 3.4 diff --git a/cryptopp-autotools.patch b/cryptopp-autotools.patch new file mode 100644 index 0000000..3d54344 --- /dev/null +++ b/cryptopp-autotools.patch @@ -0,0 +1,326 @@ +--- 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,307 @@ ++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 \ ++ 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 index e41d983..2fc1c78 100644 --- a/cryptopp-data-files-location.patch +++ b/cryptopp-data-files-location.patch @@ -78,7 +78,7 @@ Index: libcrypto++/bench2.cpp + BenchMarkKeyAgreement(PACKAGE_DATA_DIR "TestData/lucd1024.dat", "LUCDIF 1024", t); + BenchMarkKeyAgreement(PACKAGE_DATA_DIR "TestData/mqv1024.dat", "MQV 1024", t); + BenchMarkKeyAgreement(PACKAGE_DATA_DIR "TestData/mqv2048.dat", "MQV 2048", t); - #endif + cout << "\n"; { Index: libcrypto++/test.cpp @@ -107,7 +107,16 @@ Index: libcrypto++/validat1.cpp =================================================================== --- libcrypto++.orig/validat1.cpp 2010-08-11 17:25:57.000000000 +0200 +++ libcrypto++/validat1.cpp 2010-08-11 17:26:03.000000000 +0200 -@@ -93,8 +93,8 @@ +@@ -55,7 +55,7 @@ + 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; +@@ -94,8 +94,8 @@ pass=ValidateCCM() && pass; pass=ValidateGCM() && pass; pass=ValidateCMAC() && pass; @@ -211,16 +220,16 @@ Index: libcrypto++/validat1.cpp bool pass = true; pass = BlockTransformationTest(FixedRoundsCipherFactory(16), valdata, 4) && pass; pass = BlockTransformationTest(FixedRoundsCipherFactory(24), valdata, 3) && pass; -@@ -1146,7 +1146,7 @@ +@@ -1147,7 +1147,7 @@ { 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(16), valdata, 4) && pass; - pass = BlockTransformationTest(FixedRoundsCipherFactory(24), valdata, 3) && pass; -@@ -1192,7 +1192,7 @@ + pass = BlockTransformationTest(FixedRoundsCipherFactory(16), valdata, 5) && pass; + pass = BlockTransformationTest(FixedRoundsCipherFactory(24), valdata, 4) && pass; +@@ -1193,7 +1193,7 @@ { cout << "\n3-WAY validation suite running...\n\n"; @@ -442,19 +451,10 @@ Index: libcrypto++/validat2.cpp NR::Signer privS(f); privS.AccessKey().Precompute(); NR::Verifier pubS(privS); -@@ -445,7 +445,7 @@ +@@ -444,14 +444,14 @@ + cout << "\nDSA validation suite running...\n\n"; - bool pass = true, fail; - { -- FileSource fs("TestData/dsa512.dat", true, new HexDecoder()); -+ FileSource fs(PACKAGE_DATA_DIR "TestData/dsa512.dat", true, new HexDecoder()); - GDSA::Signer priv(fs); - priv.AccessKey().Precompute(16); - GDSA::Verifier pub(priv); -@@ -487,10 +487,10 @@ - fail = pub.VerifyMessage((byte *)"xyz", 3, sig, sizeof(sig)); - pass = pass && !fail; - } + 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); @@ -464,7 +464,12 @@ Index: libcrypto++/validat2.cpp DSA::Verifier pub1(fs2); assert(pub.GetKey() == pub1.GetKey()); pass = SignatureValidate(priv, pub, thorough) && pass; -@@ -503,7 +503,7 @@ +- pass = RunTestDataFile("TestVectors/dsa.txt", g_nullNameValuePairs, thorough) && pass; ++ pass = RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/dsa.txt", g_nullNameValuePairs, thorough) && pass; + return pass; + } + +@@ -461,7 +461,7 @@ bool pass=true; { diff --git a/cryptopp-s390.patch b/cryptopp-s390.patch new file mode 100644 index 0000000..7f20db0 --- /dev/null +++ b/cryptopp-s390.patch @@ -0,0 +1,20 @@ +--- cryptopp-5.6.1/config.h 2009-09-04 13:37:59.000000000 +0300 ++++ cryptopp-5.6.1/config.h 2009-11-26 03:47:15.000000000 +0200 +@@ -4,7 +4,7 @@ + // ***************** Important Settings ******************** + + // define this if running on a big-endian CPU +-#if !defined(IS_LITTLE_ENDIAN) && (defined(__BIG_ENDIAN__) || defined(__sparc) || defined(__sparc__) || defined(__hppa__) || defined(__MIPSEB__) || defined(__ARMEB__) || (defined(__MWERKS__) && !defined(__INTEL__))) ++#if !defined(IS_LITTLE_ENDIAN) && (defined(__BIG_ENDIAN__) || defined(__sparc) || defined(__sparc__) || defined(__hppa__) || defined(__MIPSEB__) || defined(__s390__) || defined(__ARMEB__) || (defined(__MWERKS__) && !defined(__INTEL__))) + # define IS_BIG_ENDIAN + #endif + +@@ -127,7 +127,7 @@ + typedef word64 word; + #else + #define CRYPTOPP_NATIVE_DWORD_AVAILABLE +- #if defined(__alpha__) || defined(__ia64__) || defined(_ARCH_PPC64) || defined(__x86_64__) || defined(__mips64) || defined(__sparc64__) ++ #if defined(__alpha__) || defined(__ia64__) || defined(_ARCH_PPC64) || defined(__x86_64__) || defined(__mips64) || defined(__sparc64__) || defined(__s390x__) + #if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !(CRYPTOPP_GCC_VERSION == 40001 && defined(__APPLE__)) && CRYPTOPP_GCC_VERSION >= 30400 + // GCC 4.0.1 on MacOS X is missing __umodti3 and __udivti3 + // mode(TI) division broken on amd64 with GCC earlier than GCC 3.4 diff --git a/cryptopp.pc b/cryptopp.pc index f1bfe79..79478e2 100644 --- a/cryptopp.pc +++ b/cryptopp.pc @@ -5,7 +5,7 @@ includedir=@INCLUDEDIR@ Name: Crypto++ Description: A free C++ class library of cryptographic schemes -Version: 5.6.1 +Version: 5.6.2 URL: http://www.cryptopp.com Requires: Conflicts: diff --git a/cryptopp.spec b/cryptopp.spec index 373b017..b06308f 100644 --- a/cryptopp.spec +++ b/cryptopp.spec @@ -1,21 +1,19 @@ Name: cryptopp -Version: 5.6.1 -Release: 9%{?dist} -Summary: Public domain C++ class library of cryptographic schemes -License: Public Domain +Version: 5.6.2 +Release: 1%{?dist} +Summary: C++ class library of cryptographic schemes +License: Boost Group: System Environment/Libraries URL: http://www.cryptopp.com/ -Source0: http://www.cryptopp.com/cryptopp561.zip +Source0: http://www.cryptopp.com/cryptopp562.zip Source1: cryptopp.pc -Patch0: cryptopp-5.6.1-autotools.patch -Patch1: cryptopp-5.6.1-s390.patch +Patch0: cryptopp-autotools.patch +Patch1: cryptopp-s390.patch # Debian patch installs TestVectors and TestData in /usr/share/cryptopp/ # http://groups.google.com/group/cryptopp-users/browse_thread/thread/6fe2192340f07e5d Patch2: cryptopp-data-files-location.patch # Enable SSE2 only on x86_64 Patch3: cryptopp-x86-disable-sse2.patch -# fix build with gcc-4.7.0 http://groups.google.com/group/cryptopp-users/browse_thread/thread/abad017df4a83883 -Patch4: cryptopp-5.6.1-gcc-4.7.0.patch BuildRequires: doxygen, autoconf, libtool BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -66,7 +64,6 @@ rm -f GNUmakefile %patch1 -p1 -b .s390 %patch2 -p1 %patch3 -%patch4 -p1 autoreconf --verbose --force --install perl -pi -e 's/\r$//g' License.txt Readme.txt @@ -129,6 +126,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Apr 3 2013 Alexey Kurov - 5.6.2-1 +- Crypto++ 5.6.2 +- License: Boost + * Wed Feb 13 2013 Fedora Release Engineering - 5.6.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index f060461..3f53261 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -96cbeba0907562b077e26bcffb483828 cryptopp561.zip +7ed022585698df48e65ce9218f6c6a67 cryptopp562.zip