[28165] in CVS-changelog-for-Kerberos-V5
krb5 commit [krb5-1.12]: Avoid text relocations in iaesx86.s
daemon@ATHENA.MIT.EDU (Tom Yu)
Mon Jan 13 15:16:22 2014
Date: Mon, 13 Jan 2014 15:16:13 -0500
From: Tom Yu <tlyu@mit.edu>
Message-Id: <201401132016.s0DKGD5v007898@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/782ced86e178a91163c4aad7a93de589d2e60854
commit 782ced86e178a91163c4aad7a93de589d2e60854
Author: Tom Yu <tlyu@mit.edu>
Date: Fri Jan 10 15:04:32 2014 -0500
Avoid text relocations in iaesx86.s
Use PC-relative addressing to avoid runtime text relocations on i386.
Adapted patch from Nalin Dahyabhai.
(cherry picked from commit 3847aa109e8ff3f2781d53315f81e8d29ee35892)
ticket: 7815
version_fixed: 1.12.1
status: resolved
src/lib/crypto/builtin/aes/iaesx86.s | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/lib/crypto/builtin/aes/iaesx86.s b/src/lib/crypto/builtin/aes/iaesx86.s
index 1aa12e6..33470dd 100644
--- a/src/lib/crypto/builtin/aes/iaesx86.s
+++ b/src/lib/crypto/builtin/aes/iaesx86.s
@@ -323,7 +323,10 @@ _iEncExpandKey128:
movdqu [edx], xmm1
- movdqa xmm5, [shuffle_mask]
+ call .next
+.next:
+ pop ecx
+ movdqa xmm5, [ecx-.next+shuffle_mask]
add edx,16
@@ -421,7 +424,10 @@ _iEncExpandKey256:
add edx,32
- movdqa xmm5, [shuffle_mask] ; this mask is used by key_expansion
+ call .next
+.next:
+ pop ecx
+ movdqa xmm5, [ecx-.next+shuffle_mask] ; this mask is used by key_expansion
aeskeygenassist xmm2, xmm3, 0x1 ;
call key_expansion256
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
