Attachment #144465 for bug #191256




# $FreeBSD: head/security/libgcrypt/Makefile 360837 2014-07-05 23:19:05Z sbruno $

PORTNAME=	libgcrypt
PORTVERSION=	1.6.1
PORTREVISION=	3
CATEGORIES=	security
MASTER_SITES=	${MASTER_SITE_GNUPG}
MASTER_SITE_SUBDIR=	${PORTNAME}


post-patch:
	@${RM} -f ${WRKSRC}/doc/gcrypt.info*
	@${REINPLACE_CMD} -e 's|(3)|(2)|g' \
		${WRKSRC}/mpi/i386/*.S

.if ${PORT_OPTIONS:MDOCS}
post-install:
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgcrypt.so.20
	${MKDIR} ${STAGEDIR}${DOCSDIR}
	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
.endif


Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (libgcrypt-1.5.3.tar.bz2) = bcf5334e7da352c45de6aec5d2084ce9a1d30029ff4a4a5da13f1848874759d1	1	SHA256 (libgcrypt-1.6.1.tar.bz2) = a1c3efea69f8ffe769f488b300ce190eeeb0c30de24a53f1c1b6e4202fdc2070
2	SIZE (libgcrypt-1.5.3.tar.bz2) = 1508530	2	SIZE (libgcrypt-1.6.1.tar.bz2) = 2470885




--- 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




--- configure.orig	2014-07-06 12:50:05.000000000 +0200
+++ configure	2014-07-06 12:51:17.000000000 +0200
@@ -17471,6 +17471,7 @@
 
 
    case "${host}" in
+      amd64-*-* | \
       x86_64-*-*)
          # Build with the assembly implementation
          GCRYPT_CIPHERS="$GCRYPT_CIPHERS blowfish-amd64.lo"
@@ -17500,6 +17501,7 @@
 
 
    case "${host}" in
+      amd64-*-* | \
       x86_64-*-*)
          # Build with the assembly implementation
          GCRYPT_CIPHERS="$GCRYPT_CIPHERS cast5-amd64.lo"
@@ -17547,6 +17549,7 @@
 
 
    case "${host}" in
+      amd64-*-* | \
       x86_64-*-*)
          # Build with the assembly implementation
          GCRYPT_CIPHERS="$GCRYPT_CIPHERS rijndael-amd64.lo"
@@ -17576,6 +17579,7 @@
 
 
    case "${host}" in
+      amd64-*-* | \
       x86_64-*-*)
          # Build with the assembly implementation
          GCRYPT_CIPHERS="$GCRYPT_CIPHERS twofish-amd64.lo"
@@ -17605,6 +17609,7 @@
 
 
    case "${host}" in
+      amd64-*-* | \
       x86_64-*-*)
          # Build with the SSE2 implementation
          GCRYPT_CIPHERS="$GCRYPT_CIPHERS serpent-sse2-amd64.lo"
@@ -17733,6 +17738,7 @@
 
 
    case "${host}" in
+      amd64-*-* | \
       x86_64-*-*)
          # Build with the assembly implementation
          GCRYPT_CIPHERS="$GCRYPT_CIPHERS salsa20-amd64.lo"
@@ -17959,6 +17965,7 @@
 
 
    case "${host}" in
+      amd64-*-* | \
       x86_64-*-*)
          # Build with the assembly implementation
          GCRYPT_DIGESTS="$GCRYPT_DIGESTS sha256-ssse3-amd64.lo"
@@ -17984,6 +17991,7 @@
 
 
    case "${host}" in
+      amd64-*-* | \
       x86_64-*-*)
          # Build with the assembly implementation
          GCRYPT_DIGESTS="$GCRYPT_DIGESTS sha512-ssse3-amd64.lo"
@@ -18044,6 +18052,7 @@
 
 
 case "${host}" in
+  amd64-*-* | \
   x86_64-*-*)
     # Build with the assembly implementation
     GCRYPT_DIGESTS="$GCRYPT_DIGESTS sha1-ssse3-amd64.lo"

Lines 1-79 Link Here

(-)files/patch-mpi-longlong.h (-79 lines)
1	--- ./mpi/longlong.h.orig 2013-07-25 09:10:04.000000000 +0000
2	+++ ./mpi/longlong.h 2014-06-09 18:53:59.000000000 +0000
3	@@ -188,8 +188,8 @@
4	#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
5	__asm__ ("adds %1, %4, %5\n" \
6	"adc %0, %2, %3" \
7	- : "=r" ((USItype)(sh)), \
8	- "=&r" ((USItype)(sl)) \
9	+ : "=r" ((sh)), \
10	+ "=&r" ((sl)) \
11	: "%r" ((USItype)(ah)), \
12	"rI" ((USItype)(bh)), \
13	"%r" ((USItype)(al)), \
14	@@ -197,8 +197,8 @@
15	#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
16	__asm__ ("subs %1, %4, %5\n" \
17	"sbc %0, %2, %3" \
18	- : "=r" ((USItype)(sh)), \
19	- "=&r" ((USItype)(sl)) \
20	+ : "=r" ((sh)), \
21	+ "=&r" ((sl)) \
22	: "r" ((USItype)(ah)), \
23	"rI" ((USItype)(bh)), \
24	"r" ((USItype)(al)), \
25	@@ -225,10 +225,10 @@
26	: "r0", "r1", "r2")
27	#else
28	#define umul_ppmm(xh, xl, a, b) \
29	- __asm__ ("%@ Inlined umul_ppmm\n" \
30	- "umull %r1, %r0, %r2, %r3" \
31	- : "=&r" ((USItype)(xh)), \
32	- "=r" ((USItype)(xl)) \
33	+ __asm__ ( \
34	+ "umull %1, %0, %2, %3" \
35	+ : "=&r" ((xh)), \
36	+ "=r" ((xl)) \
37	: "r" ((USItype)(a)), \
38	"r" ((USItype)(b)) \
39	: "r0", "r1")
40	@@ -437,8 +437,8 @@
41	#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
42	__asm__ ("addl %5,%1\n" \
43	"adcl %3,%0" \
44	- : "=r" ((USItype)(sh)), \
45	- "=&r" ((USItype)(sl)) \
46	+ : "=r" (sh), \
47	+ "=&r" (sl) \
48	: "%0" ((USItype)(ah)), \
49	"g" ((USItype)(bh)), \
50	"%1" ((USItype)(al)), \
51	@@ -446,22 +446,22 @@
52	#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
53	__asm__ ("subl %5,%1\n" \
54	"sbbl %3,%0" \
55	- : "=r" ((USItype)(sh)), \
56	- "=&r" ((USItype)(sl)) \
57	+ : "=r" (sh), \
58	+ "=&r" (sl) \
59	: "0" ((USItype)(ah)), \
60	"g" ((USItype)(bh)), \
61	"1" ((USItype)(al)), \
62	"g" ((USItype)(bl)))
63	#define umul_ppmm(w1, w0, u, v) \
64	__asm__ ("mull %3" \
65	- : "=a" ((USItype)(w0)), \
66	- "=d" ((USItype)(w1)) \
67	+ : "=a" (w0), \
68	+ "=d" (w1) \
69	: "%0" ((USItype)(u)), \
70	"rm" ((USItype)(v)))
71	#define udiv_qrnnd(q, r, n1, n0, d) \
72	__asm__ ("divl %4" \
73	- : "=a" ((USItype)(q)), \
74	- "=d" ((USItype)(r)) \
75	+ : "=a" (q), \
76	+ "=d" (r) \
77	: "0" ((USItype)(n0)), \
78	"1" ((USItype)(n1)), \
79	"rm" ((USItype)(d)))

Lines 1-9 Link Here

(-)pkg-plist (-2 / +3 lines)
		1	bin/mpicalc
1	bin/dumpsexp	2	bin/dumpsexp
2	bin/hmac256	3	bin/hmac256
3	bin/libgcrypt-config	4	bin/libgcrypt-config
4	include/gcrypt.h	5	include/gcrypt.h
5	include/gcrypt-module.h
6	lib/libgcrypt.la	6	lib/libgcrypt.la
7	lib/libgcrypt.so	7	lib/libgcrypt.so
8	lib/libgcrypt.so.19	8	lib/libgcrypt.so.20
		9	man/man1/hmac256.1.gz
9	share/aclocal/libgcrypt.m4	10	share/aclocal/libgcrypt.m4

Return to bug 191256

Lines 2-9 Link Here

(-)Makefile (-3 / +5 lines)
2	# $FreeBSD: head/security/libgcrypt/Makefile 360837 2014-07-05 23:19:05Z sbruno $	2	# $FreeBSD: head/security/libgcrypt/Makefile 360837 2014-07-05 23:19:05Z sbruno $
3		3
4	PORTNAME= libgcrypt	4	PORTNAME= libgcrypt
5	PORTVERSION= 1.5.3	5	PORTVERSION= 1.6.1
6	PORTREVISION= 3
7	CATEGORIES= security	6	CATEGORIES= security
8	MASTER_SITES= ${MASTER_SITE_GNUPG}	7	MASTER_SITES= ${MASTER_SITE_GNUPG}
9	MASTER_SITE_SUBDIR= ${PORTNAME}	8	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 41-50 Link Here
41		40
42	post-patch:	41	post-patch:
43	@${RM} -f ${WRKSRC}/doc/gcrypt.info*	42	@${RM} -f ${WRKSRC}/doc/gcrypt.info*
		43	@${REINPLACE_CMD} -e 's\|(3)\|(2)\|g' \
		44	${WRKSRC}/mpi/i386/*.S
44		45
45	.if ${PORT_OPTIONS:MDOCS}	46	.if ${PORT_OPTIONS:MDOCS}
46	post-install:	47	post-install:
47	@${MKDIR} ${STAGEDIR}${DOCSDIR}	48	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgcrypt.so.20
		49	${MKDIR} ${STAGEDIR}${DOCSDIR}
48	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}	50	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
49	.endif	51	.endif
50		52

Lines 1-61 Link Here

(-)files/patch-cipher-rijndael.c (-61 lines)
1	--- cipher/rijndael.c.orig 2011-02-22 15:57:59.000000000 +0100
2	+++ cipher/rijndael.c 2011-07-26 08:38:07.000000000 +0200
3	@@ -844,13 +844,13 @@ do_aesni_cfb (const RIJNDAEL_context *ct
4	"movdqa 0x90(%%esi), %%xmm1\n\t"
5	aesenc_xmm1_xmm0
6	"movdqa 0xa0(%%esi), %%xmm1\n\t"
7	- "cmp $10, %[rounds]\n\t"
8	+ "cmpl $10, %[rounds]\n\t"
9	"jz .Lenclast%=\n\t"
10	aesenc_xmm1_xmm0
11	"movdqa 0xb0(%%esi), %%xmm1\n\t"
12	aesenc_xmm1_xmm0
13	"movdqa 0xc0(%%esi), %%xmm1\n\t"
14	- "cmp $12, %[rounds]\n\t"
15	+ "cmpl $12, %[rounds]\n\t"
16	"jz .Lenclast%=\n\t"
17	aesenc_xmm1_xmm0
18	"movdqa 0xd0(%%esi), %%xmm1\n\t"
19	@@ -862,7 +862,7 @@ do_aesni_cfb (const RIJNDAEL_context *ct
20	"movdqu %[src], %%xmm1\n\t" /* Save input. */
21	"pxor %%xmm1, %%xmm0\n\t" /* xmm0 = input ^ IV */
22
23	- "cmp $1, %[decrypt]\n\t"
24	+ "cmpl $1, %[decrypt]\n\t"
25	"jz .Ldecrypt_%=\n\t"
26	"movdqa %%xmm0, %[iv]\n\t" /* [encrypt] Store IV. */
27	"jmp .Lleave_%=\n"
28	@@ -923,13 +923,13 @@ do_aesni_ctr (const RIJNDAEL_context *ct
29	"movdqa 0x90(%%esi), %%xmm1\n\t"
30	aesenc_xmm1_xmm0
31	"movdqa 0xa0(%%esi), %%xmm1\n\t"
32	- "cmp $10, %[rounds]\n\t"
33	+ "cmpl $10, %[rounds]\n\t"
34	"jz .Lenclast%=\n\t"
35	aesenc_xmm1_xmm0
36	"movdqa 0xb0(%%esi), %%xmm1\n\t"
37	aesenc_xmm1_xmm0
38	"movdqa 0xc0(%%esi), %%xmm1\n\t"
39	- "cmp $12, %[rounds]\n\t"
40	+ "cmpl $12, %[rounds]\n\t"
41	"jz .Lenclast%=\n\t"
42	aesenc_xmm1_xmm0
43	"movdqa 0xd0(%%esi), %%xmm1\n\t"
44	@@ -1050,7 +1050,7 @@ do_aesni_ctr_4 (const RIJNDAEL_context *
45	aesenc_xmm1_xmm3
46	aesenc_xmm1_xmm4
47	"movdqa 0xa0(%%esi), %%xmm1\n\t"
48	- "cmp $10, %[rounds]\n\t"
49	+ "cmpl $10, %[rounds]\n\t"
50	"jz .Lenclast%=\n\t"
51	aesenc_xmm1_xmm0
52	aesenc_xmm1_xmm2
53	@@ -1062,7 +1062,7 @@ do_aesni_ctr_4 (const RIJNDAEL_context *
54	aesenc_xmm1_xmm3
55	aesenc_xmm1_xmm4
56	"movdqa 0xc0(%%esi), %%xmm1\n\t"
57	- "cmp $12, %[rounds]\n\t"
58	+ "cmpl $12, %[rounds]\n\t"
59	"jz .Lenclast%=\n\t"
60	aesenc_xmm1_xmm0
61	aesenc_xmm1_xmm2

Line 0 Link Here

(-)files/patch-configure (+74 lines)
		1	--- configure.orig 2014-07-06 12:50:05.000000000 +0200
		2	+++ configure 2014-07-06 12:51:17.000000000 +0200
		3	@@ -17471,6 +17471,7 @@
		4
		5
		6	case "${host}" in
		7	+ amd64-- \| \
		8	x86_64--)
		9	# Build with the assembly implementation
		10	GCRYPT_CIPHERS="$GCRYPT_CIPHERS blowfish-amd64.lo"
		11	@@ -17500,6 +17501,7 @@
		12
		13
		14	case "${host}" in
		15	+ amd64-- \| \
		16	x86_64--)
		17	# Build with the assembly implementation
		18	GCRYPT_CIPHERS="$GCRYPT_CIPHERS cast5-amd64.lo"
		19	@@ -17547,6 +17549,7 @@
		20
		21
		22	case "${host}" in
		23	+ amd64-- \| \
		24	x86_64--)
		25	# Build with the assembly implementation
		26	GCRYPT_CIPHERS="$GCRYPT_CIPHERS rijndael-amd64.lo"
		27	@@ -17576,6 +17579,7 @@
		28
		29
		30	case "${host}" in
		31	+ amd64-- \| \
		32	x86_64--)
		33	# Build with the assembly implementation
		34	GCRYPT_CIPHERS="$GCRYPT_CIPHERS twofish-amd64.lo"
		35	@@ -17605,6 +17609,7 @@
		36
		37
		38	case "${host}" in
		39	+ amd64-- \| \
		40	x86_64--)
		41	# Build with the SSE2 implementation
		42	GCRYPT_CIPHERS="$GCRYPT_CIPHERS serpent-sse2-amd64.lo"
		43	@@ -17733,6 +17738,7 @@
		44
		45
		46	case "${host}" in
		47	+ amd64-- \| \
		48	x86_64--)
		49	# Build with the assembly implementation
		50	GCRYPT_CIPHERS="$GCRYPT_CIPHERS salsa20-amd64.lo"
		51	@@ -17959,6 +17965,7 @@
		52
		53
		54	case "${host}" in
		55	+ amd64-- \| \
		56	x86_64--)
		57	# Build with the assembly implementation
		58	GCRYPT_DIGESTS="$GCRYPT_DIGESTS sha256-ssse3-amd64.lo"
		59	@@ -17984,6 +17991,7 @@
		60
		61
		62	case "${host}" in
		63	+ amd64-- \| \
		64	x86_64--)
65	# Build with the assembly implementation
66	GCRYPT_DIGESTS="$GCRYPT_DIGESTS sha512-ssse3-amd64.lo"
67	@@ -18044,6 +18052,7 @@
68
69
70	case "${host}" in
71	+ amd64-- \| \
72	x86_64--)
73	# Build with the assembly implementation
74	GCRYPT_DIGESTS="$GCRYPT_DIGESTS sha1-ssse3-amd64.lo"