Add sha512_224 and sha512_256 to nettle_hashes.

diff --git a/ChangeLog b/ChangeLog
index 833029f8e72ba90fbfa5118d260b908d0c6b7a0c..0efcfa1329a0ce0816cc9df58923f3a29d4f4bf2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2024-03-28  Niels Möller  <nisse@lysator.liu.se>
+
+       * sha512-224-meta.c (nettle_sha512_224): Change name to
+       "sha512_224", with underscore rather than dash.
+       * sha512-256-meta.c (nettle_sha512_256): Analogous change.
+       * nettle-meta-hashes.c (_nettle_hashes): Add nettle_sha512_224 and
+       nettle_sha512_256.
+       * testsuite/meta-hash-test.c: Update test.
+
 2024-03-24  Niels Möller  <nisse@lysator.liu.se>
 
        * testsuite/gcm-test.c (test_main): Add a test case that triggers

diff --git a/nettle-meta-hashes.c b/nettle-meta-hashes.c
index 4d421182dc56cff122b5c246314558bcb5b42478..2245dfb7a04a91ddf467fb4b92cfcf64e800c7d5 100644 (file)
--- a/nettle-meta-hashes.c
+++ b/nettle-meta-hashes.c
@@ -49,6 +49,8 @@ const struct nettle_hash * const _nettle_hashes[] = {
   &nettle_sha256,
   &nettle_sha384,
   &nettle_sha512,
+  &nettle_sha512_224,
+  &nettle_sha512_256,
   &nettle_sha3_224,
   &nettle_sha3_256,
   &nettle_sha3_384,

diff --git a/sha512-224-meta.c b/sha512-224-meta.c
index 24c42bfc23d9edaa1583878d41e08ecb6a10eb58..f3751e14271270a0aa5584dcbee461ea5d594364 100644 (file)
--- a/sha512-224-meta.c
+++ b/sha512-224-meta.c
@@ -39,7 +39,7 @@
 
 const struct nettle_hash nettle_sha512_224 =
   {
-    "sha512-224", sizeof(struct sha512_ctx),
+    "sha512_224", sizeof(struct sha512_ctx),
     SHA512_224_DIGEST_SIZE,
     SHA512_224_BLOCK_SIZE,
     (nettle_hash_init_func *) sha512_224_init,

diff --git a/sha512-256-meta.c b/sha512-256-meta.c
index 37d17c3518783dbe5612866759a6ba75b02f9005..181f2874e0b59b743e588af42b3aa3026a3ee29b 100644 (file)
--- a/sha512-256-meta.c
+++ b/sha512-256-meta.c
@@ -39,7 +39,7 @@
 
 const struct nettle_hash nettle_sha512_256 =
   {
-    "sha512-256", sizeof(struct sha512_ctx),
+    "sha512_256", sizeof(struct sha512_ctx),
     SHA512_256_DIGEST_SIZE,
     SHA512_256_BLOCK_SIZE,
     (nettle_hash_init_func *) sha512_256_init,

diff --git a/testsuite/meta-hash-test.c b/testsuite/meta-hash-test.c
index 6a15e7db630d5b81016ceb0085c03c0953653797..ec4e0d1e58c32dc77bc3adc1f2ecca1b01436f71 100644 (file)
--- a/testsuite/meta-hash-test.c
+++ b/testsuite/meta-hash-test.c
@@ -16,6 +16,8 @@ const char* hashes[] = {
   "sha256",
   "sha384",
   "sha512",
+  "sha512_224",
+  "sha512_256",
   "sha3_224",
   "sha3_256",
   "sha3_384",