From 5e506e86bbb9dc3405e0a02df706e8761408f52d Mon Sep 17 00:00:00 2001 From: Nicolas Mora Date: Sun, 31 Jan 2021 20:09:40 -0500 Subject: Implement pbkdf2_hmac_sha384 and pbkdf2_hmac_sha512 --- Makefile.in | 2 +- pbkdf2-hmac-sha384.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ pbkdf2-hmac-sha512.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ pbkdf2.h | 14 ++++++++++++++ 4 files changed, 119 insertions(+), 1 deletion(-) create mode 100644 pbkdf2-hmac-sha384.c create mode 100644 pbkdf2-hmac-sha512.c diff --git a/Makefile.in b/Makefile.in index cfbc45bb..db02f5c0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -131,7 +131,7 @@ nettle_SOURCES = aes-decrypt-internal.c aes-decrypt.c \ nettle-meta-aeads.c nettle-meta-armors.c \ nettle-meta-ciphers.c nettle-meta-hashes.c nettle-meta-macs.c \ pbkdf2.c pbkdf2-hmac-gosthash94.c pbkdf2-hmac-sha1.c \ - pbkdf2-hmac-sha256.c \ + pbkdf2-hmac-sha256.c pbkdf2-hmac-sha384.c pbkdf2-hmac-sha512.c \ poly1305-aes.c poly1305-internal.c \ realloc.c \ ripemd160.c ripemd160-compress.c ripemd160-meta.c \ diff --git a/pbkdf2-hmac-sha384.c b/pbkdf2-hmac-sha384.c new file mode 100644 index 00000000..e06a3925 --- /dev/null +++ b/pbkdf2-hmac-sha384.c @@ -0,0 +1,52 @@ +/* pbkdf2-hmac-sha384.c + + Copyright (C) 2012 Simon Josefsson + Copyright (C) 2021 Nicolas Mora + + 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/. +*/ + +#if HAVE_CONFIG_H +# include "config.h" +#endif + +#include "pbkdf2.h" + +#include "hmac.h" + +void +pbkdf2_hmac_sha384 (size_t key_length, const uint8_t *key, + unsigned iterations, + size_t salt_length, const uint8_t *salt, + size_t length, uint8_t *dst) +{ + struct hmac_sha384_ctx sha384ctx; + + hmac_sha384_set_key (&sha384ctx, key_length, key); + PBKDF2 (&sha384ctx, hmac_sha384_update, hmac_sha384_digest, + SHA384_DIGEST_SIZE, iterations, salt_length, salt, length, dst); +} diff --git a/pbkdf2-hmac-sha512.c b/pbkdf2-hmac-sha512.c new file mode 100644 index 00000000..b29545cf --- /dev/null +++ b/pbkdf2-hmac-sha512.c @@ -0,0 +1,52 @@ +/* pbkdf2-hmac-sha512.c + + Copyright (C) 2012 Simon Josefsson + Copyright (C) 2021 Nicolas Mora + + 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/. +*/ + +#if HAVE_CONFIG_H +# include "config.h" +#endif + +#include "pbkdf2.h" + +#include "hmac.h" + +void +pbkdf2_hmac_sha512 (size_t key_length, const uint8_t *key, + unsigned iterations, + size_t salt_length, const uint8_t *salt, + size_t length, uint8_t *dst) +{ + struct hmac_sha512_ctx sha512ctx; + + hmac_sha512_set_key (&sha512ctx, key_length, key); + PBKDF2 (&sha512ctx, hmac_sha512_update, hmac_sha512_digest, + SHA512_DIGEST_SIZE, iterations, salt_length, salt, length, dst); +} diff --git a/pbkdf2.h b/pbkdf2.h index a36dfdba..e9cea8b8 100644 --- a/pbkdf2.h +++ b/pbkdf2.h @@ -45,6 +45,8 @@ extern "C" #define pbkdf2 nettle_pbkdf2 #define pbkdf2_hmac_sha1 nettle_pbkdf2_hmac_sha1 #define pbkdf2_hmac_sha256 nettle_pbkdf2_hmac_sha256 +#define pbkdf2_hmac_sha384 nettle_pbkdf2_hmac_sha384 +#define pbkdf2_hmac_sha512 nettle_pbkdf2_hmac_sha512 #define pbkdf2_hmac_gosthash94cp nettle_pbkdf2_hmac_gosthash94cp void @@ -79,6 +81,18 @@ pbkdf2_hmac_sha256 (size_t key_length, const uint8_t *key, size_t salt_length, const uint8_t *salt, size_t length, uint8_t *dst); +void +pbkdf2_hmac_sha384 (size_t key_length, const uint8_t *key, + unsigned iterations, + size_t salt_length, const uint8_t *salt, + size_t length, uint8_t *dst); + +void +pbkdf2_hmac_sha512 (size_t key_length, const uint8_t *key, + unsigned iterations, + size_t salt_length, const uint8_t *salt, + size_t length, uint8_t *dst); + void pbkdf2_hmac_gosthash94cp (size_t key_length, const uint8_t *key, unsigned iterations, -- cgit v1.2.1