Merge branch 'sha256-compress-n' into master-updates

diff --cc ChangeLog
index b545f7ff58752f082f5826934bb821b65bed1221,ff505a370ae06d889ac9cb63cf36e4291ca90d8a..d3a962d8b225d8819695427d8b5233de2dbc4f6f
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,27 -1,45 +1,69 @@@
 +2022-08-07  Niels Möller  <nisse@lysator.liu.se>
 +
 +      Based on patch from Corentin Labbe:
 +      * nettle.texinfo: Document sha256_compress, sha512_compress,
 +      md5_compress and sha1_compress.
 +
 +      * configure.ac: Refer to nettle-types.h, rather than arcfour.c,
 +      for AC_CONFIG_SRCDIR.
 +
 +2022-08-05  Niels Möller  <nisse@lysator.liu.se>
 +
 +      * nettle-internal.h: Include stdlib.h, fix alloca warnings on BSD.
 +      * hmac.c: Delete corresponding include here, no longer needed.
 +
 +      * getopt.c: Include stdlib.h and unistd.h unconditionally,
 +      similarly to the gnulib version of this file.
 +
 +2022-08-04  Niels Möller  <nisse@lysator.liu.se>
 +
 +      From Brad Smith:
 +      * configure.ac: Fix 64-bit MIPS ABI check for other OS's like *BSD / Linux.
 +      * aclocal.m4 (LSH_CCPIC): Use proper PIC flag for *BSD OS's.
 +      * blowfish-bcrypt.c (swap32): Eliminate conflict with OpenBSD's swap32 macro.
 +
+ 2022-07-29  Niels Möller  <nisse@lysator.liu.se>
+ 
+       * s390x/msa_x1/sha256-compress-n.asm: New file. replacing...
+       * s390x/msa_x1/sha256-compress.asm: ...deleted file.
+       * s390x/fat/sha256-compress-n-2.asm: New file. replacing...
+       * s390x/fat/sha256-compress-2.asm: ...deleted file.
+       * fat-s390x.c: Update fat setup.
+ 
+ 2022-07-26  Niels Möller  <nisse@lysator.liu.se>
+ 
+       * arm/v6/sha256-compress-n.asm: New file. replacing...
+       * arm/v6/sha256-compress.asm: ...deleted file.
+       * arm/fat/sha256-compress-n-2.asm: New file. replacing...
+       * arm/fat/sha256-compress-2.asm: ...deleted file.
+       * fat-arm.c: Update fat setup.
+ 
+ 2022-07-11  Niels Möller  <nisse@lysator.liu.se>
+ 
+       * arm64/crypto/sha256-compress-n.asm: New file. replacing...
+       * arm64/crypto/sha256-compress.asm: ...deleted file.
+       * arm64/fat/sha256-compress-n-2.asm: New file. replacing...
+       * arm64/fat/sha256-compress-2.asm: ...deleted file.
+       * fat-arm64.c: Update fat setup.
+ 
+ 2022-07-05  Niels Möller  <nisse@lysator.liu.se>
+ 
+       * md-internal.h (MD_FILL_OR_RETURN): New file, new macro.
+       * sha256-compress-n.c (_nettle_sha256_compress_n): New file and
+       function, replacing...
+       * sha256-compress.c (_nettle_sha256_compress): ...deleted file and
+       function.
+       * sha2-internal.h (_nettle_sha256_compress_n): Declare new function..
+       * sha256.c (sha256_compress): Update to use
+       _nettle_sha256_compress_n and MD_FILL_OR_RETURN.
+       * x86_64/sha256-compress-n.asm: New file. replacing...
+       * x86_64/sha256-compress.asm: ...deleted file.
+       * x86_64/sha_ni/sha256-compress-n.asm: New file. replacing...
+       * x86_64/sha_ni/sha256-compress.asm: ...deleted file.
+       * fat-setup.h (sha256_compress_n_func): New typedef, replacing...
+       (sha256_compress_func): ... deleted typedef.
+       * fat-x86_64.c: Update fat setup.
+ 
  2022-06-20  Niels Möller  <nisse@lysator.liu.se>
  
        * testsuite/sha1-test.c (test_sha1_compress): New function.

diff --cc Makefile.in
Simple merge

diff --cc configure.ac
index 3ebfb175665c3d2b9c861e55637a7bf27068b737,cb30dfb3ef056e8f095cec61cabcf325a4b34318..70eb0873cd9c2b0070add8a0a877635a6c5f2457
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -612,10 -605,9 +612,10 @@@ asm_nettle_optional_list="cpuid.asm cpu
    aes256-encrypt-2.asm aes256-decrypt-2.asm \
    cbc-aes128-encrypt-2.asm cbc-aes192-encrypt-2.asm cbc-aes256-encrypt-2.asm \
    chacha-2core.asm chacha-3core.asm chacha-4core.asm chacha-core-internal-2.asm \
 +  poly1305-internal-2.asm \
    ghash-set-key-2.asm ghash-update-2.asm \
    salsa20-2core.asm salsa20-core-internal-2.asm \
-   sha1-compress-2.asm sha256-compress-2.asm \
+   sha1-compress-2.asm sha256-compress-n-2.asm \
    sha3-permute-2.asm sha512-compress-2.asm \
    umac-nh-n-2.asm umac-nh-2.asm"
  

diff --cc fat-setup.h
Simple merge