[cryptopp] Crypto++ 5.6.2
nucleo
nucleo at fedoraproject.org
Wed Apr 3 17:48:16 UTC 2013
commit 07ddf35475445524cfae5d81c317372c9ed8b7af
Author: nucleo <nucleo at fedoraproject.org>
Date: Wed Apr 3 20:48:12 2013 +0300
Crypto++ 5.6.2
- License: Boost
.gitignore | 1 +
cryptopp-5.6.1-gcc-4.7.0.patch | 97 --------------------
...6.1-autotools.patch => cryptopp-autotools.patch | 6 +-
cryptopp-data-files-location.patch | 43 +++++----
cryptopp-5.6.1-s390.patch => cryptopp-s390.patch | 0
cryptopp.pc | 2 +-
cryptopp.spec | 21 ++--
sources | 2 +-
8 files changed, 42 insertions(+), 130 deletions(-)
---
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-autotools.patch
similarity index 97%
rename from cryptopp-5.6.1-autotools.patch
rename to cryptopp-autotools.patch
index 4900aac..3d54344 100644
--- a/cryptopp-5.6.1-autotools.patch
+++ b/cryptopp-autotools.patch
@@ -1,7 +1,7 @@
--- 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 at googlegroups.com])
++AC_INIT([cryptopp], [5.6.2], [cryptopp-users at googlegroups.com])
+AM_INIT_AUTOMAKE
+AC_CONFIG_SRCDIR(configure.ac)
+AC_CONFIG_HEADER([local.h])
@@ -16,7 +16,7 @@
+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 @@
+@@ -0,0 +1,307 @@
+AUTOMAKE_OPTIONS = foreign
+lib_LTLIBRARIES = libcryptopp.la
+libcryptopp_la_LIBADD = -lpthread
@@ -141,6 +141,7 @@
+ zdeflate.cpp \
+ zinflate.cpp \
+ zlib.cpp \
++ sha3.cpp \
+ mars.cpp \
+ marss.cpp
+
@@ -275,6 +276,7 @@
+ zdeflate.h \
+ zinflate.h \
+ zlib.h \
++ sha3.h \
+ mars.h
+
+
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<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);
- #endif
+
cout << "\n<TBODY style=\"background: white\">";
{
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<TwofishEncryption, TwofishDecryption>(16), valdata, 4) && pass;
pass = BlockTransformationTest(FixedRoundsCipherFactory<TwofishEncryption, TwofishDecryption>(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<SerpentEncryption, SerpentDecryption>(16), valdata, 4) && pass;
- pass = BlockTransformationTest(FixedRoundsCipherFactory<SerpentEncryption, SerpentDecryption>(24), valdata, 3) && pass;
-@@ -1192,7 +1192,7 @@
+ pass = BlockTransformationTest(FixedRoundsCipherFactory<SerpentEncryption, SerpentDecryption>(16), valdata, 5) && pass;
+ pass = BlockTransformationTest(FixedRoundsCipherFactory<SerpentEncryption, SerpentDecryption>(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<SHA>::Signer privS(f);
privS.AccessKey().Precompute();
NR<SHA>::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<SHA>::Signer priv(fs);
- priv.AccessKey().Precompute(16);
- GDSA<SHA>::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-5.6.1-s390.patch b/cryptopp-s390.patch
similarity index 100%
rename from cryptopp-5.6.1-s390.patch
rename to cryptopp-s390.patch
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 <nucleo at fedoraproject.org> - 5.6.2-1
+- Crypto++ 5.6.2
+- License: Boost
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 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
More information about the scm-commits
mailing list