[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  08d09628d2c9f3ef599399d8cad021a07ab98347 (commit)
      from  0a5d1a38f2106e526081500e30ee11b785824f1f (commit)


- Log -----------------------------------------------------------------
commit 08d09628d2c9f3ef599399d8cad021a07ab98347
Author: Andy Polyakov <appro at openssl.org>
Date:   Mon Mar 20 11:38:25 2017 +0100

    aes/asm/aesni-sha*-x86_64.pl: fix IV handling in SHAEXT paths.
    
    Initial IV was disregarded on SHAEXT-capable processors. Amazingly
    enough bulk AES128-SHA* talk-to-yourself tests were passing.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2992)

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

Summary of changes:
 crypto/aes/asm/aesni-sha1-x86_64.pl   | 1 +
 crypto/aes/asm/aesni-sha256-x86_64.pl | 1 +
 2 files changed, 2 insertions(+)

diff --git a/crypto/aes/asm/aesni-sha1-x86_64.pl b/crypto/aes/asm/aesni-sha1-x86_64.pl
index dcdf454..6644d70 100644
--- a/crypto/aes/asm/aesni-sha1-x86_64.pl
+++ b/crypto/aes/asm/aesni-sha1-x86_64.pl
@@ -1779,6 +1779,7 @@ $code.=<<___;
 	mov	240($key),$rounds
 	sub	$in0,$out
 	movups	($key),$rndkey0			# $key[0]
+	movups	($ivp),$iv			# load IV
 	movups	16($key),$rndkey[0]		# forward reference
 	lea	112($key),$key			# size optimization
 
diff --git a/crypto/aes/asm/aesni-sha256-x86_64.pl b/crypto/aes/asm/aesni-sha256-x86_64.pl
index ceec9a6..74ec844 100644
--- a/crypto/aes/asm/aesni-sha256-x86_64.pl
+++ b/crypto/aes/asm/aesni-sha256-x86_64.pl
@@ -1361,6 +1361,7 @@ $code.=<<___;
 	mov		240($key),$rounds
 	sub		$in0,$out
 	movups		($key),$rndkey0		# $key[0]
+	movups		($ivp),$iv		# load IV
 	movups		16($key),$rndkey[0]	# forward reference
 	lea		112($key),$key		# size optimization