summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiels Möller <nisse@lysator.liu.se>2018-07-08 09:57:04 +0200
committerNiels Möller <nisse@lysator.liu.se>2018-07-09 11:29:00 +0200
commitbc12925fc90179b42b67610317e2a24bce592c72 (patch)
tree81a01e298c5e2dfe3fa47fde3bbabee21a4c9fb4
parent4d507806d3605ddd0a59fa9f714b203bc4201538 (diff)
downloadnettle-bc12925fc90179b42b67610317e2a24bce592c72.tar.gz
Fix x86_64 fat setup for nettle_sha1_compress.
-rw-r--r--ChangeLog6
-rw-r--r--fat-x86_64.c2
-rw-r--r--x86_64/fat/sha1-compress-2.asm2
-rw-r--r--x86_64/fat/sha1-compress.asm2
4 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 1a43b7d5..0312c62e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-07-08 Niels Möller <nisse@lysator.liu.se>
+
+ * fat-x86_64.c (fat_init): Fix setup for nettle_sha1_compress.
+ * x86_64/fat/sha1-compress.asm: Add leading underscore to symbol name.
+ * x86_64/fat/sha1-compress-2.asm: Likewise.
+
2018-07-07 Niels Möller <nisse@lysator.liu.se>
From Nikos Mavrogiannopoulos.
diff --git a/fat-x86_64.c b/fat-x86_64.c
index 904c0eaa..a95a592c 100644
--- a/fat-x86_64.c
+++ b/fat-x86_64.c
@@ -182,7 +182,7 @@ fat_init (void)
{
if (verbose)
fprintf (stderr, "libnettle: not using sha_ni instructions.\n");
- _nettle_sha1_compress_vec = _nettle_sha1_compress_x86_64;
+ nettle_sha1_compress_vec = _nettle_sha1_compress_x86_64;
_nettle_sha256_compress_vec = _nettle_sha256_compress_x86_64;
}
if (features.vendor == X86_INTEL)
diff --git a/x86_64/fat/sha1-compress-2.asm b/x86_64/fat/sha1-compress-2.asm
index 8bbc430f..fddfa965 100644
--- a/x86_64/fat/sha1-compress-2.asm
+++ b/x86_64/fat/sha1-compress-2.asm
@@ -30,5 +30,5 @@ ifelse(<
not, see http://www.gnu.org/licenses/.
>)
-define(<fat_transform>, <$1_sha_ni>)
+define(<fat_transform>, <_$1_sha_ni>)
include_src(<x86_64/sha_ni/sha1-compress.asm>)
diff --git a/x86_64/fat/sha1-compress.asm b/x86_64/fat/sha1-compress.asm
index 04b522ae..0f2c6ec6 100644
--- a/x86_64/fat/sha1-compress.asm
+++ b/x86_64/fat/sha1-compress.asm
@@ -30,5 +30,5 @@ ifelse(<
not, see http://www.gnu.org/licenses/.
>)
-define(<fat_transform>, <$1_x86_64>)
+define(<fat_transform>, <_$1_x86_64>)
include_src(<x86_64/sha1-compress.asm>)