Commit 4c5100ce authored by Patrick Steuer's avatar Patrick Steuer Committed by Andy Polyakov
Browse files

crypto/aes/asm/aes-s390x.pl: fix $softonly=1 code path. 



Signed-off-by: default avatarPatrick Steuer <patrick.steuer@de.ibm.com>

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4501)
parent fe7a4d7c

crypto/aes/asm/aes-s390x.pl

+2 −2
Original line number Original line Diff line number Diff line
@@ -1439,7 +1439,7 @@ $code.=<<___ if (!$softonly); 




.Lctr32_hw_switch:

.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

	larl	$s0,OPENSSL_s390xcap_P

	lg	$s0,8($s0)

	lg	$s0,8($s0)

	tmhh	$s0,0x0004	# check for message_security-assist-4

	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

	br	$ra

.align	16

.align	16

___

___

$code.=<<___;

$code.=<<___ if (!$softonly);

.Lctr32_km_loop:

.Lctr32_km_loop:

	la	$s2,16($sp)

	la	$s2,16($sp)

	lgr	$s3,$fp

	lgr	$s3,$fp