From 16302e13c2eb1ce58daff94f4df562530487ab18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Sat, 27 Mar 2010 21:49:29 +0100
Subject: [PATCH] * Makefile.in (nettle_SOURCES): Added hmac-sha224.c and
hmac-sha384.c.
* hmac.h: Added declarations of hmac-sha224 and hmac-sha384.
* hmac-sha224.c: New file.
Rev: nettle/ChangeLog:1.65
Rev: nettle/Makefile.in:1.21
Rev: nettle/hmac-sha224.c:1.1
Rev: nettle/hmac.h:1.4
---
ChangeLog | 9 +++++++++
Makefile.in | 3 ++-
hmac-sha224.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
hmac.h | 19 ++++++++++++++++++-
4 files changed, 73 insertions(+), 2 deletions(-)
create mode 100644 hmac-sha224.c
diff --git a/ChangeLog b/ChangeLog
index d9fbfb32..c129b5e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-03-27 Niels M�ller <nisse@lysator.liu.se>
+
+ * Makefile.in (nettle_SOURCES): Added hmac-sha224.c and
+ hmac-sha384.c.
+
+ * hmac.h: Added declarations of hmac-sha224 and hmac-sha384.
+
+ * hmac-sha224.c: New file.
+
2010-03-26 Niels M�ller <nisse@lysator.liu.se>
* testsuite/hmac-test.c (HMAC_TEST): New macro.
diff --git a/Makefile.in b/Makefile.in
index 9268eee3..7315b2b3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -60,7 +60,8 @@ nettle_SOURCES = aes-decrypt-internal.c aes-decrypt.c \
cbc.c ctr.c \
des.c \
des3.c des-compat.c \
- hmac.c hmac-md5.c hmac-sha1.c hmac-sha256.c hmac-sha512.c \
+ hmac.c hmac-md5.c hmac-sha1.c \
+ hmac-sha224.c hmac-sha256.c hmac-sha384.c hmac-sha512.c \
knuth-lfib.c \
md2.c md2-meta.c md4.c md4-meta.c \
md5.c md5-compress.c md5-compat.c md5-meta.c \
diff --git a/hmac-sha224.c b/hmac-sha224.c
new file mode 100644
index 00000000..580509e0
--- /dev/null
+++ b/hmac-sha224.c
@@ -0,0 +1,44 @@
+/* hmac-sha224.c
+ *
+ * HMAC-SHA224 message authentication code.
+ */
+
+/* nettle, low-level cryptographics library
+ *
+ * Copyright (C) 2003, 2010 Niels M�ller
+ *
+ * The nettle library is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * The nettle library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with the nettle library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA 02111-1307, USA.
+ */
+
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "hmac.h"
+
+void
+hmac_sha224_set_key(struct hmac_sha224_ctx *ctx,
+ unsigned key_length, const uint8_t *key)
+{
+ HMAC_SET_KEY(ctx, &nettle_sha224, key_length, key);
+}
+
+void
+hmac_sha224_digest(struct hmac_sha224_ctx *ctx,
+ unsigned length, uint8_t *digest)
+{
+ HMAC_DIGEST(ctx, &nettle_sha224, length, digest);
+}
diff --git a/hmac.h b/hmac.h
index a413de75..0142e6e3 100644
--- a/hmac.h
+++ b/hmac.h
@@ -45,9 +45,13 @@ extern "C" {
#define hmac_sha1_set_key nettle_hmac_sha1_set_key
#define hmac_sha1_update nettle_hmac_sha1_update
#define hmac_sha1_digest nettle_hmac_sha1_digest
+#define hmac_sha224_set_key nettle_hmac_sha224_set_key
+#define hmac_sha224_digest nettle_hmac_sha224_digest
#define hmac_sha256_set_key nettle_hmac_sha256_set_key
#define hmac_sha256_update nettle_hmac_sha256_update
#define hmac_sha256_digest nettle_hmac_sha256_digest
+#define hmac_sha384_set_key nettle_hmac_sha384_set_key
+#define hmac_sha384_digest nettle_hmac_sha384_digest
#define hmac_sha512_set_key nettle_hmac_sha512_set_key
#define hmac_sha512_update nettle_hmac_sha512_update
#define hmac_sha512_digest nettle_hmac_sha512_digest
@@ -129,6 +133,19 @@ void
hmac_sha256_digest(struct hmac_sha256_ctx *ctx,
unsigned length, uint8_t *digest);
+/* hmac-sha224 */
+#define hmac_sha224_ctx hmac_sha256_ctx
+
+void
+hmac_sha224_set_key(struct hmac_sha224_ctx *ctx,
+ unsigned key_length, const uint8_t *key);
+
+#define hmac_sha224_update nettle_hmac_sha256_update
+
+void
+hmac_sha224_digest(struct hmac_sha224_ctx *ctx,
+ unsigned length, uint8_t *digest);
+
/* hmac-sha512 */
struct hmac_sha512_ctx HMAC_CTX(struct sha512_ctx);
@@ -151,7 +168,7 @@ void
hmac_sha384_set_key(struct hmac_sha512_ctx *ctx,
unsigned key_length, const uint8_t *key);
-#define hmac_sha384_update hmac_sha512_update
+#define hmac_sha384_update nettle_hmac_sha512_update
void
hmac_sha384_digest(struct hmac_sha512_ctx *ctx,
--
GitLab