From: Niels Möller <nisse@lysator.liu.se>
Date: Thu, 12 Jul 2018 08:24:00 +0000 (+0200)
Subject: Fix arm fat setup for nettle_sha1_compress.
X-Git-Tag: nettle_3.5rc1~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f5adc6ca88451b278b581b13ada8d055c28c84f;p=thirdparty%2Fnettle.git

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 b915bb45..4c26c3c6 100644
--- 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 34099d8d..5e656359 100644
--- 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 5fb9181b..43fcbf04 100644
--- 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