From: Andy Polyakov <appro@openssl.org>
Date: Thu, 5 Apr 2012 08:22:09 +0000 (+0000)
Subject: aes-s390x.pl: make it more foolproof [inspired by 1.0.1].
X-Git-Tag: master-post-reformat~1878
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bc9583efa22ea0b1ceb482bc8cdeebe11acbaf11;p=oweals%2Fopenssl.git

aes-s390x.pl: make it more foolproof [inspired by 1.0.1].
---

diff --git a/crypto/aes/asm/aes-s390x.pl b/crypto/aes/asm/aes-s390x.pl
index 687bdd9499..9699dc2c2c 100644
--- a/crypto/aes/asm/aes-s390x.pl
+++ b/crypto/aes/asm/aes-s390x.pl
@@ -783,6 +783,7 @@ $code.=<<___;
 .type	AES_set_encrypt_key,\@function
 .align	16
 AES_set_encrypt_key:
+_s390x_AES_set_encrypt_key:
 	lghi	$t0,0
 	cl${g}r	$inp,$t0
 	je	.Lminus1
@@ -1068,7 +1069,7 @@ $code.=<<___;
 AES_set_decrypt_key:
 	st${g}	$key,4*$SIZE_T($sp)	# I rely on AES_set_encrypt_key to
 	st${g}	$ra,14*$SIZE_T($sp)	# save non-volatile registers!
-	bras	$ra,AES_set_encrypt_key
+	bras	$ra,_s390x_AES_set_encrypt_key
 	l${g}	$key,4*$SIZE_T($sp)
 	l${g}	$ra,14*$SIZE_T($sp)
 	ltgr	%r2,%r2