svn commit: r332542 - head/security/py-pycryptopp/files

[John Marino]

Author: marino
Date: Sat Nov  2 21:30:51 2013
New Revision: 332542
URL: http://svnweb.freebsd.org/changeset/ports/332542

Log:
  security/py-pycryptopp: Fix C++ issues on modern gcc
  
  Approved by: 	portmgr (bapt, implicit)

Added:
  head/security/py-pycryptopp/files/
  head/security/py-pycryptopp/files/patch-embeddedcryptopp_algebra.cpp   (contents, props changed)
  head/security/py-pycryptopp/files/patch-embeddedcryptopp_eccrypto.cpp   (contents, props changed)
  head/security/py-pycryptopp/files/patch-embeddedcryptopp_eccrypto.h   (contents, props changed)
  head/security/py-pycryptopp/files/patch-embeddedcryptopp_secblock.h   (contents, props changed)

Added: head/security/py-pycryptopp/files/patch-embeddedcryptopp_algebra.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/py-pycryptopp/files/patch-embeddedcryptopp_algebra.cpp	Sat Nov  2 21:30:51 2013	(r332542)
@@ -0,0 +1,20 @@
+--- embeddedcryptopp/algebra.cpp.orig	2010-09-21 04:36:16.000000000 +0000
++++ embeddedcryptopp/algebra.cpp
+@@ -58,7 +58,7 @@ template <class T> const T& AbstractEucl
+ 	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 @@ template <class T> const typename Quotie
+ 	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];

Added: head/security/py-pycryptopp/files/patch-embeddedcryptopp_eccrypto.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/py-pycryptopp/files/patch-embeddedcryptopp_eccrypto.cpp	Sat Nov  2 21:30:51 2013	(r332542)
@@ -0,0 +1,29 @@
+--- embeddedcryptopp/eccrypto.cpp.orig	2010-09-21 04:36:16.000000000 +0000
++++ embeddedcryptopp/eccrypto.cpp
+@@ -435,7 +435,7 @@ template <class EC> void DL_GroupParamet
+ 	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 @@ bool DL_GroupParameters_EC<EC>::Validate
+ 	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 @@ void DL_PublicKey_EC<EC>::BERDecodePubli
+ 	typename EC::Point P;
+ 	if (!this->GetGroupParameters().GetCurve().DecodePoint(P, bt, size))
+ 		BERDecodeError();
+-	SetPublicElement(P);
++	this->SetPublicElement(P);
+ }
+ 
+ template <class EC>

Added: head/security/py-pycryptopp/files/patch-embeddedcryptopp_eccrypto.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/py-pycryptopp/files/patch-embeddedcryptopp_eccrypto.h	Sat Nov  2 21:30:51 2013	(r332542)
@@ -0,0 +1,35 @@
+--- embeddedcryptopp/eccrypto.h.orig	2010-09-21 04:36:16.000000000 +0000
++++ embeddedcryptopp/eccrypto.h
+@@ -43,7 +43,7 @@ public:
+ 	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 @@ public:
+ 	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 @@ public:
+ 	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);

Added: head/security/py-pycryptopp/files/patch-embeddedcryptopp_secblock.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/py-pycryptopp/files/patch-embeddedcryptopp_secblock.h	Sat Nov  2 21:30:51 2013	(r332542)
@@ -0,0 +1,11 @@
+--- embeddedcryptopp/secblock.h.orig	2013-11-02 21:05:08.220199000 +0000
++++ embeddedcryptopp/secblock.h
+@@ -94,7 +94,7 @@ public:
+ 
+ 	pointer allocate(size_type n, const void * = NULL)
+ 	{
+-		CheckSize(n);
++		this->CheckSize(n);
+ 		if (n == 0)
+ 			return NULL;
+