rpms/cryptopp/devel cryptopp-5.6.0-autotools.patch, NONE, 1.1 cryptopp-5.6.0-gcc4.3.patch, NONE, 1.1 cryptopp-5.6.0-nomars.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 cryptopp.spec, 1.2, 1.3 sources, 1.2, 1.3 cryptopp-5.5.2-autotools.patch, 1.1, NONE cryptopp-5.5.2-gcc4.3.patch, 1.1, NONE cryptopp-5.5.2-nomars.patch, 1.1, NONE
Aurelien Bompard
abompard at fedoraproject.org
Sat Mar 21 10:03:55 UTC 2009
Author: abompard
Update of /cvs/pkgs/rpms/cryptopp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15983
Modified Files:
.cvsignore cryptopp.spec sources
Added Files:
cryptopp-5.6.0-autotools.patch cryptopp-5.6.0-gcc4.3.patch
cryptopp-5.6.0-nomars.patch
Removed Files:
cryptopp-5.5.2-autotools.patch cryptopp-5.5.2-gcc4.3.patch
cryptopp-5.5.2-nomars.patch
Log Message:
* Sun Mar 15 2009 Aurelien Bompard <abompard at fedoraproject.org> 5.6.0-1
- version 5.6.0
- rediff patches
cryptopp-5.6.0-autotools.patch:
--- NEW FILE cryptopp-5.6.0-autotools.patch ---
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 at 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
cryptopp-5.6.0-gcc4.3.patch:
--- NEW FILE cryptopp-5.6.0-gcc4.3.patch ---
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 <cstring>
#include "cryptlib.h"
#include "smartptr.h"
#include <string.h> // for memcpy and memmove
cryptopp-5.6.0-nomars.patch:
--- NEW FILE cryptopp-5.6.0-nomars.patch ---
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<SymmetricCipher>("Serpent/CTR");
BenchMarkByName<SymmetricCipher>("CAST-256/CTR");
BenchMarkByName<SymmetricCipher>("RC6/CTR");
- BenchMarkByName<SymmetricCipher>("MARS/CTR");
BenchMarkByName<SymmetricCipher>("SHACAL-2/CTR", 16);
BenchMarkByName<SymmetricCipher>("SHACAL-2/CTR", 64);
BenchMarkByName<SymmetricCipher>("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<CTR_Mode<Serpent> >();
RegisterSymmetricCipherDefaultFactories<CTR_Mode<CAST256> >();
RegisterSymmetricCipherDefaultFactories<CTR_Mode<RC6> >();
- RegisterSymmetricCipherDefaultFactories<CTR_Mode<MARS> >();
RegisterSymmetricCipherDefaultFactories<CTR_Mode<SHACAL2> >();
RegisterSymmetricCipherDefaultFactories<CTR_Mode<DES> >();
RegisterSymmetricCipherDefaultFactories<CTR_Mode<DES_XEX3> >();
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<MARSEncryption, MARSDecryption>(16), valdata, 4) && pass;
- pass = BlockTransformationTest(FixedRoundsCipherFactory<MARSEncryption, MARSDecryption>(24), valdata, 3) && pass;
- pass = BlockTransformationTest(FixedRoundsCipherFactory<MARSEncryption, MARSDecryption>(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();
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cryptopp/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 27 Oct 2008 06:22:34 -0000 1.2
+++ .cvsignore 21 Mar 2009 10:03:24 -0000 1.3
@@ -1 +1 @@
-cryptopp552.zip
+cryptopp560.zip
Index: cryptopp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cryptopp/devel/cryptopp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cryptopp.spec 24 Feb 2009 09:52:10 -0000 1.2
+++ cryptopp.spec 21 Mar 2009 10:03:25 -0000 1.3
@@ -1,17 +1,17 @@
Name: cryptopp
-Version: 5.5.2
-Release: 4%{?dist}
+Version: 5.6.0
+Release: 1%{?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/cryptopp552.zip
+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
-Patch0: cryptopp-5.5.2-autotools.patch
-Patch1: cryptopp-5.5.2-gcc4.3.patch
+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.5.2-nomars.patch
+Patch2: cryptopp-5.6.0-nomars.patch
BuildRequires: doxygen, autoconf, libtool
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -84,7 +84,7 @@
%check
mkdir -p tmp
-cp -a *.dat TestVectors/* tmp
+cp -a TestVectors/* tmp
(cd tmp && ../cryptest v > cryptest.log 2>&1 && \
test ! -z "`grep -q '^FAILED' cryptest.log`" || exit 1)
rm -r tmp
@@ -115,10 +115,13 @@
%files progs
%defattr(0644,root,root,0755)
%attr(0755,root,root) %{_bindir}/cryptest
-%{_datadir}/cryptopp
%changelog
+* Sun Mar 15 2009 Aurelien Bompard <abompard at fedoraproject.org> 5.6.0-1
+- version 5.6.0
+- rediff patches
+
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.5.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cryptopp/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 27 Oct 2008 06:22:34 -0000 1.2
+++ sources 21 Mar 2009 10:03:25 -0000 1.3
@@ -1 +1 @@
-a24a59a645c0951210d7f31496954a5f cryptopp552.zip
+84c4217a27f05303cdb1dc2af7182dba cryptopp560.zip
--- cryptopp-5.5.2-autotools.patch DELETED ---
--- cryptopp-5.5.2-gcc4.3.patch DELETED ---
--- cryptopp-5.5.2-nomars.patch DELETED ---
More information about the fedora-extras-commits
mailing list