[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  4ef29667abafae1726269fa1b4397443792d0326 (commit)
       via  a85dbf115c34dfd0eaee7d73d7271f3673fd2286 (commit)
      from  6bb2106e24a16e12ce03a244a56c7c5fc7eab96a (commit)


- Log -----------------------------------------------------------------
commit 4ef29667abafae1726269fa1b4397443792d0326
Author: Andy Polyakov <appro at openssl.org>
Date:   Thu Feb 11 09:39:37 2016 +0100

    poly1305/asm/poly1305-x86_64.pl: MacOS X portability fix.
    
    Reviewed-by: Viktor Dukhovni <viktor at openssl.org>

commit a85dbf115c34dfd0eaee7d73d7271f3673fd2286
Author: Andy Polyakov <appro at openssl.org>
Date:   Thu Feb 11 00:36:48 2016 +0100

    poly1305/asm/poly1305-x86_64.pl: fix mingw64 build.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/poly1305/asm/poly1305-x86_64.pl | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/crypto/poly1305/asm/poly1305-x86_64.pl b/crypto/poly1305/asm/poly1305-x86_64.pl
index d991365..b827d24 100755
--- a/crypto/poly1305/asm/poly1305-x86_64.pl
+++ b/crypto/poly1305/asm/poly1305-x86_64.pl
@@ -129,7 +129,9 @@ $code.=<<___;
 .extern	OPENSSL_ia32cap_P
 
 .globl	poly1305_init
-.type	poly1305_init,\@function,2
+.globl	poly1305_blocks
+.globl	poly1305_emit
+.type	poly1305_init,\@function,3
 .align	32
 poly1305_init:
 	xor	%rax,%rax
@@ -172,10 +174,10 @@ $code.=<<___;
 	ret
 .size	poly1305_init,.-poly1305_init
 
-.globl	poly1305_blocks
 .type	poly1305_blocks,\@function,4
 .align	32
 poly1305_blocks:
+.Lblocks:
 	sub	\$16,$len		# too short?
 	jc	.Lno_data
 
@@ -231,10 +233,10 @@ $code.=<<___;
 	ret
 .size	poly1305_blocks,.-poly1305_blocks
 
-.globl	poly1305_emit
 .type	poly1305_emit,\@function,3
 .align	32
 poly1305_emit:
+.Lemit:
 	mov	0($ctx),%r8	# load hash value
 	mov	8($ctx),%r9
 	mov	16($ctx),%r10
@@ -453,7 +455,7 @@ poly1305_blocks_avx:
 	cmp	\$128,$len
 	jae	.Lblocks_avx
 	test	%r8d,%r8d
-	jz	poly1305_blocks
+	jz	.Lblocks
 
 .Lblocks_avx:
 	and	\$-16,$len
@@ -1275,7 +1277,7 @@ $code.=<<___;
 .align	32
 poly1305_emit_avx:
 	cmpl	\$0,20($ctx)	# is_base2_26?
-	je	poly1305_emit
+	je	.Lemit
 
 	mov	0($ctx),%eax	# load hash value base 2^26
 	mov	4($ctx),%ecx
@@ -1339,7 +1341,7 @@ poly1305_blocks_avx2:
 	cmp	\$128,$len
 	jae	.Lblocks_avx2
 	test	%r8d,%r8d
-	jz	poly1305_blocks
+	jz	.Lblocks
 
 .Lblocks_avx2:
 	and	\$-16,$len