[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  e8c42b9888f53ac60f92221da309dc5a2b007cc3 (commit)
      from  77376c0507b6159b94fc092d7fcd7e7c7a3ed7d9 (commit)


- Log -----------------------------------------------------------------
commit e8c42b9888f53ac60f92221da309dc5a2b007cc3
Author: Andy Polyakov <appro at openssl.org>
Date:   Fri Feb 23 11:51:41 2018 +0100

    ec/asm/x25519-x86_64.pl: fix up ADCX/ADOX fallback.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5447)

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

Summary of changes:
 crypto/ec/asm/x25519-x86_64.pl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/crypto/ec/asm/x25519-x86_64.pl b/crypto/ec/asm/x25519-x86_64.pl
index 6c0f738..68a7771 100755
--- a/crypto/ec/asm/x25519-x86_64.pl
+++ b/crypto/ec/asm/x25519-x86_64.pl
@@ -784,7 +784,7 @@ ___
 } else {
 $code.=<<___;
 .globl	x25519_fe64_eligible
-.type	x25519_fe64_eligible,\@function
+.type	x25519_fe64_eligible,\@abi-omnipotent
 .align	32
 x25519_fe64_eligible:
 	xor	%eax,%eax
@@ -792,6 +792,7 @@ x25519_fe64_eligible:
 .size	x25519_fe64_eligible,.-x25519_fe64_eligible
 
 .globl	x25519_fe64_mul
+.type	x25519_fe64_mul,\@abi-omnipotent
 .globl	x25519_fe64_sqr
 .globl	x25519_fe64_mul121666
 .globl	x25519_fe64_add
@@ -802,9 +803,10 @@ x25519_fe64_sqr:
 x25519_fe64_mul121666:
 x25519_fe64_add:
 x25519_fe64_sub:
-x25519_fe64_sub:
 x25519_fe64_tobytes:
 	.byte	0x0f,0x0b	# ud2
+	ret
+.size	x25519_fe64_mul,.-x25519_fe64_mul
 ___
 }
 $code.=<<___;