From 465766c432e3f3af3114199b7b82bc6b41f7cf78 Mon Sep 17 00:00:00 2001 From: Patrick Steuer Date: Fri, 27 Jan 2017 09:47:48 +0100 Subject: [PATCH] crypto/aes/asm/aes-s390x.pl: fix $softonly=1 code path. Signed-off-by: Patrick Steuer Reviewed-by: Andy Polyakov Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/4501) (cherry picked from commit 4c5100ce7d66ccff48d6435c1761b5e3281de61f) --- 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 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 -- 2.25.1