Commit ecfc1125 authored by Niels Möller's avatar Niels Möller
Browse files

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.
parent 90e3aee6
2017-09-14 Niels Möller <nisse@lysator.liu.se> 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 * ecc-mod.c (ecc_mod): Workaround to silence a false positive from
the clang static analyzer. the clang static analyzer.
......
/* /* hkdf.c
* Copyright (C) 2017 Red Hat, Inc.
* Copyright (C) 2017 Red Hat, Inc.
* Author: Nikos Mavrogiannopoulos
* Author: Nikos Mavrogiannopoulos
* This file is part of GnuTLS.
* This file is part of GNU Nettle.
* The GnuTLS is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License GNU Nettle is free software: you can redistribute it and/or
* as published by the Free Software Foundation; either version 2.1 of modify it under the terms of either:
* the License, or (at your option) any later version.
* * the GNU Lesser General Public License as published by the Free
* This library is distributed in the hope that it will be useful, but Software Foundation; either version 3 of the License, or (at your
* WITHOUT ANY WARRANTY; without even the implied warranty of option) any later version.
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. or
*
* You should have received a copy of the GNU Lesser General Public License * the GNU General Public License as published by the Free
* along with this program. If not, see <http://www.gnu.org/licenses/> 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. /* Functions for the HKDF handling.
...@@ -27,15 +38,6 @@ ...@@ -27,15 +38,6 @@
# include "config.h" # include "config.h"
#endif #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" #include "hkdf.h"
/* hkdf_extract: Outputs a PRK of digest_size /* hkdf_extract: Outputs a PRK of digest_size
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#ifndef NETTLE_HKDF_H_INCLUDED #ifndef NETTLE_HKDF_H_INCLUDED
#define NETTLE_HKDF_H_INCLUDED #define NETTLE_HKDF_H_INCLUDED
#include "nettle-meta.h" #include "nettle-types.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment