diff options
author | Patrick Steuer <patrick.steuer@de.ibm.com> | 2017-01-27 09:47:48 +0100 |
---|---|---|
committer | Andy Polyakov <appro@openssl.org> | 2017-10-17 21:58:04 +0200 |
commit | 465766c432e3f3af3114199b7b82bc6b41f7cf78 (patch) | |
tree | 1f342f18c7a3cd395a8d44b86662bc51715912fd | |
parent | c290d61fd35f2a33cf5e93f9dc74a0929171fc96 (diff) |
crypto/aes/asm/aes-s390x.pl: fix $softonly=1 code path.
Signed-off-by: Patrick Steuer <patrick.steuer@de.ibm.com>
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4501)
(cherry picked from commit 4c5100ce7d66ccff48d6435c1761b5e3281de61f)
-rw-r--r-- | crypto/aes/asm/aes-s390x.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/aes/asm/aes-s390x.pl b/crypto/aes/asm/aes-s390x.pl index a93d601913..ca575f18da 100644 --- a/crypto/aes/asm/aes-s390x.pl +++ b/crypto/aes/asm/aes-s390x.pl @@ -1439,7 +1439,7 @@ $code.=<<___ if (!$softonly); .Lctr32_hw_switch: ___ -$code.=<<___ if (0); ######### kmctr code was measured to be ~12% slower +$code.=<<___ if (!$softonly && 0);# kmctr code was measured to be ~12% slower larl $s0,OPENSSL_s390xcap_P lg $s0,8($s0) tmhh $s0,0x0004 # check for message_security-assist-4 @@ -1488,7 +1488,7 @@ $code.=<<___ if (0); ######### kmctr code was measured to be ~12% slower br $ra .align 16 ___ -$code.=<<___; +$code.=<<___ if (!$softonly); .Lctr32_km_loop: la $s2,16($sp) lgr $s3,$fp |