From cfa0738187c51eeb897133d1699b35ddd8e96fd5 Mon Sep 17 00:00:00 2001
From: RincewindsHat <12514511+RincewindsHat@users.noreply.github.com>
Date: Tue, 31 Jan 2023 15:13:12 +0100
Subject: Remove sha1 and add sha256

---
 gl/m4/gnulib-cache.m4 |  6 ++++--
 gl/m4/gnulib-comp.m4  | 14 +++++++-------
 gl/m4/sha1.m4         | 14 --------------
 gl/m4/sha256.m4       | 14 ++++++++++++++
 4 files changed, 25 insertions(+), 23 deletions(-)
 delete mode 100644 gl/m4/sha1.m4
 create mode 100644 gl/m4/sha256.m4

(limited to 'gl/m4')

diff --git a/gl/m4/gnulib-cache.m4 b/gl/m4/gnulib-cache.m4
index ee4756e5..4e5055e4 100644
--- a/gl/m4/gnulib-cache.m4
+++ b/gl/m4/gnulib-cache.m4
@@ -38,8 +38,9 @@
 #  --no-libtool \
 #  --macro-prefix=gl \
 #  --no-vc-files \
+#  --no-vc-files \
 #  base64 \
-#  crypto/sha1 \
+#  crypto/sha256 \
 #  dirname \
 #  environ \
 #  floorf \
@@ -64,8 +65,9 @@
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([])
 gl_MODULES([
+  --no-vc-files
   base64
-  crypto/sha1
+  crypto/sha256
   dirname
   environ
   floorf
diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4
index 644b9169..e6501b95 100644
--- a/gl/m4/gnulib-comp.m4
+++ b/gl/m4/gnulib-comp.m4
@@ -58,8 +58,8 @@ AC_DEFUN([gl_EARLY],
   # Code from module cloexec:
   # Code from module close:
   # Code from module crypto/af_alg:
-  # Code from module crypto/sha1:
-  # Code from module crypto/sha1-buffer:
+  # Code from module crypto/sha256:
+  # Code from module crypto/sha256-buffer:
   # Code from module dirname:
   # Code from module dirname-lgpl:
   # Code from module double-slash-root:
@@ -268,7 +268,7 @@ AC_DEFUN([gl_INIT],
   gl_UNISTD_MODULE_INDICATOR([close])
   gl_AF_ALG
   AC_REQUIRE([AC_C_RESTRICT])
-  gl_SHA1
+  gl_SHA256
   gl_MODULE_INDICATOR([dirname])
   gl_DOUBLE_SLASH_ROOT
   gl_FUNC_DUP2
@@ -1132,9 +1132,9 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/setlocale-lock.c
   lib/setlocale_null.c
   lib/setlocale_null.h
-  lib/sha1-stream.c
-  lib/sha1.c
-  lib/sha1.h
+  lib/sha256-stream.c
+  lib/sha256.c
+  lib/sha256.h
   lib/size_max.h
   lib/snprintf.c
   lib/sockets.c
@@ -1319,7 +1319,7 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/servent.m4
   m4/setenv.m4
   m4/setlocale_null.m4
-  m4/sha1.m4
+  m4/sha256.m4
   m4/size_max.m4
   m4/snprintf.m4
   m4/socketlib.m4
diff --git a/gl/m4/sha1.m4 b/gl/m4/sha1.m4
deleted file mode 100644
index 16b79c08..00000000
--- a/gl/m4/sha1.m4
+++ /dev/null
@@ -1,14 +0,0 @@
-# sha1.m4 serial 12
-dnl Copyright (C) 2002-2006, 2008-2023 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_SHA1],
-[
-  dnl Prerequisites of lib/sha1.c.
-  AC_REQUIRE([gl_BIGENDIAN])
-
-  dnl Determine HAVE_OPENSSL_SHA1 and LIB_CRYPTO
-  gl_CRYPTO_CHECK([SHA1])
-])
diff --git a/gl/m4/sha256.m4 b/gl/m4/sha256.m4
new file mode 100644
index 00000000..4d1d1dda
--- /dev/null
+++ b/gl/m4/sha256.m4
@@ -0,0 +1,14 @@
+# sha256.m4 serial 8
+dnl Copyright (C) 2005, 2008-2023 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_SHA256],
+[
+  dnl Prerequisites of lib/sha256.c.
+  AC_REQUIRE([gl_BIGENDIAN])
+
+  dnl Determine HAVE_OPENSSL_SHA256 and LIB_CRYPTO
+  gl_CRYPTO_CHECK([SHA256])
+])
-- 
cgit v1.2.3-74-g34f1