symm/{salsa20,chacha}.c (..._rand): Don't crash if nonce pointer is null.

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

diff --git a/symm/rijndael-arm-crypto.S b/symm/rijndael-arm-crypto.S
index 1e55169..23f8295 100644 (file)
--- a/symm/rijndael-arm-crypto.S
+++ b/symm/rijndael-arm-crypto.S
@@ -70,7 +70,7 @@ FUNC(rijndael_setup_arm_crypto)
        //      r2 = pointer to key material
        //      r3 = key size in words
 
-       pushreg {r4-r9, r14}
+       pushreg r4-r9, r14
 
        // The initial round key material is taken directly from the input
        // key, so copy it over.  Unfortunately, the key material is not
@@ -209,7 +209,7 @@ FUNC(rijndael_setup_arm_crypto)
        bl      endswap_block
 
        // All done.
-9:     popreg  {r4-r9, pc}
+9:     popreg  r4-r9, pc
 
 ENDFUNC