[92132] trunk/dports/devel/libcryptopp

raphael at macports.org raphael at macports.org
Thu Apr 19 10:11:35 PDT 2012


Revision: 92132
          https://trac.macports.org/changeset/92132
Author:   raphael at macports.org
Date:     2012-04-19 10:11:35 -0700 (Thu, 19 Apr 2012)
Log Message:
-----------
libcryptopp:
 * indicate license
 * use rmd160 and sha256 checksums
 * fix for building with clang
 * use the right compiler; fixes #34125

Modified Paths:
--------------
    trunk/dports/devel/libcryptopp/Portfile

Added Paths:
-----------
    trunk/dports/devel/libcryptopp/files/patch-name_lookup.diff

Modified: trunk/dports/devel/libcryptopp/Portfile
===================================================================
--- trunk/dports/devel/libcryptopp/Portfile	2012-04-19 16:41:47 UTC (rev 92131)
+++ trunk/dports/devel/libcryptopp/Portfile	2012-04-19 17:11:35 UTC (rev 92132)
@@ -13,23 +13,26 @@
                     cryptographic schemes.
 
 homepage            http://www.cryptopp.com/
+license             public-domain
+
 master_sites        sourceforge:cryptopp \
                     ${homepage}
 distname            cryptopp[strsed ${version} {g/\.//}]
 
-checksums           md5 96cbeba0907562b077e26bcffb483828 \
-                    sha1 31dbb456c21f50865218c57b7eaf4c955a222ba1 \
-                    rmd160 a8a5b80c995c5d4ddafba228caf8866425212fbf
+checksums           rmd160  a8a5b80c995c5d4ddafba228caf8866425212fbf \
+                    sha256  98e74d8cb17a38033354519ac8ba9c5d98a6dc00bf5d1ec3c533c2e8ec86f268
 
 use_zip             yes
 extract.mkdir	    yes
 
-patchfiles          patch-GNUmakefile.diff
+patchfiles          patch-GNUmakefile.diff \
+                    patch-name_lookup.diff
 
 use_configure       no
 
 build.type          gnu
 build.env-append    CXXFLAGS="${configure.cxx_archflags}"
+build.args-append   CXX=${configure.cxx}
 
 test.run            yes
 test.cmd            ./cryptest.exe

Added: trunk/dports/devel/libcryptopp/files/patch-name_lookup.diff
===================================================================
--- trunk/dports/devel/libcryptopp/files/patch-name_lookup.diff	                        (rev 0)
+++ trunk/dports/devel/libcryptopp/files/patch-name_lookup.diff	2012-04-19 17:11:35 UTC (rev 92132)
@@ -0,0 +1,106 @@
+--- algebra.cpp.orig	2012-04-19 18:40:23.000000000 +0200
++++ algebra.cpp	2012-04-19 18:41:06.000000000 +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;
+@@ -74,7 +74,7 @@
+ 	Element y;
+ 	unsigned int i0=0, i1=1, i2=2;
+ 
+-	while (!Equal(g[i1], Identity()))
++	while (!this->Equal(g[i1], Identity()))
+ 	{
+ 		// y = g[i0] / g[i1];
+ 		// g[i2] = g[i0] % g[i1];
+--- eccrypto.cpp.orig	2012-04-19 18:35:31.000000000 +0200
++++ eccrypto.cpp	2012-04-19 18:43:04.000000000 +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>
+--- eccrypto.h.orig	2012-04-19 18:37:09.000000000 +0200
++++ eccrypto.h	2012-04-19 18:43:57.000000000 +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);
+--- panama.cpp.orig	2012-04-19 18:45:47.000000000 +0200
++++ panama.cpp	2012-04-19 18:46:25.000000000 +0200
+@@ -422,7 +422,7 @@
+ {
+ 	this->ThrowIfInvalidTruncatedSize(size);
+ 
+-	PadLastBlock(this->BLOCKSIZE, 0x01);
++	this->PadLastBlock(this->BLOCKSIZE, 0x01);
+ 	
+ 	HashEndianCorrectedBlock(this->m_data);
+ 
+--- secblock.h.orig	2012-04-19 18:27:02.000000000 +0200
++++ secblock.h	2012-04-19 18:27:29.000000000 +0200
+@@ -88,7 +88,7 @@
+ 
+ 	pointer allocate(size_type n, const void * = NULL)
+ 	{
+-		CheckSize(n);
++		this->CheckSize(n);
+ 		if (n == 0)
+ 			return NULL;
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120419/84660ae5/attachment.html>


More information about the macports-changes mailing list