Fix arm fat setup for nettle_sha1_compress.

diff --git a/arm/fat/sha1-compress-2.asm b/arm/fat/sha1-compress-2.asm
index b915bb454f9d88ad8a8ce900e732fd246739a737..4c26c3c6b7e87ea6c2150261a7ca72af1e7d061e 100644 (file)
--- a/arm/fat/sha1-compress-2.asm
+++ b/arm/fat/sha1-compress-2.asm
@@ -33,5 +33,5 @@ ifelse(<
 
 dnl PROLOGUE(nettle_sha1_compress) picked up by configure
 
-define(<fat_transform>, <$1_armv6>)
+define(<fat_transform>, <_$1_armv6>)
 include_src(<arm/v6/sha1-compress.asm>)

diff --git a/fat-arm.c b/fat-arm.c
index 34099d8d1074e5e0c8e2a1bcfacc38175902ffe0..5e656359f087692e87f20c24d12f845aff9c1b9a 100644 (file)
--- a/fat-arm.c
+++ b/fat-arm.c
@@ -191,7 +191,7 @@ fat_init (void)
        fprintf (stderr, "libnettle: enabling armv6 code.\n");
       _nettle_aes_encrypt_vec = _nettle_aes_encrypt_armv6;
       _nettle_aes_decrypt_vec = _nettle_aes_decrypt_armv6;
-      _nettle_sha1_compress_vec = _nettle_sha1_compress_armv6;
+      nettle_sha1_compress_vec = _nettle_sha1_compress_armv6;
       _nettle_sha256_compress_vec = _nettle_sha256_compress_armv6;
     }
   else
@@ -200,7 +200,7 @@ fat_init (void)
        fprintf (stderr, "libnettle: not enabling armv6 code.\n");
       _nettle_aes_encrypt_vec = _nettle_aes_encrypt_arm;
       _nettle_aes_decrypt_vec = _nettle_aes_decrypt_arm;
-      _nettle_sha1_compress_vec = _nettle_sha1_compress_c;
+      nettle_sha1_compress_vec = _nettle_sha1_compress_c;
       _nettle_sha256_compress_vec = _nettle_sha256_compress_c;
     }
   if (features.have_neon)

diff --git a/sha1-compress.c b/sha1-compress.c
index 5fb9181bae41cccf72243bf5af1cf980d6b33642..43fcbf0439f8de00cd2778d123c170e5bcd35263 100644 (file)
--- a/sha1-compress.c
+++ b/sha1-compress.c
@@ -133,7 +133,7 @@
 #if HAVE_NATIVE_sha1_compress
 void
 _nettle_sha1_compress_c(uint32_t *state, const uint8_t *input);
-#define _nettle_sha1_compress _nettle_sha1_compress_c
+#define nettle_sha1_compress _nettle_sha1_compress_c
 #endif
 
 /* Perform the SHA transformation.  Note that this code, like MD5, seems to