LOG New version 5.6.2

This commit is contained in:
Andrey Bondrov 2014-02-11 20:29:53 +11:00
parent ad5f9e426f
commit 8f206ecec9
8 changed files with 81 additions and 243 deletions

View file

@ -1,2 +1,2 @@
sources:
"cryptopp561.zip": 31dbb456c21f50865218c57b7eaf4c955a222ba1
cryptopp562.zip: ddc18ae41c2c940317cd6efe81871686846fa293

View file

@ -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 <class EC>
--- 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<EC> &params, 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<EC> &params)
- {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>(ec, G, n));}
+ {this->GenerateRandom(rng, DL_GroupParameters_EC<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;

View file

@ -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

View file

@ -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@googlegroups.com])
+AC_INIT([cryptopp], [5.6.2], [cryptopp-users@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
+
+

View file

@ -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;
{

View file

@ -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:

View file

@ -2,26 +2,23 @@
%define libname %mklibname %{name} %{major}
%define devname %mklibname %{name} -d
%define staticname %mklibname %{name} -s -d
%define fver %(echo %version |sed s/\\\\.//g)
%define fver %(echo %{version} |sed s/\\\\.//g)
Name: cryptopp
Version: 5.6.1
Release: 1
Epoch: 0
Summary: Public domain C++ class library of cryptographic schemes
Name: cryptopp
Version: 5.6.2
Release: 1
License: Public Domain
Group: System/Libraries
URL: http://www.cryptopp.com/
Url: http://www.cryptopp.com/
Source0: http://www.cryptopp.com/%{name}%{fver}.zip
Source1: cryptopp.pc
Patch0: cryptopp-5.6.1-autotools.patch
Patch1: cryptopp-5.6.1-s390.patch
Patch0: cryptopp-5.6.2-autotools.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
Patch1: cryptopp-5.6.2-data-files-location.patch
# Enable SSE2 only on x86_64
Patch3: cryptopp-x86-disable-sse2.patch
Patch4: cryptopp-5.6.1-gcc-4.7.0.patch
Patch2: cryptopp-5.6.2-x86-disable-sse2.patch
BuildRequires: doxygen
%description
@ -85,9 +82,11 @@ Crypto++ was either written specifically for this project by its
contributors and placed in the public domain, or derived from other
sources that are public domain (again with the exception of mars.cpp).
#----------------------------------------------------------------------------
%package -n %{libname}
Group: System/Libraries
Summary: Base shared library part of %{name}
Group: System/Libraries
%description -n %{libname}
Crypto++ Library is a free C++ class library of cryptographic schemes.
@ -95,6 +94,11 @@ Crypto++ Library is a free C++ class library of cryptographic schemes.
This package contains the library needed to run programs dynamically
linked with %{name}.
%files -n %{libname}
%{_libdir}/libcryptopp.so.%{major}*
#----------------------------------------------------------------------------
%package -n %{devname}
Summary: Header files and development documentation for %{name}
Group: Development/C++
@ -106,6 +110,13 @@ Crypto++ Library is a free C++ class library of cryptographic schemes.
This package contains the header files and development documentation
for %{name}.
%files -n %{devname}
%{_includedir}/%{name}
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
#----------------------------------------------------------------------------
%package -n %{staticname}
Summary: Static libraries for programs which will use %{name}
Group: Development/C++
@ -116,6 +127,11 @@ Crypto++ Library is a free C++ class library of cryptographic schemes.
This package contains the static library for %{name}.
%files -n %{staticname}
%{_libdir}/*.a
#----------------------------------------------------------------------------
%package doc
Summary: Documentation for %{name}
Group: Development/C++
@ -126,6 +142,11 @@ Crypto++ Library is a free C++ class library of cryptographic schemes.
This package contains documentation for %{name}.
%files doc
%doc doc/html License.txt Readme.txt
#----------------------------------------------------------------------------
%package progs
Summary: Programs for manipulating %{name} routines
Group: Development/Other
@ -136,115 +157,42 @@ Crypto++ Library is a free C++ class library of cryptographic schemes.
This package contains programs for manipulating %{name} routines.
%files progs
%{_bindir}/cryptest
%{_datadir}/%{name}
#----------------------------------------------------------------------------
%prep
%setup -qc
%__rm -f GNUmakefile
rm -f GNUmakefile
%patch0 -p1 -b .autotools
%patch1 -p1 -b .s390
%patch2 -p1 -b .data-files-location
%patch3 -p0 -b .x86-disable-sse2
%patch4 -p1 -b .gcc47
%patch1 -p1 -b .data-files-location
%patch2 -p0 -b .x86-disable-sse2
%build
autoreconf -fi
%configure2_5x
%make
%{_bindir}/doxygen
doxygen
%install
%__rm -rf %{buildroot}
%makeinstall_std
%__perl -pi -e 's/\r$//g' License.txt Readme.txt
sed -i -e 's/\r$//g' License.txt Readme.txt
# Install pkg-config file
%__install -D -m 0644 %{SOURCE1} %{buildroot}%{_libdir}/pkgconfig/cryptopp.pc
install -D -m 0644 %{SOURCE1} %{buildroot}%{_libdir}/pkgconfig/cryptopp.pc
# Set variables
%__sed -i "s|@PREFIX@|%{_prefix}|g;s|@LIBDIR@|%{_libdir}|g;s|@INCLUDEDIR@|%{_includedir}|g" %{buildroot}%{_libdir}/pkgconfig/cryptopp.pc
sed -i "s|@PREFIX@|%{_prefix}|g;s|@LIBDIR@|%{_libdir}|g;s|@INCLUDEDIR@|%{_includedir}|g" %{buildroot}%{_libdir}/pkgconfig/cryptopp.pc
%__install -d %{buildroot}%{_datadir}/%{name}/TestVectors
%__install -m 0644 TestVectors/* %{buildroot}%{_datadir}/%{name}/TestVectors
%__install -d %{buildroot}%{_datadir}/%{name}/TestData
%__install -m 0644 TestData/* %{buildroot}%{_datadir}/%{name}/TestData
install -d %{buildroot}%{_datadir}/%{name}/TestVectors
install -m 0644 TestVectors/* %{buildroot}%{_datadir}/%{name}/TestVectors
install -d %{buildroot}%{_datadir}/%{name}/TestData
install -m 0644 TestData/* %{buildroot}%{_datadir}/%{name}/TestData
%__rm -f %{buildroot}%{_bindir}/cryptestcwd
rm -f %{buildroot}%{_bindir}/cryptestcwd
%check
./cryptestcwd v
%files -n %{libname}
%{_libdir}/*.so.%{major}*
%files -n %{devname}
%{_includedir}/%{name}
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%files -n %{staticname}
%{_libdir}/*.a
%files doc
%defattr(0644,root,root,0755)
%doc doc/html License.txt Readme.txt
%files progs
%{_bindir}/cryptest
%{_datadir}/%{name}
%changelog
* Thu Jun 28 2012 Andrey Bondrov <abondrov@mandriva.org> 0:5.6.1-1
+ Revision: 807338
- New version 5.6.1, sync patches with Fedora
+ <ze@mandriva.org>
- new version 5.6.1
- update depencies for the new name
- add .pc file
- clean -la files
- move text files from lib package into doc package
+ Funda Wang <fwang@mandriva.org>
- clean spec file
- rediff gcc43 patch
+ Thierry Vignaud <tv@mandriva.org>
- rebuild
* Thu Oct 23 2008 Götz Waschk <waschk@mandriva.org> 0:5.5.2-3mdv2009.1
+ Revision: 296718
- really update to 5.5.2
* Fri Aug 08 2008 Thierry Vignaud <tv@mandriva.org> 0:5.5.2-2mdv2009.0
+ Revision: 267807
- rebuild early 2009.0 package (before pixel changes)
* Thu Jun 12 2008 Götz Waschk <waschk@mandriva.org> 0:5.5.2-1mdv2009.0
+ Revision: 218494
- new version
- patch for gcc 4.3
- new devel name
- fix obsoletes
+ Pixel <pixel@mandriva.com>
- do not call ldconfig in %%post/%%postun, it is now handled by filetriggers
+ Olivier Blin <blino@mandriva.org>
- restore BuildRoot
+ Thierry Vignaud <tv@mandriva.org>
- kill re-definition of %%buildroot on Pixel's request
* Mon Sep 17 2007 David Walluck <walluck@mandriva.org> 0:5.5.1-2mdv2008.0
+ Revision: 88832
- add some cryptopp Provides
* Sat Jun 02 2007 David Walluck <walluck@mandriva.org> 0:5.5.1-1mdv2008.0
+ Revision: 34430
- 5.5.1
- change so version to 6:0:0 to match Debian
* Sun May 06 2007 David Walluck <walluck@mandriva.org> 0:5.5-1mdv2008.0
+ Revision: 23769
- 5.5