Support sha_ni sha1_compress in x86_64 fat builds.

4 files changed, 95 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 271bd801..a588156d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2018-02-07  Niels Möller  <nisse@lysator.liu.se>
+
+	* x86_64/fat/sha1-compress.asm: New file.
+	* x86_64/fat/sha1-compress-2.asm: New file.
+	* fat-x86_64.c (fat_init): Select plain x86_64 assembly version or
+	sha_ni version for sha1_compress.
+
 2018-02-05  Niels Möller  <nisse@lysator.liu.se>
 
 	* x86_64/sha_ni/sha1-compress.asm: New implementation using sha_ni
diff --git a/fat-x86_64.c b/fat-x86_64.c
index b2328b90..bf7d31cf 100644
--- a/fat-x86_64.c
+++ b/fat-x86_64.c
@@ -123,6 +123,10 @@ DECLARE_FAT_FUNC(nettle_memxor, memxor_func)
 DECLARE_FAT_FUNC_VAR(memxor, memxor_func, x86_64)
 DECLARE_FAT_FUNC_VAR(memxor, memxor_func, sse2)
 
+DECLARE_FAT_FUNC(_nettle_sha1_compress, sha1_compress_func)
+DECLARE_FAT_FUNC_VAR(sha1_compress, sha1_compress_func, x86_64)
+DECLARE_FAT_FUNC_VAR(sha1_compress, sha1_compress_func, sha_ni)
+
 /* This function should usually be called only once, at startup. But
    it is idempotent, and on x86, pointer updates are atomic, so
    there's no danger if it is called simultaneously from multiple
@@ -163,6 +167,18 @@ fat_init (void)
       _nettle_aes_decrypt_vec = _nettle_aes_decrypt_x86_64;
     }
 
+  if (features.have_sha_ni)
+    {
+      if (verbose)
+	fprintf (stderr, "libnettle: using sha_ni instructions.\n");
+      _nettle_sha1_compress_vec = _nettle_sha1_compress_sha_ni;
+    }
+  else
+    {
+      if (verbose)
+	fprintf (stderr, "libnettle: not using sha_ni instructions.\n");
+      _nettle_sha1_compress_vec = _nettle_sha1_compress_x86_64;
+    }
   if (features.vendor == X86_INTEL)
     {
       if (verbose)
@@ -194,3 +210,7 @@ DEFINE_FAT_FUNC(_nettle_aes_decrypt, void,
 DEFINE_FAT_FUNC(nettle_memxor, void *,
 		(void *dst, const void *src, size_t n),
 		(dst, src, n))
+
+DEFINE_FAT_FUNC(_nettle_sha1_compress, void,
+		(uint32_t *state, const uint8_t *input),
+		(state, input))
diff --git a/x86_64/fat/sha1-compress-2.asm b/x86_64/fat/sha1-compress-2.asm
new file mode 100644
index 00000000..8bbc430f
--- /dev/null
+++ b/x86_64/fat/sha1-compress-2.asm
@@ -0,0 +1,34 @@
+C x86_64/fat/sha1-compress-2.asm
+
+ifelse(<
+   Copyright (C) 2018 Niels Möller
+
+   This file is part of GNU Nettle.
+
+   GNU Nettle is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Nettle is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see http://www.gnu.org/licenses/.
+>)
+
+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
new file mode 100644
index 00000000..04b522ae
--- /dev/null
+++ b/x86_64/fat/sha1-compress.asm
@@ -0,0 +1,34 @@
+C x86_64/fat/sha1-compress.asm
+
+ifelse(<
+   Copyright (C) 2018 Niels Möller
+
+   This file is part of GNU Nettle.
+
+   GNU Nettle is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Nettle is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see http://www.gnu.org/licenses/.
+>)
+
+define(<fat_transform>, <$1_x86_64>)
+include_src(<x86_64/sha1-compress.asm>)