diff options
-rw-r--r-- | lib/nettle/Makefile.am | 4 | ||||
-rw-r--r-- | lib/nettle/gost/pbkdf2-gost.h | 82 | ||||
-rw-r--r-- | lib/nettle/gost/pbkdf2-hmac-gosthash94.c | 59 | ||||
-rw-r--r-- | lib/nettle/gost/pbkdf2-hmac-streebog.c | 71 |
4 files changed, 0 insertions, 216 deletions
diff --git a/lib/nettle/Makefile.am b/lib/nettle/Makefile.am index e4d9ad64ef..ab49f7baed 100644 --- a/lib/nettle/Makefile.am +++ b/lib/nettle/Makefile.am @@ -82,10 +82,6 @@ libcrypto_la_SOURCES += \ libcrypto_la_SOURCES += \ gost/bignum-le.c gost/bignum-le.h -libcrypto_la_SOURCES += \ - gost/pbkdf2-hmac-gosthash94.c gost/pbkdf2-hmac-streebog.c \ - gost/pbkdf2-gost.h - if NEED_GOSTDSA libcrypto_la_SOURCES += \ gost/nettle-internal.h \ diff --git a/lib/nettle/gost/pbkdf2-gost.h b/lib/nettle/gost/pbkdf2-gost.h deleted file mode 100644 index fc4181ae19..0000000000 --- a/lib/nettle/gost/pbkdf2-gost.h +++ /dev/null @@ -1,82 +0,0 @@ -/* pbkdf2.h - - PKCS #5 password-based key derivation function PBKDF2, see RFC 2898. - - Copyright (C) 2012 Simon Josefsson - - 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 https://www.gnu.org/licenses/. -*/ - -#ifndef GNUTLS_LIB_NETTLE_GOST_PBKDF2_GOST_H -#define GNUTLS_LIB_NETTLE_GOST_PBKDF2_GOST_H - -#include "config.h" - -#include <nettle/nettle-meta.h> -#include <nettle/pbkdf2.h> - -#ifdef __cplusplus -extern "C" -{ -#endif - -/* Namespace mangling */ -#ifndef HAVE_NETTLE_GOSTHASH94CP_UPDATE -#define pbkdf2_hmac_gosthash94cp _gnutls_pbkdf2_hmac_gosthash94cp -#endif -#ifndef HAVE_NETTLE_STREEBOG512_UPDATE -#define pbkdf2_hmac_streebog256 _gnutls_pbkdf2_hmac_streebog256 -#define pbkdf2_hmac_streebog512 _gnutls_pbkdf2_hmac_streebog512 -#endif - -#ifndef HAVE_NETTLE_GOSTHASH94CP_UPDATE -void -pbkdf2_hmac_gosthash94cp (size_t key_length, const uint8_t *key, - unsigned iterations, - size_t salt_length, const uint8_t *salt, - size_t length, uint8_t *dst); -#endif - -#ifndef HAVE_NETTLE_STREEBOG512_UPDATE -void -pbkdf2_hmac_streebog256 (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_streebog512 (size_t key_length, const uint8_t *key, - unsigned iterations, - size_t salt_length, const uint8_t *salt, - size_t length, uint8_t *dst); -#endif - -#ifdef __cplusplus -} -#endif - -#endif /* GNUTLS_LIB_NETTLE_GOST_PBKDF2_GOST_H */ diff --git a/lib/nettle/gost/pbkdf2-hmac-gosthash94.c b/lib/nettle/gost/pbkdf2-hmac-gosthash94.c deleted file mode 100644 index c9bf80aa9a..0000000000 --- a/lib/nettle/gost/pbkdf2-hmac-gosthash94.c +++ /dev/null @@ -1,59 +0,0 @@ -/* pbkdf2-hmac-gosthash94.c - - PKCS #5 PBKDF2 used with HMAC-GOSTHASH94CP. - - Copyright (C) 2016 Dmitry Eremin-Solenikov - Copyright (C) 2012 Simon Josefsson - - 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 https://www.gnu.org/licenses/. -*/ - -#if HAVE_CONFIG_H -# include "config.h" -#endif - -#ifndef HAVE_NETTLE_GOSTHASH94CP_UPDATE - -#include <gnutls_int.h> - -#include "pbkdf2-gost.h" - -#include "hmac-gost.h" - -void -pbkdf2_hmac_gosthash94cp (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_gosthash94cp_ctx gosthash94cpctx; - - hmac_gosthash94cp_set_key (&gosthash94cpctx, key_length, key); - PBKDF2 (&gosthash94cpctx, hmac_gosthash94cp_update, hmac_gosthash94cp_digest, - GOSTHASH94CP_DIGEST_SIZE, iterations, salt_length, salt, length, dst); -} -#endif diff --git a/lib/nettle/gost/pbkdf2-hmac-streebog.c b/lib/nettle/gost/pbkdf2-hmac-streebog.c deleted file mode 100644 index 6ee32766a8..0000000000 --- a/lib/nettle/gost/pbkdf2-hmac-streebog.c +++ /dev/null @@ -1,71 +0,0 @@ -/* pbkdf2-hmac-streebog.c - - PKCS #5 PBKDF2 used with HMAC-STREEBOG. - - Copyright (C) 2016 Dmitry Eremin-Solenikov - Copyright (C) 2012 Simon Josefsson - - 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 https://www.gnu.org/licenses/. -*/ - -#if HAVE_CONFIG_H -# include "config.h" -#endif - -#ifndef HAVE_NETTLE_STREEBOG512_UPDATE -#include <gnutls_int.h> - -#include "pbkdf2-gost.h" - -#include "hmac-gost.h" - -void -pbkdf2_hmac_streebog256 (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_streebog256_ctx streebog256ctx; - - hmac_streebog256_set_key (&streebog256ctx, key_length, key); - PBKDF2 (&streebog256ctx, hmac_streebog256_update, hmac_streebog256_digest, - STREEBOG256_DIGEST_SIZE, iterations, salt_length, salt, length, dst); -} - -void -pbkdf2_hmac_streebog512 (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_streebog512_ctx streebog512ctx; - - hmac_streebog512_set_key (&streebog512ctx, key_length, key); - PBKDF2 (&streebog512ctx, hmac_streebog512_update, hmac_streebog512_digest, - STREEBOG512_DIGEST_SIZE, iterations, salt_length, salt, length, dst); -} -#endif |