From: Niels Möller <nisse@lysator.liu.se>
Date: Wed, 25 Dec 2019 11:34:29 +0000 (+0100)
Subject: Move struct nettle_mac to nettle-meta.h.
X-Git-Tag: nettle_3.6rc1~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=197ae827aaef311d7bd0514a9d5e0009816ae9b8;p=thirdparty%2Fnettle.git

Move struct nettle_mac to nettle-meta.h.
---

diff --git a/ChangeLog b/ChangeLog
index 557cc3d3..90bfe47a 100644
--- 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 b4cdb8f3..fbe5df89 100644
--- 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 899f9851..221255c5 100644
--- 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),		\