[openssl] master update

[patrick.steuer at de.ibm.com]

The branch master has been updated
       via  7b2ce4a6e817e4385ff77fea0c6e349294c7b756 (commit)
      from  922241de76dce66a04e0217bfc270a5228b694f3 (commit)


- Log -----------------------------------------------------------------
commit 7b2ce4a6e817e4385ff77fea0c6e349294c7b756
Author: Patrick Steuer <patrick.steuer at de.ibm.com>
Date:   Tue Mar 3 17:40:07 2020 +0100

    aes-s390x.pl: fix stg offset caused by typo in perlasm
    
    Signed-off-by: Patrick Steuer <patrick.steuer at de.ibm.com>
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/11234)

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

Summary of changes:
 crypto/aes/asm/aes-s390x.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/aes/asm/aes-s390x.pl b/crypto/aes/asm/aes-s390x.pl
index a0c817a1fb..175bd15331 100644
--- a/crypto/aes/asm/aes-s390x.pl
+++ b/crypto/aes/asm/aes-s390x.pl
@@ -1989,7 +1989,7 @@ $code.=<<___;
 
 .Lxts_enc_done:
 	stg	$sp,$tweak+0($sp)	# wipe tweak
-	stg	$sp,$twesk+8($sp)
+	stg	$sp,$tweak+8($sp)
 	lm${g}	%r6,$ra,6*$SIZE_T($sp)
 	br	$ra
 .size	AES_xts_encrypt,.-AES_xts_encrypt
@@ -2269,7 +2269,7 @@ $code.=<<___;
 	stg	$sp,$tweak-16+8($sp)
 .Lxts_dec_done:
 	stg	$sp,$tweak+0($sp)	# wipe tweak
-	stg	$sp,$twesk+8($sp)
+	stg	$sp,$tweak+8($sp)
 	lm${g}	%r6,$ra,6*$SIZE_T($sp)
 	br	$ra
 .size	AES_xts_decrypt,.-AES_xts_decrypt