Merge branch 'maint-1.6.0' into maint-1.6.1

diff --git a/arm/sha1.c b/arm/sha1.c
index 9e3ae038e818f4e21bc50f864fc5204f6fa44daa..c61ad4aff97eed5f2f332f881a99e06f47b11128 100644 (file)
--- a/arm/sha1.c
+++ b/arm/sha1.c
@@ -8,9 +8,9 @@
 #include <string.h>
 #include "sha1.h"
 
-extern void sha_transform(uint32_t *hash, const unsigned char *data, uint32_t *W);
+extern void arm_sha_transform(uint32_t *hash, const unsigned char *data, uint32_t *W);
 
-void SHA1_Init(SHA_CTX *c)
+void arm_SHA1_Init(arm_SHA_CTX *c)
 {
        c->len = 0;
        c->hash[0] = 0x67452301;
@@ -20,7 +20,7 @@ void SHA1_Init(SHA_CTX *c)
        c->hash[4] = 0xc3d2e1f0;
 }
 
-void SHA1_Update(SHA_CTX *c, const void *p, unsigned long n)
+void arm_SHA1_Update(arm_SHA_CTX *c, const void *p, unsigned long n)
 {
        uint32_t workspace[80];
        unsigned int partial;
@@ -32,12 +32,12 @@ void SHA1_Update(SHA_CTX *c, const void *p, unsigned long n)
                if (partial) {
                        done = 64 - partial;
                        memcpy(c->buffer + partial, p, done);
-                       sha_transform(c->hash, c->buffer, workspace);
+                       arm_sha_transform(c->hash, c->buffer, workspace);
                        partial = 0;
                } else
                        done = 0;
                while (n >= done + 64) {
-                       sha_transform(c->hash, p + done, workspace);
+                       arm_sha_transform(c->hash, p + done, workspace);
                        done += 64;
                }
        } else
@@ -46,7 +46,7 @@ void SHA1_Update(SHA_CTX *c, const void *p, unsigned long n)
                memcpy(c->buffer + partial, p + done, n - done);
 }
 
-void SHA1_Final(unsigned char *hash, SHA_CTX *c)
+void arm_SHA1_Final(unsigned char *hash, arm_SHA_CTX *c)
 {
        uint64_t bitlen;
        uint32_t bitlen_hi, bitlen_lo;
@@ -57,7 +57,7 @@ void SHA1_Final(unsigned char *hash, SHA_CTX *c)
        bitlen = c->len << 3;
        offset = c->len & 0x3f;
        padlen = ((offset < 56) ? 56 : (64 + 56)) - offset;
-       SHA1_Update(c, padding, padlen);
+       arm_SHA1_Update(c, padding, padlen);
 
        bitlen_hi = bitlen >> 32;
        bitlen_lo = bitlen & 0xffffffff;
@@ -69,7 +69,7 @@ void SHA1_Final(unsigned char *hash, SHA_CTX *c)
        bits[5] = bitlen_lo >> 16;
        bits[6] = bitlen_lo >> 8;
        bits[7] = bitlen_lo;
-       SHA1_Update(c, bits, 8);
+       arm_SHA1_Update(c, bits, 8);
 
        for (i = 0; i < 5; i++) {
                uint32_t v = c->hash[i];