From 605382399ba7e4a299bd9da106046f326b3ebc86 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Mon, 11 Sep 2023 19:31:38 +0200 Subject: [PATCH] Promote HKDF to minimal builds --- src/libsodium/Makefile.am | 4 ++-- src/libsodium/include/sodium.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libsodium/Makefile.am b/src/libsodium/Makefile.am index 6c0c6366..72d4f264 100644 --- a/src/libsodium/Makefile.am +++ b/src/libsodium/Makefile.am @@ -47,6 +47,8 @@ libsodium_la_SOURCES = \ crypto_hash/sha512/cp/hash_sha512_cp.c \ crypto_kdf/blake2b/kdf_blake2b.c \ crypto_kdf/crypto_kdf.c \ + crypto_kdf/hkdf/kdf_hkdf_sha256.c \ + crypto_kdf/hkdf/kdf_hkdf_sha512.c \ crypto_kx/crypto_kx.c \ crypto_onetimeauth/crypto_onetimeauth.c \ crypto_onetimeauth/poly1305/onetimeauth_poly1305.c \ @@ -168,8 +170,6 @@ libsodium_la_SOURCES += \ crypto_box/curve25519xchacha20poly1305/box_seal_curve25519xchacha20poly1305.c \ crypto_core/ed25519/core_ed25519.c \ crypto_core/ed25519/core_ristretto255.c \ - crypto_kdf/hkdf/kdf_hkdf_sha256.c \ - crypto_kdf/hkdf/kdf_hkdf_sha512.c \ crypto_pwhash/scryptsalsa208sha256/crypto_scrypt-common.c \ crypto_pwhash/scryptsalsa208sha256/crypto_scrypt.h \ crypto_pwhash/scryptsalsa208sha256/scrypt_platform.c \ diff --git a/src/libsodium/include/sodium.h b/src/libsodium/include/sodium.h index 610d6328..ff788e34 100644 --- a/src/libsodium/include/sodium.h +++ b/src/libsodium/include/sodium.h @@ -27,6 +27,8 @@ #include "sodium/crypto_hash_sha256.h" #include "sodium/crypto_hash_sha512.h" #include "sodium/crypto_kdf.h" +#include "sodium/crypto_kdf_hkdf_sha256.h" +#include "sodium/crypto_kdf_hkdf_sha512.h" #include "sodium/crypto_kdf_blake2b.h" #include "sodium/crypto_kx.h" #include "sodium/crypto_onetimeauth.h" @@ -59,8 +61,6 @@ # include "sodium/crypto_box_curve25519xchacha20poly1305.h" # include "sodium/crypto_core_ed25519.h" # include "sodium/crypto_core_ristretto255.h" -# include "sodium/crypto_kdf_hkdf_sha256.h" -# include "sodium/crypto_kdf_hkdf_sha512.h" # include "sodium/crypto_scalarmult_ed25519.h" # include "sodium/crypto_scalarmult_ristretto255.h" # include "sodium/crypto_secretbox_xchacha20poly1305.h"