Update gcc4 patch to fix compilation with gcc-4.1 as well; bug #125679

Package-Manager: portage-2.1_pre7-r5

2 files changed, 257 insertions, 12 deletions

diff --git a/dev-libs/crypto++/files/crypto++-5.2.1-ubuntu-gcc4.patch b/dev-libs/crypto++/files/crypto++-5.2.1-ubuntu-gcc4.patch
index 2d71d3f919be..d4234be0026f 100644
--- a/dev-libs/crypto++/files/crypto++-5.2.1-ubuntu-gcc4.patch
+++ b/dev-libs/crypto++/files/crypto++-5.2.1-ubuntu-gcc4.patch
@@ -1,6 +1,78 @@
-diff --exclude='*~' -Naur crypto.orig/dll.cpp crypto/dll.cpp
---- crypto.orig/dll.cpp	2006-01-26 23:18:02.000000000 -0200
-+++ crypto/dll.cpp	2006-01-27 00:25:42.000000000 -0200
+diff -ur work-orig/camellia.h work/camellia.h
+--- work-orig/camellia.h	2006-04-15 02:32:18.000000000 -0400
++++ work/camellia.h	2006-04-15 02:39:31.000000000 -0400
+@@ -22,7 +22,7 @@
+ /// <a href="http://www.weidai.com/scan-mirror/cs.html#Camellia">Camellia</a>

+ class Camellia : public Camellia_Info, public BlockCipherDocumentation

