4 files changed, 20 insertions, 172 deletions

diff --git a/security/libgcrypt/files/patch-cipher-rijndael.c b/security/libgcrypt/files/patch-cipher-rijndael.c
deleted file mode 100644
index c93a3a13f347..000000000000
--- a/security/libgcrypt/files/patch-cipher-rijndael.c
+++ /dev/null
@@ -1,61 +0,0 @@
---- cipher/rijndael.c.orig	2011-02-22 15:57:59.000000000 +0100
-+++ cipher/rijndael.c	2011-07-26 08:38:07.000000000 +0200
-@@ -844,13 +844,13 @@ do_aesni_cfb (const RIJNDAEL_context *ct
-                 "movdqa 0x90(%%esi), %%xmm1\n\t"
-                 aesenc_xmm1_xmm0
-                 "movdqa 0xa0(%%esi), %%xmm1\n\t"
--                "cmp $10, %[rounds]\n\t"
-+                "cmpl $10, %[rounds]\n\t"
-                 "jz .Lenclast%=\n\t"
-                 aesenc_xmm1_xmm0
-                 "movdqa 0xb0(%%esi), %%xmm1\n\t"
-                 aesenc_xmm1_xmm0
-                 "movdqa 0xc0(%%esi), %%xmm1\n\t"
--                "cmp $12, %[rounds]\n\t"
-+                "cmpl $12, %[rounds]\n\t"
-                 "jz .Lenclast%=\n\t"
-                 aesenc_xmm1_xmm0
-                 "movdqa 0xd0(%%esi), %%xmm1\n\t"
-@@ -862,7 +862,7 @@ do_aesni_cfb (const RIJNDAEL_context *ct
-                 "movdqu %[src], %%xmm1\n\t"      /* Save input.  */
-                 "pxor %%xmm1, %%xmm0\n\t"        /* xmm0 = input ^ IV  */
- 
--                "cmp $1, %[decrypt]\n\t"
-+                "cmpl $1, %[decrypt]\n\t"
-                 "jz .Ldecrypt_%=\n\t"
-                 "movdqa %%xmm0, %[iv]\n\t"       /* [encrypt] Store IV.  */
-                 "jmp .Lleave_%=\n"
-@@ -923,13 +923,13 @@ do_aesni_ctr (const RIJNDAEL_context *ct
-                 "movdqa 0x90(%%esi), %%xmm1\n\t"
-                 aesenc_xmm1_xmm0
-                 "movdqa 0xa0(%%esi), %%xmm1\n\t"
--                "cmp $10, %[rounds]\n\t"
-+                "cmpl $10, %[rounds]\n\t"
-                 "jz .Lenclast%=\n\t"
-                 aesenc_xmm1_xmm0
-                 "movdqa 0xb0(%%esi), %%xmm1\n\t"
-                 aesenc_xmm1_xmm0
-                 "movdqa 0xc0(%%esi), %%xmm1\n\t"
--                "cmp $12, %[rounds]\n\t"
-+                "cmpl $12, %[rounds]\n\t"
-                 "jz .Lenclast%=\n\t"
-                 aesenc_xmm1_xmm0
-                 "movdqa 0xd0(%%esi), %%xmm1\n\t"
-@@ -1050,7 +1050,7 @@ do_aesni_ctr_4 (const RIJNDAEL_context *
-                 aesenc_xmm1_xmm3
-                 aesenc_xmm1_xmm4
-                 "movdqa 0xa0(%%esi), %%xmm1\n\t"
--                "cmp $10, %[rounds]\n\t"
-+                "cmpl $10, %[rounds]\n\t"
-                 "jz .Lenclast%=\n\t"
-                 aesenc_xmm1_xmm0
-                 aesenc_xmm1_xmm2
-@@ -1062,7 +1062,7 @@ do_aesni_ctr_4 (const RIJNDAEL_context *
-                 aesenc_xmm1_xmm3
-                 aesenc_xmm1_xmm4
-                 "movdqa 0xc0(%%esi), %%xmm1\n\t"
--                "cmp $12, %[rounds]\n\t"
-+                "cmpl $12, %[rounds]\n\t"
-                 "jz .Lenclast%=\n\t"
-                 aesenc_xmm1_xmm0
-                 aesenc_xmm1_xmm2
diff --git a/security/libgcrypt/files/patch-gcrypt.h.in b/security/libgcrypt/files/patch-gcrypt.h.in
new file mode 100644
index 000000000000..ed18bf91aca8
--- /dev/null
+++ b/security/libgcrypt/files/patch-gcrypt.h.in
@@ -0,0 +1,20 @@
+--- src/gcrypt.h.in-orig	2014-07-28 03:54:16.000000000 +0200
++++ src/gcrypt.h.in	2014-07-28 03:54:32.000000000 +0200
+@@ -508,7 +508,7 @@
+     GCRYMPI_FLAG_USER1 = 0x0100,/* User flag 1.  */
+     GCRYMPI_FLAG_USER2 = 0x0200,/* User flag 2.  */
+     GCRYMPI_FLAG_USER3 = 0x0400,/* User flag 3.  */
+-    GCRYMPI_FLAG_USER4 = 0x0800,/* User flag 4.  */
++    GCRYMPI_FLAG_USER4 = 0x0800 /* User flag 4.  */
+   };
+ 
+ 
+@@ -1345,7 +1345,7 @@
+ /* Flags used with the open function.  */
+ enum gcry_mac_flags
+   {
+-    GCRY_MAC_FLAG_SECURE = 1,  /* Allocate all buffers in "secure" memory.  */
++    GCRY_MAC_FLAG_SECURE = 1   /* Allocate all buffers in "secure" memory.  */
+   };
+ 
+ /* Create a MAC handle for algorithm ALGO.  FLAGS may be given as an bitwise OR
diff --git a/security/libgcrypt/files/patch-mpi-config.links b/security/libgcrypt/files/patch-mpi-config.links
deleted file mode 100644
index 3a75a6053dec..000000000000
--- a/security/libgcrypt/files/patch-mpi-config.links
+++ /dev/null
@@ -1,32 +0,0 @@
---- mpi/config.links.orig	2013-07-25 11:10:04.000000000 +0200
-+++ mpi/config.links	2014-03-16 17:53:55.000000000 +0100
-@@ -46,9 +46,7 @@
-        path=""
-        ;;
-     i[3467]86*-*-openbsd*      | \
--    i[3467]86*-*-freebsd*-elf  | \
--    i[3467]86*-*-freebsd[3-9]* | \
--    i[3467]86*-*-freebsdelf*   | \
-+    i[3467]86*-*-freebsd*      | \
-     i[3467]86*-*-netbsd*       | \
-     i[3467]86*-*-k*bsd*)
-        echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
-@@ -56,9 +54,7 @@
-        path="i386"
-        ;;
-     i586*-*-openbsd*         | \
--    i586*-*-freebsd*-elf     | \
--    i586*-*-freebsd[3-9]*    | \
--    i586*-*-freebsdelf*      | \
-+    i586*-*-freebsd*         | \
-     i586*-*-netbsd*	     | \
-     i586*-*-k*bsd*	     | \
-     pentium-*-netbsd*	     | \
-@@ -112,6 +108,7 @@
- 	cat  $srcdir/mpi/i386/syntax.h	    >>./mpi/asm-syntax.h
- 	path="i586 i386"
- 	;;
-+    amd64-*-* | \
-     x86_64-*-*)
- 	echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
- 	cat  $srcdir/mpi/i386/syntax.h	    >>./mpi/asm-syntax.h
diff --git a/security/libgcrypt/files/patch-mpi-longlong.h b/security/libgcrypt/files/patch-mpi-longlong.h
deleted file mode 100644
index cd50255bf223..000000000000
--- a/security/libgcrypt/files/patch-mpi-longlong.h
+++ /dev/null
@@ -1,79 +0,0 @@
---- ./mpi/longlong.h.orig	2013-07-25 09:10:04.000000000 +0000
-+++ ./mpi/longlong.h	2014-06-09 18:53:59.000000000 +0000
-@@ -188,8 +188,8 @@
- #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-   __asm__ ("adds %1, %4, %5\n"                                          \
- 	   "adc  %0, %2, %3"                                            \
--	   : "=r" ((USItype)(sh)),                                      \
--	     "=&r" ((USItype)(sl))                                      \
-+	   : "=r" ((sh)),                                               \
-+	     "=&r" ((sl))                                               \
- 	   : "%r" ((USItype)(ah)),                                      \
- 	     "rI" ((USItype)(bh)),                                      \
- 	     "%r" ((USItype)(al)),                                      \
-@@ -197,8 +197,8 @@
- #define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-   __asm__ ("subs %1, %4, %5\n"                                          \
- 	   "sbc  %0, %2, %3"                                            \
--	   : "=r" ((USItype)(sh)),                                      \
--	     "=&r" ((USItype)(sl))                                      \
-+	   : "=r" ((sh)),                                               \
-+	     "=&r" ((sl))                                               \
- 	   : "r" ((USItype)(ah)),                                       \
- 	     "rI" ((USItype)(bh)),                                      \
- 	     "r" ((USItype)(al)),                                       \
-@@ -225,10 +225,10 @@
- 	   : "r0", "r1", "r2")
- #else
- #define umul_ppmm(xh, xl, a, b)                                         \
--  __asm__ ("%@ Inlined umul_ppmm\n"                                     \
--	   "umull %r1, %r0, %r2, %r3"                                   \
--		   : "=&r" ((USItype)(xh)),                             \
--		     "=r" ((USItype)(xl))                               \
-+  __asm__ (                                                             \
-+	   "umull %1, %0, %2, %3"                                       \
-+		   : "=&r" ((xh)),                                      \
-+		     "=r" ((xl))                                        \
- 		   : "r" ((USItype)(a)),                                \
- 		     "r" ((USItype)(b))                                 \
- 		   : "r0", "r1")
-@@ -437,8 +437,8 @@
- #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-   __asm__ ("addl %5,%1\n"                                               \
- 	   "adcl %3,%0"                                                 \
--	   : "=r" ((USItype)(sh)),                                      \
--	     "=&r" ((USItype)(sl))                                      \
-+	   : "=r" (sh),                                                 \
-+	     "=&r" (sl)                                                 \
- 	   : "%0" ((USItype)(ah)),                                      \
- 	     "g" ((USItype)(bh)),                                       \
- 	     "%1" ((USItype)(al)),                                      \
-@@ -446,22 +446,22 @@
- #define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-   __asm__ ("subl %5,%1\n"                                               \
- 	   "sbbl %3,%0"                                                 \
--	   : "=r" ((USItype)(sh)),                                      \
--	     "=&r" ((USItype)(sl))                                      \
-+	   : "=r" (sh),                                                 \
-+	     "=&r" (sl)                                                 \
- 	   : "0" ((USItype)(ah)),                                       \
- 	     "g" ((USItype)(bh)),                                       \
- 	     "1" ((USItype)(al)),                                       \
- 	     "g" ((USItype)(bl)))
- #define umul_ppmm(w1, w0, u, v) \
-   __asm__ ("mull %3"                                                    \
--	   : "=a" ((USItype)(w0)),                                      \
--	     "=d" ((USItype)(w1))                                       \
-+	   : "=a" (w0),                                                 \
-+	     "=d" (w1)                                                  \
- 	   : "%0" ((USItype)(u)),                                       \
- 	     "rm" ((USItype)(v)))
- #define udiv_qrnnd(q, r, n1, n0, d) \
-   __asm__ ("divl %4"                                                    \
--	   : "=a" ((USItype)(q)),                                       \
--	     "=d" ((USItype)(r))                                        \
-+	   : "=a" (q),                                                  \
-+	     "=d" (r)                                                   \
- 	   : "0" ((USItype)(n0)),                                       \
- 	     "1" ((USItype)(n1)),                                       \
- 	     "rm" ((USItype)(d)))