Merge branch 'maint'

[git.git] / arm / sha1_arm.S

diff --git a/arm/sha1_arm.S b/arm/sha1_arm.S
index da92d20e844b8ed821e3fa3c3d2ee7984ada491c..41e92636e0ff98ac620de75d66917999d55aca9e 100644 (file)
--- a/arm/sha1_arm.S
+++ b/arm/sha1_arm.S
@@ -10,7 +10,7 @@
  */
 
        .text
-       .globl  sha_transform
+       .globl  arm_sha_transform
 
 /*
  * void sha_transform(uint32_t *hash, const unsigned char *data, uint32_t *W);
@@ -18,12 +18,12 @@
  * note: the "data" pointer may be unaligned.
  */
 
-sha_transform:
+arm_sha_transform:
 
        stmfd   sp!, {r4 - r8, lr}
 
        @ for (i = 0; i < 16; i++)
-       @         W[i] = ntohl(((uint32_t *)data)[i]); */
+       @         W[i] = ntohl(((uint32_t *)data)[i]);
 
 #ifdef __ARMEB__
        mov     r4, r0
@@ -181,4 +181,3 @@ sha_transform:
 
 .L_sha_K:
        .word   0x5a827999, 0x6ed9eba1, 0x8f1bbcdc, 0xca62c1d6
-