Added a fix for bug #53667 that makes libgcrypt apps happy on sparc.

5 files changed, 408 insertions, 13 deletions

diff --git a/dev-libs/libgcrypt/ChangeLog b/dev-libs/libgcrypt/ChangeLog
index f82f0043dc57..60078ad49426 100644
--- a/dev-libs/libgcrypt/ChangeLog
+++ b/dev-libs/libgcrypt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libgcrypt
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.39 2004/10/03 09:23:58 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.40 2004/10/10 14:12:19 weeve Exp $
+
+*libgcrypt-1.2.0-r2 (10 Oct 2004)
+
+  10 Oct 2004; Jason Wever <weeve@gentoo.org>
+  +files/libgcrypt-rijndael.patch, +libgcrypt-1.2.0-r2.ebuild:
+  Added a fix for bug #53667 that makes libgcrypt apps happy on sparc.
 
   03 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> libgcrypt-1.2.0-r1.ebuild,
   libgcrypt-1.2.0.ebuild:
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index c659d52b2960..5e728e8b7f2a 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -1,14 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 5f29cc1685f0221d5992e5650f0ff189 ChangeLog 5789
+MD5 9002e4a8f3c814e7bbb8f1abdeccd217 libgcrypt-1.1.12.ebuild 1132
 MD5 ecdc2a61e94402741d64e37d35c8d8c7 libgcrypt-1.1.91.ebuild 752
 MD5 f0a8062f23b497a4f1381026034fc01a libgcrypt-1.1.92.ebuild 963
 MD5 e7cc39058b6e7f07ec3c3310506249a8 libgcrypt-1.1.94.ebuild 977
 MD5 2190b2687a0691c16af93adaa26e5cf5 libgcrypt-1.2.0-r1.ebuild 1112
 MD5 b197199f1b61f6658ece7531067591ed libgcrypt-1.2.0.ebuild 1047
-MD5 5f29cc1685f0221d5992e5650f0ff189 ChangeLog 5789
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
-MD5 9002e4a8f3c814e7bbb8f1abdeccd217 libgcrypt-1.1.12.ebuild 1132
+MD5 65b56c7bd41a0314bd0c927ed1bc5c86 libgcrypt-1.2.0-r2.ebuild 1170
 MD5 9bf9811b5db655640e7f280bb9bab24c files/digest-libgcrypt-1.1.12 68
 MD5 eb84241995268ddf928f15c1fc43f5ff files/digest-libgcrypt-1.1.91 68
 MD5 90f8d641fd24175958583ca806913d81 files/digest-libgcrypt-1.1.92 68