+ {

+-	class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<Camellia_Info>

++	class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<Camellia_Info>, public SimpledKeyed_Helper

+ 	{

+ 	public:

+ 		void UncheckedSetKey(CipherDir dir, const byte *key, unsigned int keylen);

+diff -ur work-orig/cast.h work/cast.h
+--- work-orig/cast.h	2006-04-15 02:32:18.000000000 -0400
++++ work/cast.h	2006-04-15 02:49:35.000000000 -0400
+@@ -24,7 +24,7 @@
+ /// <a href="http://www.weidai.com/scan-mirror/cs.html#CAST-128">CAST-128</a>

+ class CAST128 : public CAST128_Info, public BlockCipherDocumentation

+ {

+-	class CRYPTOPP_NO_VTABLE Base : public CAST, public BlockCipherImpl<CAST128_Info>

++	class CRYPTOPP_NO_VTABLE Base : public CAST, public BlockCipherImpl<CAST128_Info>, public SimpledKeyed_Helper

+ 	{

+ 	public:

+ 		void UncheckedSetKey(CipherDir direction, const byte *userKey, unsigned int length);

+@@ -60,7 +60,7 @@
+ //! <a href="http://www.weidai.com/scan-mirror/cs.html#CAST-256">CAST-256</a>

+ class CAST256 : public CAST256_Info, public BlockCipherDocumentation

+ {

+-	class CRYPTOPP_NO_VTABLE Base : public CAST, public BlockCipherImpl<CAST256_Info>

++	class CRYPTOPP_NO_VTABLE Base : public CAST, public BlockCipherImpl<CAST256_Info>, public SimpledKeyed_Helper

+ 	{

+ 	public:

+ 		void UncheckedSetKey(CipherDir direction, const byte *userKey, unsigned int length = 8);

+diff -ur work-orig/des.h work/des.h
+--- work-orig/des.h	2006-04-15 02:32:18.000000000 -0400
++++ work/des.h	2006-04-15 02:41:08.000000000 -0400
+@@ -35,7 +35,7 @@
+ 	check or correct the parity bits if you wish. */

+ class DES : public DES_Info, public BlockCipherDocumentation

+ {

+-	class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<DES_Info>, public RawDES

++	class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<DES_Info>, public RawDES, public SimpledKeyed_Helper

+ 	{

+ 	public:

+ 		void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const;

+@@ -60,7 +60,7 @@
+ /// <a href="http://www.weidai.com/scan-mirror/cs.html#DESede">DES-EDE2</a>

+ class DES_EDE2 : public DES_EDE2_Info, public BlockCipherDocumentation

+ {

+-	class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<DES_EDE2_Info>

++	class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<DES_EDE2_Info>, public SimpledKeyed_Helper

+ 	{

+ 	public:

+ 		void UncheckedSetKey(CipherDir direction, const byte *userKey, unsigned int length);

+@@ -84,7 +84,7 @@
+ /// <a href="http://www.weidai.com/scan-mirror/cs.html#DESede">DES-EDE3</a>

+ class DES_EDE3 : public DES_EDE3_Info, public BlockCipherDocumentation

+ {

+-	class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<DES_EDE3_Info>

++	class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<DES_EDE3_Info>, public SimpledKeyed_Helper

+ 	{

+ 	public:

+ 		void UncheckedSetKey(CipherDir dir, const byte *key, unsigned int length);

+@@ -108,7 +108,7 @@
+ /// <a href="http://www.weidai.com/scan-mirror/cs.html#DESX">DES-XEX3</a>, AKA DESX

+ class DES_XEX3 : public DES_XEX3_Info, public BlockCipherDocumentation

+ {

+-	class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<DES_XEX3_Info>

++	class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<DES_XEX3_Info>, public SimpledKeyed_Helper

+ 	{

+ 	public:

+ 		void UncheckedSetKey(CipherDir dir, const byte *key, unsigned int length);

+diff -ur work-orig/dll.cpp work/dll.cpp
+--- work-orig/dll.cpp	2006-04-15 02:52:25.000000000 -0400
++++ work/dll.cpp	2006-04-15 02:31:49.000000000 -0400
 @@ -1,6 +1,10 @@
  // dll.cpp - written and placed in the public domain by Wei Dai

  

@@ -93,9 +165,33 @@ diff --exclude='*~' -Naur crypto.orig/dll.cpp crypto/dll.cpp
  

  template<> const byte PKCS_DigestDecoration<SHA>::decoration[] = {0x30,0x21,0x30,0x09,0x06,0x05,0x2B,0x0E,0x03,0x02,0x1A,0x05,0x00,0x04,0x14};

  template<> const unsigned int PKCS_DigestDecoration<SHA>::length = sizeof(PKCS_DigestDecoration<SHA>::decoration);

-diff --exclude='*~' -Naur crypto.orig/iterhash.h crypto/iterhash.h
---- crypto.orig/iterhash.h	2006-01-26 23:18:02.000000000 -0200
-+++ crypto/iterhash.h	2006-01-26 23:21:04.000000000 -0200
+diff -ur work-orig/gost.h work/gost.h
+--- work-orig/gost.h	2006-04-15 02:32:18.000000000 -0400
++++ work/gost.h	2006-04-15 02:48:12.000000000 -0400
+@@ -18,7 +18,7 @@
+ /// <a href="http://www.weidai.com/scan-mirror/cs.html#GOST">GOST</a>

+ class GOST : public GOST_Info, public BlockCipherDocumentation

+ {

+-	class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<GOST_Info>

++	class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<GOST_Info>, public SimpledKeyed_Helper

+ 	{

+ 	public:

+ 		void UncheckedSetKey(CipherDir direction, const byte *userKey, unsigned int length);

+diff -ur work-orig/hmac.h work/hmac.h
+--- work-orig/hmac.h	2006-04-15 02:32:18.000000000 -0400
++++ work/hmac.h	2006-04-15 02:41:47.000000000 -0400
+@@ -9,7 +9,7 @@
+ NAMESPACE_BEGIN(CryptoPP)

+ 

+ //! _

+-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE HMAC_Base : public VariableKeyLength<16, 0, UINT_MAX>, public MessageAuthenticationCode

++class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE HMAC_Base : public VariableKeyLength<16, 0, UINT_MAX>, public MessageAuthenticationCode, public SimpledKeyed_Helper

+ {

+ public:

+ 	HMAC_Base() : m_innerHashKeyed(false) {}

+diff -ur work-orig/iterhash.h work/iterhash.h
+--- work-orig/iterhash.h	2006-04-15 02:52:25.000000000 -0400
++++ work/iterhash.h	2006-04-15 02:31:49.000000000 -0400
 @@ -88,7 +88,7 @@
  	: public ClonableImpl<T_Transform, AlgorithmImpl<IteratedHash<T_HashWordType, T_Endianness, T_BlockSize>, T_Transform> >

  {

@@ -105,9 +201,18 @@ diff --exclude='*~' -Naur crypto.orig/iterhash.h crypto/iterhash.h
  	unsigned int DigestSize() const {return DIGESTSIZE;};

  

  protected:

-diff --exclude='*~' -Naur crypto.orig/lubyrack.h crypto/lubyrack.h
---- crypto.orig/lubyrack.h	2006-01-26 23:18:02.000000000 -0200
-+++ crypto/lubyrack.h	2006-01-26 23:21:39.000000000 -0200
+diff -ur work-orig/lubyrack.h work/lubyrack.h
+--- work-orig/lubyrack.h	2006-04-15 02:52:25.000000000 -0400
++++ work/lubyrack.h	2006-04-15 02:48:55.000000000 -0400
+@@ -23,7 +23,7 @@
+ template <class T>

+ class LR : public LR_Info<T>, public BlockCipherDocumentation

+ {

+-	class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<LR_Info<T> >

++	class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<LR_Info<T> >, public SimpledKeyed_Helper

+ 	{

+ 	public:

+ 		// VC60 workaround: have to define these functions within class definition

 @@ -38,7 +38,7 @@
  		}

  

@@ -117,9 +222,57 @@ diff --exclude='*~' -Naur crypto.orig/lubyrack.h crypto/lubyrack.h
  		unsigned int L;	// key length / 2

  		SecByteBlock key;

  

-diff --exclude='*~' -Naur crypto.orig/seckey.h crypto/seckey.h
---- crypto.orig/seckey.h	2006-01-26 23:18:02.000000000 -0200
-+++ crypto/seckey.h	2006-01-26 23:22:33.000000000 -0200
+diff -ur work-orig/mars.h work/mars.h
+--- work-orig/mars.h	2006-04-15 02:32:18.000000000 -0400
++++ work/mars.h	2006-04-15 02:47:59.000000000 -0400
+@@ -18,7 +18,7 @@
+ /// <a href="http://www.weidai.com/scan-mirror/cs.html#MARS">MARS</a>

+ class MARS : public MARS_Info, public BlockCipherDocumentation

+ {

+-	class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<MARS_Info>

++	class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<MARS_Info>, public SimpledKeyed_Helper

+ 	{

+ 	public:

+ 		void UncheckedSetKey(CipherDir direction, const byte *userKey, unsigned int length);

+diff -ur work-orig/md5mac.h work/md5mac.h
+--- work-orig/md5mac.h	2006-04-15 02:32:18.000000000 -0400
++++ work/md5mac.h	2006-04-15 02:47:45.000000000 -0400
+@@ -9,7 +9,7 @@
+ 

+ NAMESPACE_BEGIN(CryptoPP)

+ 

+-class CRYPTOPP_NO_VTABLE MD5MAC_Base : public FixedKeyLength<16>, public IteratedHash<word32, LittleEndian, 64, MessageAuthenticationCode>

++class CRYPTOPP_NO_VTABLE MD5MAC_Base : public FixedKeyLength<16>, public IteratedHash<word32, LittleEndian, 64, MessageAuthenticationCode>, public SimpledKeyed_Helper

+ {

+ public:

+ 	static std::string StaticAlgorithmName() {return "MD5-MAC";}

+diff -ur work-orig/mdc.h work/mdc.h
+--- work-orig/mdc.h	2006-04-15 02:32:18.000000000 -0400
++++ work/mdc.h	2006-04-15 02:45:57.000000000 -0400
+@@ -13,7 +13,7 @@
+ 

+ //! _

+ template <class T>

+-struct MDC_Info : public FixedBlockSize<T::DIGESTSIZE>, public FixedKeyLength<T::BLOCKSIZE>

++struct MDC_Info : public FixedBlockSize<T::DIGESTSIZE>, public FixedKeyLength<T::BLOCKSIZE>, public SimpledKeyed_Helper

+ {

+ 	static std::string StaticAlgorithmName() {return std::string("MDC/")+T::StaticAlgorithmName();}

+ };

+diff -ur work-orig/rijndael.h work/rijndael.h
+--- work-orig/rijndael.h	2006-04-15 02:32:18.000000000 -0400
++++ work/rijndael.h	2006-04-15 02:43:34.000000000 -0400
+@@ -18,7 +18,7 @@
+ /// <a href="http://www.weidai.com/scan-mirror/cs.html#Rijndael">Rijndael</a>

+ class CRYPTOPP_DLL Rijndael : public Rijndael_Info, public BlockCipherDocumentation

+ {

+-	class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<Rijndael_Info>

++	class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<Rijndael_Info>, public SimpledKeyed_Helper

+ 	{

+ 	public:

+ 		void UncheckedSetKey(CipherDir direction, const byte *userKey, unsigned int length);

+diff -ur work-orig/seckey.h work/seckey.h
+--- work-orig/seckey.h	2006-04-15 02:52:25.000000000 -0400
++++ work/seckey.h	2006-04-15 02:37:09.000000000 -0400
 @@ -21,7 +21,7 @@
  class FixedBlockSize

  {

@@ -147,3 +300,93 @@ diff --exclude='*~' -Naur crypto.orig/seckey.h crypto/seckey.h
  	static unsigned int StaticGetDefaultRounds(unsigned int keylength) {return DEFAULT_ROUNDS;}

  

  protected:

+@@ -123,19 +123,21 @@
+ 

+ // ************** implementation helper for SimpledKeyed ***************

+ 

+-template <class T>

+-static inline void CheckedSetKey(T *obj, Empty empty, const byte *key, unsigned int length, const NameValuePairs &param)

+-{

+-	obj->ThrowIfInvalidKeyLength(length);

+-	obj->UncheckedSetKey(key, length);

+-}

+-

+-template <class T>

+-static inline void CheckedSetKey(T *obj, CipherDir dir, const byte *key, unsigned int length, const NameValuePairs &param)

+-{

+-	obj->ThrowIfInvalidKeyLength(length);

+-	obj->UncheckedSetKey(dir, key, length);

+-}

++struct SimpledKeyed_Helper {

++ template <class T>

++ static inline void CheckedSetKey(T *obj, Empty empty, const byte *key, unsigned int length, const NameValuePairs &param)

++ {

++ obj->ThrowIfInvalidKeyLength(length);

++ obj->UncheckedSetKey(key, length);

++ }

++

++ template <class T>

++ static inline void CheckedSetKey(T *obj, CipherDir dir, const byte *key, unsigned int length, const NameValuePairs &param)

++ {

++ obj->ThrowIfInvalidKeyLength(length);

++ obj->UncheckedSetKey(dir, key, length);

++ }

++};

+ 

+ //! _

+ template <class BASE, class INFO = BASE>

+@@ -176,7 +178,7 @@
+ 

+ 	void SetKey(const byte *key, unsigned int length, const NameValuePairs &param = g_nullNameValuePairs)

+ 	{

+-		CheckedSetKey(this, DIR, key, length, param);

++		BASE::CheckedSetKey(this, DIR, key, length, param);

+ 	}

+ };

+ 

+@@ -187,7 +189,7 @@
+ public:

+ 	void SetKey(const byte *key, unsigned int length, const NameValuePairs &params = g_nullNameValuePairs)

+ 	{

+-		CheckedSetKey(this, Empty(), key, length, params);

++		BASE::CheckedSetKey(this, Empty(), key, length, params);

+ 	}

+ };

+ 

+diff -ur work-orig/shacal2.h work/shacal2.h
+--- work-orig/shacal2.h	2006-04-15 02:32:18.000000000 -0400
++++ work/shacal2.h	2006-04-15 02:47:12.000000000 -0400
+@@ -18,7 +18,7 @@
+ /// <a href="http://www.weidai.com/scan-mirror/cs.html#SHACAL-2">SHACAL-2</a>

+ class SHACAL2 : public SHACAL2_Info, public BlockCipherDocumentation

+ {

+-	class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<SHACAL2_Info>

++	class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<SHACAL2_Info>, public SimpledKeyed_Helper

+ 	{

+ 	public:

+ 		void UncheckedSetKey(CipherDir direction, const byte *userKey, unsigned int length);

+diff -ur work-orig/skipjack.h work/skipjack.h
+--- work-orig/skipjack.h	2006-04-15 02:32:18.000000000 -0400
++++ work/skipjack.h	2006-04-15 02:43:54.000000000 -0400
+@@ -18,7 +18,7 @@
+ /// <a href="http://www.weidai.com/scan-mirror/cs.html#SKIPJACK">SKIPJACK</a>

+ class SKIPJACK : public SKIPJACK_Info, public BlockCipherDocumentation

+ {

+-	class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<SKIPJACK_Info>

++	class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<SKIPJACK_Info>, public SimpledKeyed_Helper

+ 	{

+ 	public:

+ 		void UncheckedSetKey(CipherDir direction, const byte *userKey, unsigned int length);

+diff -ur work-orig/ttmac.h work/ttmac.h
+--- work-orig/ttmac.h	2006-04-15 02:32:18.000000000 -0400
++++ work/ttmac.h	2006-04-15 02:47:29.000000000 -0400
+@@ -9,7 +9,7 @@
+ NAMESPACE_BEGIN(CryptoPP)

+ 

+ //! _

+-class CRYPTOPP_NO_VTABLE TTMAC_Base : public FixedKeyLength<20>, public IteratedHash<word32, LittleEndian, 64, MessageAuthenticationCode>

++class CRYPTOPP_NO_VTABLE TTMAC_Base : public FixedKeyLength<20>, public IteratedHash<word32, LittleEndian, 64, MessageAuthenticationCode>, public SimpledKeyed_Helper

+ {

+ public:

+ 	static std::string StaticAlgorithmName() {return std::string("Two-Track-MAC");}

+
diff --git a/dev-libs/crypto++/files/digest-crypto++-5.2.1 b/dev-libs/crypto++/files/digest-crypto++-5.2.1
index 5075c36fb17d..44bb9fcae448 100644
--- a/dev-libs/crypto++/files/digest-crypto++-5.2.1
+++ b/dev-libs/crypto++/files/digest-crypto++-5.2.1
@@ -1 +1,3 @@
 MD5 82a00c44235ccbae2bedf9cb16c40ac3 cryptopp521.zip 1010937
+RMD160 7c4d3cf702a1cf38f2a19cb5cebf170dabc23a35 cryptopp521.zip 1010937
+SHA256 d578d297f1804a6b1c3f9090cc77091e49ae6d0311846a45117e79d4d20c2a39 cryptopp521.zip 1010937