Move struct nettle_mac to nettle-meta.h.

diff --git a/ChangeLog b/ChangeLog
index 557cc3d3547848150bc2f02c0ec25b90fea5a37c..90bfe47a4b237e8776ea1164dbe97f24c5916e17 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2020-02-09  Niels Möller  <nisse@lysator.liu.se>
+
+       * nettle-meta.h (struct nettle_mac): New public struct,
+       * testsuite/testutils.h: ...moved from this file.
+
 2020-02-06  Niels Möller  <nisse@lysator.liu.se>
 
        From Dmitry Baryshkov:

diff --git a/nettle-meta.h b/nettle-meta.h
index b4cdb8f3e378296f8c503c5709269e2f14d79d2d..fbe5df89ceb9d33ce71f0f93c64c70f8d5b82e88 100644 (file)
--- a/nettle-meta.h
+++ b/nettle-meta.h
@@ -144,6 +144,24 @@ extern const struct nettle_hash nettle_sha3_256;
 extern const struct nettle_hash nettle_sha3_384;
 extern const struct nettle_hash nettle_sha3_512;
 
+struct nettle_mac
+{
+  const char *name;
+
+  /* Size of the context struct */
+  unsigned context_size;
+
+  /* Size of digests */
+  unsigned digest_size;
+
+  /* Key size */
+  unsigned key_size;
+
+  nettle_set_key_func *set_key;
+  nettle_hash_update_func *update;
+  nettle_hash_digest_func *digest;
+};
+
 struct nettle_aead
 {
   const char *name;

diff --git a/testsuite/testutils.h b/testsuite/testutils.h
index 899f9851cff59c2a97debabf698ad82b6bb4fac3..221255c5d01eee1d3d65d5acb6f0ce3ce89350cc 100644 (file)
--- a/testsuite/testutils.h
+++ b/testsuite/testutils.h
@@ -79,25 +79,6 @@ test_main(void);
 
 extern int verbose;
 
-/* FIXME: When interface stabilizes, move to nettle-meta.h */
-struct nettle_mac
-{
-  const char *name;
-
-  /* Size of the context struct */
-  unsigned context_size;
-
-  /* Size of digests */
-  unsigned digest_size;
-
-  /* Suggested key size; other sizes are sometimes possible. */
-  unsigned key_size;
-  
-  nettle_set_key_func *set_key;
-  nettle_hash_update_func *update;
-  nettle_hash_digest_func *digest;
-};
-
 #define _NETTLE_HMAC(name, NAME, keysize) {    \
   #name,                                       \
   sizeof(struct hmac_##name##_ctx),            \