[krbdev.mit.edu #7815] AutoReply: Text relocations in iaesx86.s

[nalin@redhat.com via RT]

--- krb5-1.12/src/lib/crypto/builtin/aes/iaesx86.s
+++ krb5-1.12/src/lib/crypto/builtin/aes/iaesx86.s
@@ -216,7 +216,7 @@
 
 
 
-section .data
+section .text
 align 16
 shuffle_mask:
 DD 0FFFFFFFFh
@@ -224,6 +224,8 @@
 DD 07060504h
 DD 0B0A0908h
 
+section .data
+align 16
 byte_swap_16:
 DDQ 0x000102030405060708090A0B0C0D0E0F
 
@@ -323,7 +325,12 @@
 
         movdqu [edx], xmm1
 
-        movdqa xmm5, [shuffle_mask]
+        push ebx
+        call .next
+.next
+        pop ebx
+        movdqu xmm5, [ebx-.next+shuffle_mask]
+        pop ebx
 
         add edx,16
 
@@ -421,7 +428,12 @@
 
     add edx,32
 
-    movdqa xmm5, [shuffle_mask]  ; this mask is used by key_expansion
+    push ebx
+    call .next
+.next
+    pop ebx
+    movdqu xmm5, [ebx-.next+shuffle_mask]  ; this mask is used by key_expansion
+    pop ebx
 
     aeskeygenassist xmm2, xmm3, 0x1     ;
     call key_expansion256