math/Makefile.am, symm/Makefile.am: Use `--no-install' on oddball tests.

[catacomb] / symm / rijndael-arm-crypto.S

diff --git a/symm/rijndael-arm-crypto.S b/symm/rijndael-arm-crypto.S
index 23f8295..8a5484c 100644 (file)
--- a/symm/rijndael-arm-crypto.S
+++ b/symm/rijndael-arm-crypto.S
@@ -104,7 +104,7 @@ FUNC(rijndael_setup_arm_crypto)
        mla     r2, r1, r7, r1          // total key size in words
        leaextq r5, rijndael_rcon       // round constants
        sub     r8, r2, r3              // minus what we've copied already
-       veor    q1, q1                  // all-zero register for the key
+       vmov.i32 q1, #0                 // all-zero register for the key
        add     r8, r9, r8, lsl #2      // limit of the key buffer
        mov     r12, #0                 // position in current cycle
 
@@ -128,7 +128,6 @@ FUNC(rijndael_setup_arm_crypto)
        // First word of the cycle.  Byte substitution, rotation, and round
        // constant.
 1:     ldrb    r14, [r5], #1           // next round constant
-       ldr     r6, [r9, -r3, lsl #2]
        vdup.32 q0, r4
        aese.8  q0, q1                  // effectively, just SubBytes
        vmov.32 r4, d0[0]