Update to 5.6.2

* Update buildlink3.mk.

Changelog:
5.6.0 - added AuthenticatedSymmetricCipher interface class and Filter wrappers
      - added CCM, GCM (with SSE2 assembly), EAX, CMAC, XSalsa20, and SEED
      - added support for variable length IVs
      - added OIDs for Brainpool elliptic curve parameters
      - improved AES and SHA-256 speed on x86 and x64
      - changed BlockTransformation interface to no longer assume data alignment
      - fixed incorrect VMAC computation on message lengths
        that are >64 mod 128 (x86 assembly version is not affected)
      - fixed compiler error in vmac.cpp on x86 with GCC -fPIC
      - fixed run-time validation error on x86-64 with GCC 4.3.2 -O2
      - fixed HashFilter bug when putMessage=true
      - fixed AES-CTR data alignment bug that causes incorrect encryption on ARM
      - removed WORD64_AVAILABLE; compiler support for 64-bit int is now required
      - ported to GCC 4.3, C++Builder 2009, Sun CC 5.10, Intel C++ Compiler 11

5.6.1 - added support for AES-NI and CLMUL instruction sets in AES and GMAC/GCM
      - removed WAKE-CFB
      - fixed several bugs in the SHA-256 x86/x64 assembly code:
          * incorrect hash on non-SSE2 x86 machines on non-aligned input
          * incorrect hash on x86 machines when input crosses 0x80000000
          * incorrect hash on x64 when compiled with GCC with optimizations enabled
      - fixed bugs in AES x86 and x64 assembly causing crashes in some MSVC build configurations
      - switched to a public domain implementation of MARS
      - ported to MSVC 2010, GCC 4.5.1, Sun Studio 12u1, C++Builder 2010, Intel C++ Compiler 11.1
      - renamed the MSVC DLL project to "cryptopp" for compatibility with MSVC 2010

5.6.2 - changed license to Boost Software License 1.0
      - added SHA-3 (Keccak)
      - updated DSA to FIPS 186-3 (see DSA2 class)
      - fixed Blowfish minimum keylength to be 4 bytes (32 bits)
      - fixed Salsa validation failure when compiling with GCC 4.6
      - fixed infinite recursion when on x64, assembly disabled, and no AESNI
      - ported to MSVC 2012, GCC 4.7, Clang 3.2, Solaris Studio 12.3, Intel C++ Compiler 13.0

9 files changed, 6 insertions, 152 deletions

diff --git a/security/crypto++/patches/patch-aa b/security/crypto++/patches/patch-aa
index 77bc2c1dfaa..3d9349c2408 100644
--- a/security/crypto++/patches/patch-aa
+++ b/security/crypto++/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.3 2007/12/01 04:17:51 rillig Exp $
+$NetBSD: patch-aa,v 1.4 2013/06/12 12:00:08 ryoon Exp $
 
---- GNUmakefile.orig	2007-09-23 21:03:14.000000000 +0200
-+++ GNUmakefile	2007-12-01 03:40:46.000000000 +0100
+--- GNUmakefile.orig	2013-02-20 06:30:52.000000000 +0000
++++ GNUmakefile
 @@ -1,4 +1,4 @@
 -CXXFLAGS = -DNDEBUG -g -O2
 +CXXFLAGS = $(CPPFLAGS) -DNDEBUG -g -O2
