From ecfc1125c8dc7c0866e21d92f9e177e52b1aa5a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Thu, 14 Sep 2017 23:39:29 +0200
Subject: [PATCH] hkdf: Reduce includes. Use Nettle licensing notice.
* hkdf.c: Delete unneeded includes. Use Nettle licensing notice.
* hkdf.h: Include only nettle-types.h, not nettle-meta.h.
---
ChangeLog | 3 +++
hkdf.c | 60 ++++++++++++++++++++++++++++---------------------------
hkdf.h | 2 +-
3 files changed, 35 insertions(+), 30 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8c795096..e445106f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2017-09-14 Niels Möller <nisse@lysator.liu.se>
+ * hkdf.c: Delete unneeded includes. Use Nettle licensing notice.
+ * hkdf.h: Include only nettle-types.h, not nettle-meta.h.
+
* ecc-mod.c (ecc_mod): Workaround to silence a false positive from
the clang static analyzer.
diff --git a/hkdf.c b/hkdf.c
index c55c42fd..2d7336a5 100644
--- a/hkdf.c
+++ b/hkdf.c
@@ -1,23 +1,34 @@
-/*
- * Copyright (C) 2017 Red Hat, Inc.
- *
- * Author: Nikos Mavrogiannopoulos
- *
- * This file is part of GnuTLS.
- *
- * The GnuTLS 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.
- *
- * This 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 this program. If not, see <http://www.gnu.org/licenses/>
- *
+/* hkdf.c
+
+ Copyright (C) 2017 Red Hat, Inc.
+
+ Author: Nikos Mavrogiannopoulos
+
+ This file is part of GNU Nettle.
+
+ GNU Nettle is free software: you can redistribute it and/or
+ modify it under the terms of either:
+
+ * the GNU Lesser General Public License as published by the Free
+ Software Foundation; either version 3 of the License, or (at your
+ option) any later version.
+
+ or
+
+ * the GNU General Public License as published by the Free
+ Software Foundation; either version 2 of the License, or (at your
+ option) any later version.
+
+ or both in parallel, as here.
+
+ GNU Nettle 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
+ General Public License for more details.
+
+ You should have received copies of the GNU General Public License and
+ the GNU Lesser General Public License along with this program. If
+ not, see http://www.gnu.org/licenses/.
*/
/* Functions for the HKDF handling.
@@ -27,15 +38,6 @@
# include "config.h"
#endif
-#include <assert.h>
-/* Needed for alloca on freebsd */
-#include <stdlib.h>
-#include <string.h>
-
-#include "hmac.h"
-
-#include "memxor.h"
-#include "nettle-internal.h"
#include "hkdf.h"
/* hkdf_extract: Outputs a PRK of digest_size
diff --git a/hkdf.h b/hkdf.h
index cf14fc09..43b16ad4 100644
--- a/hkdf.h
+++ b/hkdf.h
@@ -34,7 +34,7 @@
#ifndef NETTLE_HKDF_H_INCLUDED
#define NETTLE_HKDF_H_INCLUDED
-#include "nettle-meta.h"
+#include "nettle-types.h"
#ifdef __cplusplus
extern "C" {
--
GitLab