rpms/cryptopp/F-9 cryptopp-5.5.2-autotools.patch, NONE, 1.1 cryptopp-5.5.2-gcc4.3.patch, NONE, 1.1 cryptopp-5.5.2-nomars.patch, NONE, 1.1 cryptopp-remove-patented-code.sh, NONE, 1.1 cryptopp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Aurelien Bompard
abompard at fedoraproject.org
Mon Oct 27 06:32:07 UTC 2008
- Previous message (by thread): rpms/cryptopp/F-8 cryptopp-5.5.2-autotools.patch, NONE, 1.1 cryptopp-5.5.2-gcc4.3.patch, NONE, 1.1 cryptopp-5.5.2-nomars.patch, NONE, 1.1 cryptopp-remove-patented-code.sh, NONE, 1.1 cryptopp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/kernel/devel drm-modesetting-radeon.patch, 1.40, 1.41 kernel.spec, 1.1087, 1.1088
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: abompard
Update of /cvs/pkgs/rpms/cryptopp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8477/F-9
Modified Files:
.cvsignore sources
Added Files:
cryptopp-5.5.2-autotools.patch cryptopp-5.5.2-gcc4.3.patch
cryptopp-5.5.2-nomars.patch cryptopp-remove-patented-code.sh
cryptopp.spec
Log Message:
initial import
cryptopp-5.5.2-autotools.patch:
--- NEW FILE cryptopp-5.5.2-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,331 @@
+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 \
+ base32.cpp \
+ base64.cpp \
+ basecode.cpp \
+ bfinit.cpp \
+ blowfish.cpp \
+ blumshub.cpp \
+ camellia.cpp \
+ cast.cpp \
+ casts.cpp \
+ cbcmac.cpp \
+ channels.cpp \
+ cpu.cpp \
+ crc.cpp \
+ cryptlib.cpp \
+ default.cpp \
+ des.cpp \
+ dessp.cpp \
+ dh.cpp \
+ dh2.cpp \
+ dll.cpp \
+ dsa.cpp \
+ ec2n.cpp \
+ eccrypto.cpp \
+ ecp.cpp \
+ elgamal.cpp \
+ emsa2.cpp \
+ eprecomp.cpp \
+ esign.cpp \
+ files.cpp \
+ filters.cpp \
+ fips140.cpp \
+ fipstest.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 \
+ 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 \
+ base32.h \
+ base64.h \
+ basecode.h \
+ bench.h \
+ blowfish.h \
+ blumshub.h \
+ camellia.h \
+ cast.h \
+ cbcmac.h \
+ channels.h \
+ config.h \
+ cpu.h \
+ crc.h \
+ cryptlib.h \
+ default.h \
+ des.h \
+ dh2.h \
+ dh.h \
+ dll.h \
+ dmac.h \
+ dsa.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 \
+ 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 \
+ 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
+
+pkgdata_DATA = \
+ 3desval.dat \
+ 3wayval.dat \
+ camellia.dat \
+ cast128v.dat \
+ cast256v.dat \
+ descert.dat \
+ dh1024.dat \
+ dh2048.dat \
+ dlie1024.dat \
+ dlie2048.dat \
+ dsa1024b.dat \
+ dsa1024.dat \
+ dsa512.dat \
+ elgc1024.dat \
+ esig1023.dat \
+ esig1536.dat \
+ esig2046.dat \
+ gostval.dat \
+ ideaval.dat \
+ luc1024.dat \
+ luc2048.dat \
+ lucc1024.dat \
+ lucc512.dat \
+ lucd1024.dat \
+ lucd512.dat \
+ lucs1024.dat \
+ lucs512.dat \
+ mqv1024.dat \
+ mqv2048.dat \
+ nr1024.dat \
+ nr2048.dat \
+ rabi1024.dat \
+ rabi2048.dat \
+ rc2val.dat \
+ rc5val.dat \
+ rc6val.dat \
+ rijndael.dat \
+ rsa1024.dat \
+ rsa2048.dat \
+ rsa400pb.dat \
+ rsa400pv.dat \
+ rsa512a.dat \
+ rw1024.dat \
+ rw2048.dat \
+ saferval.dat \
+ serpentv.dat \
+ shacal2v.dat \
+ sharkval.dat \
+ skipjack.dat \
+ squareva.dat \
+ twofishv.dat \
+ usage.dat \
+ xtrdh171.dat \
+ xtrdh342.dat
+
+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.5.2-gcc4.3.patch:
--- NEW FILE cryptopp-5.5.2-gcc4.3.patch ---
diff -up ./misc.h.gcc4.3 ./misc.h
--- ./misc.h.gcc4.3 2007-09-25 00:30:34.000000000 +0200
+++ ./misc.h 2008-09-22 19:41:56.000000000 +0200
@@ -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.5.2-nomars.patch:
--- NEW FILE cryptopp-5.5.2-nomars.patch ---
diff -up ./bench.cpp.nomars ./bench.cpp
--- ./bench.cpp.nomars 2008-09-12 18:30:58.000000000 +0200
+++ ./bench.cpp 2008-09-12 18:31:11.000000000 +0200
@@ -13,7 +13,6 @@
#include "cast.h"
#include "seal.h"
#include "rc6.h"
-#include "mars.h"
#include "twofish.h"
#include "serpent.h"
#include "skipjack.h"
@@ -319,7 +318,6 @@ void BenchmarkAll(double t, double hertz
BenchMarkKeyed<Serpent::Encryption>("Serpent", t);
BenchMarkKeyed<CAST256::Encryption>("CAST-256", t);
BenchMarkKeyed<RC6::Encryption>("RC6", t);
- BenchMarkKeyed<MARS::Encryption>("MARS", t);
BenchMarkByName<SymmetricCipher>("SHACAL-2/ECB", 16);
BenchMarkByName<SymmetricCipher>("SHACAL-2/ECB", 64);
BenchMarkKeyed<DES::Encryption>("DES", t);
diff -up ./test.cpp.nomars ./test.cpp
--- ./test.cpp.nomars 2008-09-12 18:32:37.000000000 +0200
+++ ./test.cpp 2008-09-12 18:32:54.000000000 +0200
@@ -816,7 +816,7 @@ 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 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 2008-09-12 18:32:42.000000000 +0200
+++ ./validat1.cpp 2008-09-12 18:33:18.000000000 +0200
@@ -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;
@@ -1066,18 +1064,6 @@ bool ValidateRC6()
return pass;
}
-bool ValidateMARS()
-{
- cout << "\nMARS validation suite running...\n\n";
-
- FileSource valdata("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 validation suite running...\n\n";
diff -up ./validate.h.nomars ./validate.h
--- ./validate.h.nomars 2008-09-12 18:32:47.000000000 +0200
+++ ./validate.h 2008-09-12 18:33:24.000000000 +0200
@@ -42,7 +42,6 @@ bool ValidateCAST();
bool ValidateSquare();
bool ValidateSKIPJACK();
bool ValidateRC6();
-bool ValidateMARS();
bool ValidateRijndael();
bool ValidateTwofish();
bool ValidateSerpent();
--- NEW FILE cryptopp-remove-patented-code.sh ---
#!/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
--- NEW FILE cryptopp.spec ---
Name: cryptopp
Version: 5.5.2
Release: 3%{?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
# 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
# Don't try to build the patented code
Patch2: cryptopp-5.5.2-nomars.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.
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.
%package devel
Summary: Header files and development documentation for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
Crypto++ Library is a free C++ class library of cryptographic schemes.
This package contains the header files and development documentation
for %{name}.
%package doc
Summary: Documentation for %{name}
Group: Documentation
%description doc
Crypto++ Library is a free C++ class library of cryptographic schemes.
This package contains documentation for %{name}.
%package progs
Summary: Programs for manipulating %{name} routines
Group: Development/Tools
%description progs
Crypto++ Library is a free C++ class library of cryptographic schemes.
This package contains programs for manipulating %{name} routines.
%prep
%setup -q -c
%patch2 -p1 -b .nomars
rm -f GNUmakefile
%patch0 -p1
%patch1 -p1 -b .gcc4.3
autoreconf --verbose --force --install
perl -pi -e 's/\r$//g' License.txt Readme.txt
%build
%configure --disable-static
%ifnarch x86_64
# Does not build with PIC by default on x86, see
# http://groups.google.com/group/cryptopp-users/browse_thread/thread/d639907b0b1816b9
sed -i -e '1 i #define CRYPTOPP_DISABLE_SSE2' config.h
%endif
make %{?_smp_mflags}
doxygen
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c "
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%check
mkdir -p tmp
cp -a *.dat TestVectors/* tmp
(cd tmp && ../cryptest v > cryptest.log 2>&1 && \
test ! -z "`grep -q '^FAILED' cryptest.log`" || exit 1)
rm -r tmp
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(0644,root,root,0755)
%doc License.txt Readme.txt
%defattr(-,root,root,0755)
%{_libdir}/*.so.*
%files devel
%defattr(0644,root,root,0755)
%{_includedir}/cryptopp
%defattr(-,root,root,0755)
%{_libdir}/*.so
%files doc
%defattr(0644,root,root,0755)
%doc doc/html/*
%files progs
%defattr(0644,root,root,0755)
%attr(0755,root,root) %{_bindir}/cryptest
%{_datadir}/cryptopp
%changelog
* Tue Sep 30 2008 Aurelien Bompard <abompard at fedoraproject.org> 5.5.2-3
- purge source archive from patented code
- use SSE2 on x86_64
- preserve timestamps on install
* Mon Sep 22 2008 Aurelien Bompard <abompard at fedoraproject.org> 5.5.2-2
- rediff gcc 4.3 patch
* Wed Aug 27 2008 Aurelien Bompard <abompard at fedoraproject.org> 5.5.2-1
- adapt to fedora, from Mandriva
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cryptopp/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 27 Oct 2008 04:22:40 -0000 1.1
+++ .cvsignore 27 Oct 2008 06:31:36 -0000 1.2
@@ -0,0 +1 @@
+cryptopp552.zip
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cryptopp/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 27 Oct 2008 04:22:40 -0000 1.1
+++ sources 27 Oct 2008 06:31:36 -0000 1.2
@@ -0,0 +1 @@
+a24a59a645c0951210d7f31496954a5f cryptopp552.zip
- Previous message (by thread): rpms/cryptopp/F-8 cryptopp-5.5.2-autotools.patch, NONE, 1.1 cryptopp-5.5.2-gcc4.3.patch, NONE, 1.1 cryptopp-5.5.2-nomars.patch, NONE, 1.1 cryptopp-remove-patented-code.sh, NONE, 1.1 cryptopp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/kernel/devel drm-modesetting-radeon.patch, 1.40, 1.41 kernel.spec, 1.1087, 1.1088
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list