- # the following options reduce code size, but breaks link or makes link very slow on some systems
- # CXXFLAGS += -ffunction-sections -fdata-sections
- # LDFLAGS += -Wl,--gc-sections
+ # -O3 fails to link on Cygwin GCC version 4.5.3
+ # -fPIC is supported. Please report any breakage of -fPIC as a bug.
+ # CXXFLAGS += -fPIC
diff --git a/security/crypto++/patches/patch-algebra.cpp b/security/crypto++/patches/patch-algebra.cpp
deleted file mode 100644
index d980a987c07..00000000000
--- a/security/crypto++/patches/patch-algebra.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-algebra.cpp,v 1.1 2012/12/22 02:29:36 joerg Exp $
-
---- algebra.cpp.orig	2012-12-21 21:43:47.000000000 +0000
-+++ 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;
diff --git a/security/crypto++/patches/patch-cryptlib.cpp b/security/crypto++/patches/patch-cryptlib.cpp
deleted file mode 100644
index db75e550cb0..00000000000
--- a/security/crypto++/patches/patch-cryptlib.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-cryptlib.cpp,v 1.1 2012/12/22 02:29:36 joerg Exp $
-
---- cryptlib.cpp.orig	2012-12-21 21:38:50.000000000 +0000
-+++ cryptlib.cpp
-@@ -29,7 +29,7 @@ CRYPTOPP_COMPILE_ASSERT(sizeof(dword) ==
- #endif
- 
- const std::string BufferedTransformation::NULL_CHANNEL;
--const NullNameValuePairs g_nullNameValuePairs;
-+NullNameValuePairs g_nullNameValuePairs;
- 
- BufferedTransformation & TheBitBucket()
- {
diff --git a/security/crypto++/patches/patch-cryptlib.h b/security/crypto++/patches/patch-cryptlib.h
deleted file mode 100644
index 1f3d5de6b28..00000000000
--- a/security/crypto++/patches/patch-cryptlib.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-cryptlib.h,v 1.1 2012/12/22 02:29:36 joerg Exp $
-
---- cryptlib.h.orig	2012-12-21 21:38:45.000000000 +0000
-+++ cryptlib.h
-@@ -323,7 +323,7 @@ public:
- };
- 
- //! _
--extern CRYPTOPP_DLL const NullNameValuePairs g_nullNameValuePairs;
-+extern CRYPTOPP_DLL NullNameValuePairs g_nullNameValuePairs;
- 
- // ********************************************************
- 
diff --git a/security/crypto++/patches/patch-eccrypto.cpp b/security/crypto++/patches/patch-eccrypto.cpp
deleted file mode 100644
index 5b78e887896..00000000000
--- a/security/crypto++/patches/patch-eccrypto.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-eccrypto.cpp,v 1.1 2012/12/22 02:29:36 joerg Exp $
-
---- eccrypto.cpp.orig	2012-12-21 21:44:36.000000000 +0000
-+++ eccrypto.cpp
-@@ -389,7 +389,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);
-@@ -545,7 +545,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;
-@@ -583,7 +583,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>
diff --git a/security/crypto++/patches/patch-eccrypto.h b/security/crypto++/patches/patch-eccrypto.h
deleted file mode 100644
index e8eb8326fab..00000000000
--- a/security/crypto++/patches/patch-eccrypto.h
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-eccrypto.h,v 1.1 2012/12/22 02:29:36 joerg Exp $
-
---- eccrypto.h.orig	2012-12-21 21:44:16.000000000 +0000
-+++ 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);
diff --git a/security/crypto++/patches/patch-panama.cpp b/security/crypto++/patches/patch-panama.cpp
deleted file mode 100644
index 219bbe75bed..00000000000
--- a/security/crypto++/patches/patch-panama.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-panama.cpp,v 1.1 2012/04/17 17:46:31 joerg Exp $
-
---- panama.cpp.orig	2012-04-17 15:42:03.000000000 +0000
-+++ panama.cpp
-@@ -420,7 +420,7 @@ void PanamaHash<B>::TruncatedFinal(byte 
- {
- 	this->ThrowIfInvalidTruncatedSize(size);
- 
--	PadLastBlock(this->BLOCKSIZE, 0x01);
-+	this->PadLastBlock(this->BLOCKSIZE, 0x01);
- 	
- 	HashEndianCorrectedBlock(this->m_data);
- 
diff --git a/security/crypto++/patches/patch-secblock.h b/security/crypto++/patches/patch-secblock.h
deleted file mode 100644
index 2656384f340..00000000000
--- a/security/crypto++/patches/patch-secblock.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-secblock.h,v 1.1 2012/04/17 17:46:31 joerg Exp $
-
---- secblock.h.orig	2012-04-17 15:36:29.000000000 +0000
-+++ 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;
- 
diff --git a/security/crypto++/patches/patch-simple.h b/security/crypto++/patches/patch-simple.h
deleted file mode 100644
index fcfd275a2f9..00000000000
--- a/security/crypto++/patches/patch-simple.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-simple.h,v 1.1 2012/04/17 17:46:31 joerg Exp $
-
---- simple.h.orig	2012-04-17 15:39:30.000000000 +0000
-+++ simple.h
-@@ -125,7 +125,7 @@ public:
- 	bool Flush(bool hardFlush, int propagation=-1, bool blocking=true)
- 		{return ChannelFlush(this->NULL_CHANNEL, hardFlush, propagation, blocking);}
- 	bool MessageSeriesEnd(int propagation=-1, bool blocking=true)
--		{return ChannelMessageSeriesEnd(this->NULL_CHANNEL, propagation, blocking);}
-+		{return this->ChannelMessageSeriesEnd(this->NULL_CHANNEL, propagation, blocking);}
- 	byte * CreatePutSpace(size_t &size)
- 		{return ChannelCreatePutSpace(this->NULL_CHANNEL, size);}
- 	size_t Put2(const byte *begin, size_t length, int messageEnd, bool blocking)