diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | hkdf.c | 60 | ||||
| -rw-r--r-- | hkdf.h | 2 |
3 files changed, 35 insertions, 30 deletions
@@ -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. @@ -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 @@ -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" { |