@@ -16,10 +14,5 @@ MD5 9f546283fe69d56096f3707d52a4668a files/digest-libgcrypt-1.1.94 68
 MD5 16b1f5ae3cd2e7678379e1c6be616455 files/digest-libgcrypt-1.2.0 67
 MD5 16b1f5ae3cd2e7678379e1c6be616455 files/digest-libgcrypt-1.2.0-r1 67
 MD5 42e08103310c04095c58c5070ab8690c files/libgcrypt-hppa.patch 1099
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (Darwin)
-
-iD8DBQFBX8U4VWNWqTUmv+0RAnetAJ9hL6VIdYzM79fNJX3ESYq5kFaijQCeOGTs
-uPgdmpA1WvMntew9L6Y+Bgs=
-=eyTI
------END PGP SIGNATURE-----
+MD5 2b7ce42f9b49ecbeddca76b1edc5699d files/libgcrypt-rijndael.patch 13132
+MD5 16b1f5ae3cd2e7678379e1c6be616455 files/digest-libgcrypt-1.2.0-r2 67
diff --git a/dev-libs/libgcrypt/files/digest-libgcrypt-1.2.0-r2 b/dev-libs/libgcrypt/files/digest-libgcrypt-1.2.0-r2
new file mode 100644
index 000000000000..ff786072fa8f
--- /dev/null
+++ b/dev-libs/libgcrypt/files/digest-libgcrypt-1.2.0-r2
@@ -0,0 +1 @@
+MD5 5c508072d8387ce17d1ab05075c2be40 libgcrypt-1.2.0.tar.gz 949159
diff --git a/dev-libs/libgcrypt/files/libgcrypt-rijndael.patch b/dev-libs/libgcrypt/files/libgcrypt-rijndael.patch
new file mode 100644
index 000000000000..9ccf150985ba
--- /dev/null
+++ b/dev-libs/libgcrypt/files/libgcrypt-rijndael.patch
@@ -0,0 +1,352 @@
+--- libgcrypt-1.2.0/cipher/rijndael.c.orig	2004-10-09 17:13:26.101200938 -0600
++++ libgcrypt-1.2.0/cipher/rijndael.c	2004-10-09 17:13:32.444236650 -0600
+@@ -48,13 +48,25 @@
+ 
+ static const char *selftest(void);
+ 
+-typedef struct {
+-    int   ROUNDS;                   /* key-length-dependent number of rounds */
+-    int decryption_prepared;
+-    byte  keySched[MAXROUNDS+1][4][4];	/* key schedule		*/
+-    byte  keySched2[MAXROUNDS+1][4][4];	/* key schedule		*/
++typedef struct 
++{
++  int   ROUNDS;                   /* key-length-dependent number of rounds */
++  int decryption_prepared;
++  union 
++  {
++    PROPERLY_ALIGNED_TYPE dummy;
++    byte keyschedule[MAXROUNDS+1][4][4];
++  } u1;
++  union
++  {
++    PROPERLY_ALIGNED_TYPE dummy;
++    byte keyschedule[MAXROUNDS+1][4][4];	
++  } u2;
+ } RIJNDAEL_context;
+ 
++#define keySched  u1.keyschedule
++#define keySched2 u2.keyschedule
++
+ 
+ static const byte S[256] = {
+     99, 124, 119, 123, 242, 107, 111, 197,
+@@ -1881,90 +1893,108 @@
+ 
+ /* Encrypt one block.  A and B may be the same. */
+ static void
+-do_encrypt (const RIJNDAEL_context *ctx, byte *b, const byte *a)
++do_encrypt (const RIJNDAEL_context *ctx, byte *bx, const byte *ax)
+ {
+   /* FIXME: Ugly code, replace by straighter implementaion and use
+      optimized assembler for common CPUs. */
+ 
+   int r;
+-  union {
++  union
++  {
+     u32  tempu32[4];  /* Force correct alignment. */
+     byte temp[4][4];
+   } u;
+   int ROUNDS = ctx->ROUNDS;
+ #define rk (ctx->keySched)
+ 
+-  *((u32*)u.temp[0]) = *((u32*)(a   )) ^ *((u32*)rk[0][0]);
+-  *((u32*)u.temp[1]) = *((u32*)(a+ 4)) ^ *((u32*)rk[0][1]);
+-  *((u32*)u.temp[2]) = *((u32*)(a+ 8)) ^ *((u32*)rk[0][2]);
+-  *((u32*)u.temp[3]) = *((u32*)(a+12)) ^ *((u32*)rk[0][3]);
+-  *((u32*)(b    )) = (*((u32*)T1[u.temp[0][0]])
++  /* BX and AX are not necessary correctly aligned.  Thus we need to
++     copy them here. */
++  union
++  {
++    u32  dummy[4]; 
++    byte a[16];
++  } a;
++  union
++  {
++    u32  dummy[4]; 
++    byte b[16];
++  } b;
++
++  memcpy (a.a, ax, 16);
++
++  *((u32*)u.temp[0]) = *((u32*)(a.a   )) ^ *((u32*)rk[0][0]);
++  *((u32*)u.temp[1]) = *((u32*)(a.a+ 4)) ^ *((u32*)rk[0][1]);
++  *((u32*)u.temp[2]) = *((u32*)(a.a+ 8)) ^ *((u32*)rk[0][2]);
++  *((u32*)u.temp[3]) = *((u32*)(a.a+12)) ^ *((u32*)rk[0][3]);
++  *((u32*)(b.b    )) = (*((u32*)T1[u.temp[0][0]])
+                       ^ *((u32*)T2[u.temp[1][1]])
+                       ^ *((u32*)T3[u.temp[2][2]]) 
+                       ^ *((u32*)T4[u.temp[3][3]]));
+-  *((u32*)(b + 4)) = (*((u32*)T1[u.temp[1][0]])
++  *((u32*)(b.b + 4)) = (*((u32*)T1[u.temp[1][0]])
+                       ^ *((u32*)T2[u.temp[2][1]])
+                       ^ *((u32*)T3[u.temp[3][2]]) 
+                       ^ *((u32*)T4[u.temp[0][3]]));
+-  *((u32*)(b + 8)) = (*((u32*)T1[u.temp[2][0]])
++  *((u32*)(b.b + 8)) = (*((u32*)T1[u.temp[2][0]])
+                       ^ *((u32*)T2[u.temp[3][1]])
+                       ^ *((u32*)T3[u.temp[0][2]]) 
+                       ^ *((u32*)T4[u.temp[1][3]]));
+-  *((u32*)(b +12)) = (*((u32*)T1[u.temp[3][0]])
++  *((u32*)(b.b +12)) = (*((u32*)T1[u.temp[3][0]])
+                       ^ *((u32*)T2[u.temp[0][1]])
+                       ^ *((u32*)T3[u.temp[1][2]]) 
+                       ^ *((u32*)T4[u.temp[2][3]]));
+ 
+   for (r = 1; r < ROUNDS-1; r++)
+     {
+-      *((u32*)u.temp[0]) = *((u32*)(b   )) ^ *((u32*)rk[r][0]);
+-      *((u32*)u.temp[1]) = *((u32*)(b+ 4)) ^ *((u32*)rk[r][1]);
+-      *((u32*)u.temp[2]) = *((u32*)(b+ 8)) ^ *((u32*)rk[r][2]);
+-      *((u32*)u.temp[3]) = *((u32*)(b+12)) ^ *((u32*)rk[r][3]);
++      *((u32*)u.temp[0]) = *((u32*)(b.b   )) ^ *((u32*)rk[r][0]);
++      *((u32*)u.temp[1]) = *((u32*)(b.b+ 4)) ^ *((u32*)rk[r][1]);
++      *((u32*)u.temp[2]) = *((u32*)(b.b+ 8)) ^ *((u32*)rk[r][2]);
++      *((u32*)u.temp[3]) = *((u32*)(b.b+12)) ^ *((u32*)rk[r][3]);
+ 
+-      *((u32*)(b    )) = (*((u32*)T1[u.temp[0][0]])
++      *((u32*)(b.b    )) = (*((u32*)T1[u.temp[0][0]])
+                           ^ *((u32*)T2[u.temp[1][1]])
+                           ^ *((u32*)T3[u.temp[2][2]]) 
+                           ^ *((u32*)T4[u.temp[3][3]]));
+-      *((u32*)(b + 4)) = (*((u32*)T1[u.temp[1][0]])
++      *((u32*)(b.b + 4)) = (*((u32*)T1[u.temp[1][0]])
+                           ^ *((u32*)T2[u.temp[2][1]])
+                           ^ *((u32*)T3[u.temp[3][2]]) 
+                           ^ *((u32*)T4[u.temp[0][3]]));
+-      *((u32*)(b + 8)) = (*((u32*)T1[u.temp[2][0]])
++      *((u32*)(b.b + 8)) = (*((u32*)T1[u.temp[2][0]])
+                           ^ *((u32*)T2[u.temp[3][1]])
+                           ^ *((u32*)T3[u.temp[0][2]]) 
+                           ^ *((u32*)T4[u.temp[1][3]]));
+-      *((u32*)(b +12)) = (*((u32*)T1[u.temp[3][0]])
++      *((u32*)(b.b +12)) = (*((u32*)T1[u.temp[3][0]])
+                           ^ *((u32*)T2[u.temp[0][1]])
+                           ^ *((u32*)T3[u.temp[1][2]]) 
+                           ^ *((u32*)T4[u.temp[2][3]]));
+     }
+ 
+   /* Last round is special. */   
+-  *((u32*)u.temp[0]) = *((u32*)(b   )) ^ *((u32*)rk[ROUNDS-1][0]);
+-  *((u32*)u.temp[1]) = *((u32*)(b+ 4)) ^ *((u32*)rk[ROUNDS-1][1]);
+-  *((u32*)u.temp[2]) = *((u32*)(b+ 8)) ^ *((u32*)rk[ROUNDS-1][2]);
+-  *((u32*)u.temp[3]) = *((u32*)(b+12)) ^ *((u32*)rk[ROUNDS-1][3]);
+-  b[ 0] = T1[u.temp[0][0]][1];
+-  b[ 1] = T1[u.temp[1][1]][1];
+-  b[ 2] = T1[u.temp[2][2]][1];
+-  b[ 3] = T1[u.temp[3][3]][1];
+-  b[ 4] = T1[u.temp[1][0]][1];
+-  b[ 5] = T1[u.temp[2][1]][1];
+-  b[ 6] = T1[u.temp[3][2]][1];
+-  b[ 7] = T1[u.temp[0][3]][1];
+-  b[ 8] = T1[u.temp[2][0]][1];
+-  b[ 9] = T1[u.temp[3][1]][1];
+-  b[10] = T1[u.temp[0][2]][1];
+-  b[11] = T1[u.temp[1][3]][1];
+-  b[12] = T1[u.temp[3][0]][1];
+-  b[13] = T1[u.temp[0][1]][1];
+-  b[14] = T1[u.temp[1][2]][1];
+-  b[15] = T1[u.temp[2][3]][1];
+-  *((u32*)(b   )) ^= *((u32*)rk[ROUNDS][0]);
+-  *((u32*)(b+ 4)) ^= *((u32*)rk[ROUNDS][1]);
+-  *((u32*)(b+ 8)) ^= *((u32*)rk[ROUNDS][2]);
+-  *((u32*)(b+12)) ^= *((u32*)rk[ROUNDS][3]);
++  *((u32*)u.temp[0]) = *((u32*)(b.b   )) ^ *((u32*)rk[ROUNDS-1][0]);
++  *((u32*)u.temp[1]) = *((u32*)(b.b+ 4)) ^ *((u32*)rk[ROUNDS-1][1]);
++  *((u32*)u.temp[2]) = *((u32*)(b.b+ 8)) ^ *((u32*)rk[ROUNDS-1][2]);
++  *((u32*)u.temp[3]) = *((u32*)(b.b+12)) ^ *((u32*)rk[ROUNDS-1][3]);
++  b.b[ 0] = T1[u.temp[0][0]][1];
++  b.b[ 1] = T1[u.temp[1][1]][1];
++  b.b[ 2] = T1[u.temp[2][2]][1];
++  b.b[ 3] = T1[u.temp[3][3]][1];
++  b.b[ 4] = T1[u.temp[1][0]][1];
++  b.b[ 5] = T1[u.temp[2][1]][1];
++  b.b[ 6] = T1[u.temp[3][2]][1];
++  b.b[ 7] = T1[u.temp[0][3]][1];
++  b.b[ 8] = T1[u.temp[2][0]][1];
++  b.b[ 9] = T1[u.temp[3][1]][1];
++  b.b[10] = T1[u.temp[0][2]][1];
++  b.b[11] = T1[u.temp[1][3]][1];
++  b.b[12] = T1[u.temp[3][0]][1];
++  b.b[13] = T1[u.temp[0][1]][1];
++  b.b[14] = T1[u.temp[1][2]][1];
++  b.b[15] = T1[u.temp[2][3]][1];
++  *((u32*)(b.b   )) ^= *((u32*)rk[ROUNDS][0]);
++  *((u32*)(b.b+ 4)) ^= *((u32*)rk[ROUNDS][1]);
++  *((u32*)(b.b+ 8)) ^= *((u32*)rk[ROUNDS][2]);
++  *((u32*)(b.b+12)) ^= *((u32*)rk[ROUNDS][3]);
++
++  memcpy (bx, b.b, 16);
+ #undef rk
+ }
+ 
+@@ -1974,14 +2004,14 @@
+   RIJNDAEL_context *ctx = context;
+ 
+   do_encrypt (ctx, b, a);
+-  _gcry_burn_stack (16 + 2*sizeof(int));
++  _gcry_burn_stack (48 + 2*sizeof(int));
+ }
+ 
+ 
+ 
+ /* Decrypt one block.  a and b may be the same. */
+ static void
+-do_decrypt (RIJNDAEL_context *ctx, byte *b, const byte *a)
++do_decrypt (RIJNDAEL_context *ctx, byte *bx, const byte *ax)
+ {
+ #define rk  (ctx->keySched2)
+   int ROUNDS = ctx->ROUNDS; 
+@@ -1991,6 +2021,21 @@
+     byte temp[4][4];
+   } u;
+ 
++  /* BX and AX are not necessary correctly aligned.  Thus we need to
++     copy them here. */
++  union
++  {
++    u32  dummy[4]; 
++    byte a[16];
++  } a;
++  union
++  {
++    u32  dummy[4]; 
++    byte b[16];
++  } b;
++
++  memcpy (a.a, ax, 16);
++
+   if ( !ctx->decryption_prepared )
+     {
+       prepare_decryption ( ctx );
+@@ -1998,77 +2043,79 @@
+       ctx->decryption_prepared = 1;
+     }
+     
+-  *((u32*)u.temp[0]) = *((u32*)(a   )) ^ *((u32*)rk[ROUNDS][0]);
+-  *((u32*)u.temp[1]) = *((u32*)(a+ 4)) ^ *((u32*)rk[ROUNDS][1]);
+-  *((u32*)u.temp[2]) = *((u32*)(a+ 8)) ^ *((u32*)rk[ROUNDS][2]);
+-  *((u32*)u.temp[3]) = *((u32*)(a+12)) ^ *((u32*)rk[ROUNDS][3]);
++  *((u32*)u.temp[0]) = *((u32*)(a.a   )) ^ *((u32*)rk[ROUNDS][0]);
++  *((u32*)u.temp[1]) = *((u32*)(a.a+ 4)) ^ *((u32*)rk[ROUNDS][1]);
++  *((u32*)u.temp[2]) = *((u32*)(a.a+ 8)) ^ *((u32*)rk[ROUNDS][2]);
++  *((u32*)u.temp[3]) = *((u32*)(a.a+12)) ^ *((u32*)rk[ROUNDS][3]);
+   
+-  *((u32*)(b   )) = (*((u32*)T5[u.temp[0][0]])
++  *((u32*)(b.b   )) = (*((u32*)T5[u.temp[0][0]])
+                      ^ *((u32*)T6[u.temp[3][1]])
+                      ^ *((u32*)T7[u.temp[2][2]]) 
+                      ^ *((u32*)T8[u.temp[1][3]]));
+-  *((u32*)(b+ 4)) = (*((u32*)T5[u.temp[1][0]])
++  *((u32*)(b.b+ 4)) = (*((u32*)T5[u.temp[1][0]])
+                      ^ *((u32*)T6[u.temp[0][1]])
+                      ^ *((u32*)T7[u.temp[3][2]]) 
+                      ^ *((u32*)T8[u.temp[2][3]]));
+-  *((u32*)(b+ 8)) = (*((u32*)T5[u.temp[2][0]])
++  *((u32*)(b.b+ 8)) = (*((u32*)T5[u.temp[2][0]])
+                      ^ *((u32*)T6[u.temp[1][1]])
+                      ^ *((u32*)T7[u.temp[0][2]]) 
+                      ^ *((u32*)T8[u.temp[3][3]]));
+-  *((u32*)(b+12)) = (*((u32*)T5[u.temp[3][0]])
++  *((u32*)(b.b+12)) = (*((u32*)T5[u.temp[3][0]])
+                      ^ *((u32*)T6[u.temp[2][1]])
+                      ^ *((u32*)T7[u.temp[1][2]]) 
+                      ^ *((u32*)T8[u.temp[0][3]]));
+ 
+   for (r = ROUNDS-1; r > 1; r--)
+     {
+-      *((u32*)u.temp[0]) = *((u32*)(b   )) ^ *((u32*)rk[r][0]);
+-      *((u32*)u.temp[1]) = *((u32*)(b+ 4)) ^ *((u32*)rk[r][1]);
+-      *((u32*)u.temp[2]) = *((u32*)(b+ 8)) ^ *((u32*)rk[r][2]);
+-      *((u32*)u.temp[3]) = *((u32*)(b+12)) ^ *((u32*)rk[r][3]);
+-      *((u32*)(b   )) = (*((u32*)T5[u.temp[0][0]])
++      *((u32*)u.temp[0]) = *((u32*)(b.b   )) ^ *((u32*)rk[r][0]);
++      *((u32*)u.temp[1]) = *((u32*)(b.b+ 4)) ^ *((u32*)rk[r][1]);
++      *((u32*)u.temp[2]) = *((u32*)(b.b+ 8)) ^ *((u32*)rk[r][2]);
++      *((u32*)u.temp[3]) = *((u32*)(b.b+12)) ^ *((u32*)rk[r][3]);
++      *((u32*)(b.b   )) = (*((u32*)T5[u.temp[0][0]])
+                          ^ *((u32*)T6[u.temp[3][1]])
+                          ^ *((u32*)T7[u.temp[2][2]]) 
+                          ^ *((u32*)T8[u.temp[1][3]]));
+-      *((u32*)(b+ 4)) = (*((u32*)T5[u.temp[1][0]])
++      *((u32*)(b.b+ 4)) = (*((u32*)T5[u.temp[1][0]])
+                          ^ *((u32*)T6[u.temp[0][1]])
+                          ^ *((u32*)T7[u.temp[3][2]]) 
+                          ^ *((u32*)T8[u.temp[2][3]]));
+-      *((u32*)(b+ 8)) = (*((u32*)T5[u.temp[2][0]])
++      *((u32*)(b.b+ 8)) = (*((u32*)T5[u.temp[2][0]])
+                          ^ *((u32*)T6[u.temp[1][1]])
+                          ^ *((u32*)T7[u.temp[0][2]]) 
+                          ^ *((u32*)T8[u.temp[3][3]]));
+-      *((u32*)(b+12)) = (*((u32*)T5[u.temp[3][0]])
++      *((u32*)(b.b+12)) = (*((u32*)T5[u.temp[3][0]])
+                          ^ *((u32*)T6[u.temp[2][1]])
+                          ^ *((u32*)T7[u.temp[1][2]]) 
+                          ^ *((u32*)T8[u.temp[0][3]]));
+     }
+ 
+   /* Last round is special. */   
+-  *((u32*)u.temp[0]) = *((u32*)(b   )) ^ *((u32*)rk[1][0]);
+-  *((u32*)u.temp[1]) = *((u32*)(b+ 4)) ^ *((u32*)rk[1][1]);
+-  *((u32*)u.temp[2]) = *((u32*)(b+ 8)) ^ *((u32*)rk[1][2]);
+-  *((u32*)u.temp[3]) = *((u32*)(b+12)) ^ *((u32*)rk[1][3]);
+-  b[ 0] = S5[u.temp[0][0]];
+-  b[ 1] = S5[u.temp[3][1]];
+-  b[ 2] = S5[u.temp[2][2]];
+-  b[ 3] = S5[u.temp[1][3]];
+-  b[ 4] = S5[u.temp[1][0]];
+-  b[ 5] = S5[u.temp[0][1]];
+-  b[ 6] = S5[u.temp[3][2]];
+-  b[ 7] = S5[u.temp[2][3]];
+-  b[ 8] = S5[u.temp[2][0]];
+-  b[ 9] = S5[u.temp[1][1]];
+-  b[10] = S5[u.temp[0][2]];
+-  b[11] = S5[u.temp[3][3]];
+-  b[12] = S5[u.temp[3][0]];
+-  b[13] = S5[u.temp[2][1]];
+-  b[14] = S5[u.temp[1][2]];
+-  b[15] = S5[u.temp[0][3]];
+-  *((u32*)(b   )) ^= *((u32*)rk[0][0]);
+-  *((u32*)(b+ 4)) ^= *((u32*)rk[0][1]);
+-  *((u32*)(b+ 8)) ^= *((u32*)rk[0][2]);
+-  *((u32*)(b+12)) ^= *((u32*)rk[0][3]);
++  *((u32*)u.temp[0]) = *((u32*)(b.b   )) ^ *((u32*)rk[1][0]);
++  *((u32*)u.temp[1]) = *((u32*)(b.b+ 4)) ^ *((u32*)rk[1][1]);
++  *((u32*)u.temp[2]) = *((u32*)(b.b+ 8)) ^ *((u32*)rk[1][2]);
++  *((u32*)u.temp[3]) = *((u32*)(b.b+12)) ^ *((u32*)rk[1][3]);
++  b.b[ 0] = S5[u.temp[0][0]];
++  b.b[ 1] = S5[u.temp[3][1]];
++  b.b[ 2] = S5[u.temp[2][2]];
++  b.b[ 3] = S5[u.temp[1][3]];
++  b.b[ 4] = S5[u.temp[1][0]];
++  b.b[ 5] = S5[u.temp[0][1]];
++  b.b[ 6] = S5[u.temp[3][2]];
++  b.b[ 7] = S5[u.temp[2][3]];
++  b.b[ 8] = S5[u.temp[2][0]];
++  b.b[ 9] = S5[u.temp[1][1]];
++  b.b[10] = S5[u.temp[0][2]];
++  b.b[11] = S5[u.temp[3][3]];
++  b.b[12] = S5[u.temp[3][0]];
++  b.b[13] = S5[u.temp[2][1]];
++  b.b[14] = S5[u.temp[1][2]];
++  b.b[15] = S5[u.temp[0][3]];
++  *((u32*)(b.b   )) ^= *((u32*)rk[0][0]);
++  *((u32*)(b.b+ 4)) ^= *((u32*)rk[0][1]);
++  *((u32*)(b.b+ 8)) ^= *((u32*)rk[0][2]);
++  *((u32*)(b.b+12)) ^= *((u32*)rk[0][3]);
++
++  memcpy (bx, b.b, 16);
+ #undef rk
+ }
+ 
+@@ -2078,7 +2125,7 @@
+   RIJNDAEL_context *ctx = context;
+ 
+   do_decrypt (ctx, b, a);
+-  _gcry_burn_stack (16+2*sizeof(int));
++  _gcry_burn_stack (48+2*sizeof(int));
+ }
+ 
+ 
diff --git a/dev-libs/libgcrypt/libgcrypt-1.2.0-r2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.2.0-r2.ebuild
new file mode 100644
index 000000000000..c324c3e7d267
--- /dev/null
+++ b/dev-libs/libgcrypt/libgcrypt-1.2.0-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.2.0-r2.ebuild,v 1.1 2004/10/10 14:12:19 weeve Exp $
+
+inherit eutils
+
+DESCRIPTION="general purpose crypto library based on the code used in GnuPG"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="ftp://ftp.gnupg.org/gcrypt/libgcrypt/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~sparc ~mips ~alpha ~hppa ~ia64 ~ppc ~ppc64 ~ppc-macos"
+IUSE="nls"
+
+DEPEND="dev-libs/libgpg-error"
+RDEPEND="nls? ( sys-devel/gettext )"
+
+src_unpack() {
+
+	unpack ${A}
+	epatch ${FILESDIR}/${PN}-hppa.patch
+	use sparc && epatch ${FILESDIR}/${PN}-rijndael.patch
+
+}
+
+src_compile() {
+	econf $(use_enable nls) --disable-dependency-tracking || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS BUGS ChangeLog COPYING* NEWS README* THANKS TODO VERSION
+
+	# backwards compat symlinks
+	if ! use ppc-macos
+	then
+		dosym libgcrypt.so.11 /usr/lib/libgcrypt.so.7
+		dosym libgcrypt-pth.so.11 /usr/lib/libgcrypt-pth.so.7
+		dosym libgcrypt-pthread.so.11 /usr/lib/libgcrypt-pthread.so.7
+	fi
+}