From 4213df8545c4be639f6da917386d8d3093077aa4 Mon Sep 17 00:00:00 2001 From: nucleo Date: Dec 17 2009 14:55:13 +0000 Subject: Update to svn r479 --- diff --git a/.cvsignore b/.cvsignore index da52d37..ed4aeea 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -cryptopp560.zip -cryptopp.pc +cryptopp-5.6.1.svn479.tar.bz2 diff --git a/cryptopp-5.6.0-autotools.patch b/cryptopp-5.6.0-autotools.patch deleted file mode 100644 index 7bf0864..0000000 --- a/cryptopp-5.6.0-autotools.patch +++ /dev/null @@ -1,309 +0,0 @@ -Files libcryptopp-5.2.1.old/a.out and libcryptopp-5.2.1/a.out differ -diff --exclude config.guess --exclude config.sub -uNr libcryptopp-5.2.1.old/configure.in libcryptopp-5.2.1/configure.in ---- libcryptopp-5.2.1.old/configure.ac 1969-12-31 19:00:00.000000000 -0500 -+++ libcryptopp-5.2.1/configure.ac 2005-08-02 14:02:30.000000000 -0400 -@@ -0,0 +1,13 @@ -+AC_INIT([cryptopp], [5.5.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) -diff --exclude config.guess --exclude config.sub -uNr libcryptopp-5.2.1.old/Makefile.am libcryptopp-5.2.1/Makefile.am ---- libcryptopp-5.2.1.old/Makefile.am 1969-12-31 19:00:00.000000000 -0500 -+++ libcryptopp-5.2.1/Makefile.am 2005-08-02 14:02:30.000000000 -0400 -@@ -0,0 +1,287 @@ -+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 -+ -+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 -+ -+ -+noinst_HEADERS = \ -+ local.h \ -+ resource.h \ -+ serpentp.h -+ validate.h -+ -+bin_PROGRAMS = cryptest -+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) -+ -+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.0-gcc4.3.patch b/cryptopp-5.6.0-gcc4.3.patch deleted file mode 100644 index f96b9ce..0000000 --- a/cryptopp-5.6.0-gcc4.3.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up ./misc.h.gcc4.3 ./misc.h ---- ./misc.h.gcc4.3 2009-03-15 02:48:00.000000000 +0100 -+++ ./misc.h 2009-03-20 23:00:14.000000000 +0100 -@@ -1,6 +1,7 @@ - #ifndef CRYPTOPP_MISC_H - #define CRYPTOPP_MISC_H - -+#include - #include "cryptlib.h" - #include "smartptr.h" - #include // for memcpy and memmove diff --git a/cryptopp-5.6.0-nomars.patch b/cryptopp-5.6.0-nomars.patch deleted file mode 100644 index b2ec9b0..0000000 --- a/cryptopp-5.6.0-nomars.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff -up ./bench.cpp.nomars ./bench.cpp ---- ./bench.cpp.nomars 2009-03-15 02:48:00.000000000 +0100 -+++ ./bench.cpp 2009-03-20 22:55:22.000000000 +0100 -@@ -291,7 +291,6 @@ void BenchmarkAll(double t, double hertz - BenchMarkByName("Serpent/CTR"); - BenchMarkByName("CAST-256/CTR"); - BenchMarkByName("RC6/CTR"); -- BenchMarkByName("MARS/CTR"); - BenchMarkByName("SHACAL-2/CTR", 16); - BenchMarkByName("SHACAL-2/CTR", 64); - BenchMarkByName("DES/CTR"); -diff -up ./regtest.cpp.nomars ./regtest.cpp ---- ./regtest.cpp.nomars 2009-03-20 22:57:41.000000000 +0100 -+++ ./regtest.cpp 2009-03-20 22:57:48.000000000 +0100 -@@ -32,7 +32,6 @@ - #include "serpent.h" - #include "cast.h" - #include "rc6.h" --#include "mars.h" - #include "shacal2.h" - #include "des.h" - #include "idea.h" -@@ -120,7 +119,6 @@ void RegisterFactories() - RegisterSymmetricCipherDefaultFactories >(); - RegisterSymmetricCipherDefaultFactories >(); - RegisterSymmetricCipherDefaultFactories >(); -- RegisterSymmetricCipherDefaultFactories >(); - RegisterSymmetricCipherDefaultFactories >(); - RegisterSymmetricCipherDefaultFactories >(); - RegisterSymmetricCipherDefaultFactories >(); -diff -up ./test.cpp.nomars ./test.cpp ---- ./test.cpp.nomars 2009-03-15 02:48:00.000000000 +0100 -+++ ./test.cpp 2009-03-20 22:55:46.000000000 +0100 -@@ -810,7 +810,6 @@ bool Validate(int alg, bool thorough, co - case 36: result = ValidateSquare(); break; - case 37: result = ValidateRC2(); break; - case 38: result = ValidateRC6(); break; -- case 39: result = ValidateMARS(); break; - case 40: result = ValidateRW(); break; - case 41: result = ValidateMD2(); break; - case 42: result = ValidateNR(); break; -diff -up ./validat1.cpp.nomars ./validat1.cpp ---- ./validat1.cpp.nomars 2009-03-15 02:48:02.000000000 +0100 -+++ ./validat1.cpp 2009-03-20 22:56:20.000000000 +0100 -@@ -25,7 +25,6 @@ - #include "square.h" - #include "seal.h" - #include "rc6.h" --#include "mars.h" - #include "rijndael.h" - #include "twofish.h" - #include "serpent.h" -@@ -84,7 +83,6 @@ bool ValidateAll(bool thorough) - pass=ValidateSKIPJACK() && pass; - pass=ValidateSEAL() && pass; - pass=ValidateRC6() && pass; -- pass=ValidateMARS() && pass; - pass=ValidateRijndael() && pass; - pass=ValidateTwofish() && pass; - pass=ValidateSerpent() && pass; -@@ -1102,18 +1100,6 @@ bool ValidateRC6() - return pass; - } - --bool ValidateMARS() --{ -- cout << "\nMARS validation suite running...\n\n"; -- -- FileSource valdata("TestData/marsval.dat", true, new HexDecoder); -- bool pass = true; -- pass = BlockTransformationTest(FixedRoundsCipherFactory(16), valdata, 4) && pass; -- pass = BlockTransformationTest(FixedRoundsCipherFactory(24), valdata, 3) && pass; -- pass = BlockTransformationTest(FixedRoundsCipherFactory(32), valdata, 2) && pass; -- return pass; --} -- - bool ValidateRijndael() - { - cout << "\nRijndael (AES) validation suite running...\n\n"; -diff -up ./validate.h.nomars ./validate.h ---- ./validate.h.nomars 2009-03-01 19:44:00.000000000 +0100 -+++ ./validate.h 2009-03-20 22:56:38.000000000 +0100 -@@ -42,7 +42,6 @@ bool ValidateCAST(); - bool ValidateSquare(); - bool ValidateSKIPJACK(); - bool ValidateRC6(); --bool ValidateMARS(); - bool ValidateRijndael(); - bool ValidateTwofish(); - bool ValidateSerpent(); diff --git a/cryptopp-5.6.0-s390.patch b/cryptopp-5.6.0-s390.patch deleted file mode 100644 index 8791262..0000000 --- a/cryptopp-5.6.0-s390.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- cryptopp-5.6.0/config.h.orig 2009-06-09 07:53:08.000000000 +0200 -+++ cryptopp-5.6.0/config.h 2009-06-09 07:54:24.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(__mips__) || (defined(__MWERKS__) && !defined(__INTEL__))) -+#if !defined(IS_LITTLE_ENDIAN) && (defined(__BIG_ENDIAN__) || defined(__sparc) || defined(__sparc__) || defined(__hppa__) || defined(__mips__) || defined(__s390__) || (defined(__MWERKS__) && !defined(__INTEL__))) - # define IS_BIG_ENDIAN - #endif - -@@ -127,7 +127,7 @@ const lword LWORD_MAX = W64LIT(0xfffffff - 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-5.6.1-autotools.patch b/cryptopp-5.6.1-autotools.patch new file mode 100644 index 0000000..ed8815b --- /dev/null +++ b/cryptopp-5.6.1-autotools.patch @@ -0,0 +1,309 @@ +--- cryptopp-5.6.1/configure.ac 1969-12-31 19:00:00.000000000 -0500 ++++ cryptopp-5.6.1/configure.ac 2005-08-02 14:02:30.000000000 -0400 +@@ -0,0 +1,13 @@ ++AC_INIT([cryptopp], [5.5.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 1969-12-31 19:00:00.000000000 -0500 ++++ cryptopp-5.6.1/Makefile.am 2005-08-02 14:02:30.000000000 -0400 +@@ -0,0 +1,290 @@ ++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 ++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) ++ ++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-s390.patch b/cryptopp-5.6.1-s390.patch new file mode 100644 index 0000000..7f20db0 --- /dev/null +++ b/cryptopp-5.6.1-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-remove-patented-code.sh b/cryptopp-remove-patented-code.sh deleted file mode 100644 index f071325..0000000 --- a/cryptopp-remove-patented-code.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -archive=$1 -dir=cryptopp-nopatent - -rm -rf $dir -unzip -qd $dir $archive -rm -f $archive -pushd $dir -rm -f mars.* marss.* -zip -qr ../$archive * -popd diff --git a/cryptopp.pc b/cryptopp.pc new file mode 100644 index 0000000..ba58805 --- /dev/null +++ b/cryptopp.pc @@ -0,0 +1,12 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: Crypto++ +Description: General purpose cryptographic shared library +URL: http://www.cryptopp.com +Version: 5.6.1 +Requires: +Libs: -lcryptopp +Cflags: diff --git a/cryptopp.spec b/cryptopp.spec index ab9f26b..7ef1aae 100644 --- a/cryptopp.spec +++ b/cryptopp.spec @@ -1,34 +1,30 @@ Name: cryptopp -Version: 5.6.0 -Release: 4%{?dist} +Version: 5.6.1 +Release: 0.1.svn479%{?dist} Summary: Public domain C++ class library of cryptographic schemes License: Public Domain Group: System Environment/Libraries URL: http://www.cryptopp.com/ -Source0: http://www.cryptopp.com/cryptopp560.zip -# Used to purge the source from patented code, see http://www.cryptopp.com/License.txt -Source10: cryptopp-remove-patented-code.sh -Source2: cryptopp.pc -Patch0: cryptopp-5.6.0-autotools.patch -Patch1: cryptopp-5.6.0-gcc4.3.patch -# Don't try to build the patented code -Patch2: cryptopp-5.6.0-nomars.patch -# Add support for s390/s390x -Patch3: cryptopp-5.6.0-s390.patch +#Source0: http://www.cryptopp.com/cryptopp560.zip + +# The source for this package was pulled from upstream's vcs. +# Use the following commands to generate the tarball: +# svn export -r 479 https://cryptopp.svn.sourceforge.net/svnroot/cryptopp/trunk/c5 cryptopp +# tar -cjf cryptopp-5.6.1.svn479.tar.bz2 cryptopp +Source0: cryptopp-5.6.1.svn479.tar.bz2 +Source1: cryptopp.pc +Patch0: cryptopp-5.6.1-autotools.patch +Patch1: cryptopp-5.6.1-s390.patch BuildRequires: doxygen, autoconf, libtool BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description -Crypto++ Library is a free C++ class library of cryptographic schemes. +Crypto++ Library is a free C++ class library of cryptographic schemes. See http://www.cryptopp.com/ for a list of supported algorithms. -One purpose of Crypto++ is to act as a repository of public domain -(not copyrighted) source code. Although the library is copyrighted as a -compilation, the individual files in it (except for a few exceptions listed -in the license) are in the public domain. - -The MARS implementation may be subjected to patents, therefore it has been -removed from this package. +One purpose of Crypto++ is to act as a repository of public domain +(not copyrighted) source code. Although the library is copyrighted as a +compilation, the individual files in it are in the public domain. %package devel @@ -54,6 +50,7 @@ This package contains documentation for %{name}. %package progs Summary: Programs for manipulating %{name} routines Group: Development/Tools +Requires: %{name} = %{version}-%{release} %description progs Crypto++ Library is a free C++ class library of cryptographic schemes. @@ -62,14 +59,12 @@ This package contains programs for manipulating %{name} routines. %prep -cp %{SOURCE2} . +cp %{SOURCE1} . -%setup -q -c -%patch2 -p1 -b .nomars +%setup -q -n %{name} rm -f GNUmakefile %patch0 -p1 -%patch1 -p1 -b .gcc4.3 -%patch3 -p1 -b .s390 +%patch1 -p1 -b .s390 autoreconf --verbose --force --install perl -pi -e 's/\r$//g' License.txt Readme.txt @@ -86,7 +81,7 @@ doxygen %install rm -rf $RPM_BUILD_ROOT -install -D -m644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/pkgconfig/cryptopp.pc +install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/cryptopp.pc make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c " find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' @@ -112,7 +107,7 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/cryptopp %defattr(-,root,root,0755) %{_libdir}/*.so -%{_datadir}/pkgconfig/cryptopp.pc +%{_libdir}/pkgconfig/cryptopp.pc %files doc %defattr(0644,root,root,0755) @@ -124,6 +119,13 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Nov 26 2009 Alexey Kurov - 5.6.1-0.1.svn479 +- svn r479. MARS placed in the public domain by Wei Dai +- Fixes rhbz#539227 + +* Fri Oct 30 2009 Rahul Sundaram 5.6.0-5 +- Fix source + * Wed Oct 28 2009 Rahul Sundaram 5.6.0-4 - Add pkgconfig file. Fixes rhbz#512761 diff --git a/sources b/sources index 77ae498..2b5e9cb 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -84c4217a27f05303cdb1dc2af7182dba cryptopp560.zip -2827f76ed490b65d233a3d89c87d3c65 cryptopp.pc +caedd2488d642f839a1d5169a28b0d01 cryptopp-5.6.1.svn479.tar.bz2