[openssl] OpenSSL_1_1_1-stable update
patrick.steuer at de.ibm.com
patrick.steuer at de.ibm.com
Thu Mar 5 16:25:44 UTC 2020
The branch OpenSSL_1_1_1-stable has been updated
via 1d5359316949b9320f73ec74ec619714e356d716 (commit)
from bf42b99ed4057e1877f72a0c2e7b445f5ee5d750 (commit)
- Log -----------------------------------------------------------------
commit 1d5359316949b9320f73ec74ec619714e356d716
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)
(cherry picked from commit 7b2ce4a6e817e4385ff77fea0c6e349294c7b756)
-----------------------------------------------------------------------
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 cf748f102a..f740626370 100644
--- a/crypto/aes/asm/aes-s390x.pl
+++ b/crypto/aes/asm/aes-s390x.pl
@@ -1987,7 +1987,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
@@ -2267,7 +2267,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
More information about the openssl-commits
mailing list