commit f5164e2b02ca4c360d269aac352580f4f0143c80
parent ed10073bcb4376b47c3aa9fcb5a7c0ae8faf3a8f
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date: Wed, 11 Mar 2026 12:34:39 +0100
util: correctly (re)name fixed hkdf functions
Diffstat:
9 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h
@@ -1469,13 +1469,13 @@ GNUNET_CRYPTO_hkdf_gnunet_v (void *result,
* @return #GNUNET_YES on success
*/
enum GNUNET_GenericReturnValue
-GNUNET_CRYPTO_hkdf_expand_fixed_v (void *result,
- size_t out_len,
- const struct GNUNET_ShortHashCode *prk,
- size_t hkdf_args_count,
- const struct
- GNUNET_CRYPTO_KdfInputArgument hkdf_args[
- hkdf_args_count]);
+GNUNET_CRYPTO_hkdf_expand_v (void *result,
+ size_t out_len,
+ const struct GNUNET_ShortHashCode *prk,
+ size_t hkdf_args_count,
+ const struct
+ GNUNET_CRYPTO_KdfInputArgument hkdf_args[
+ hkdf_args_count]);
/**
* @ingroup hash
@@ -1487,15 +1487,15 @@ GNUNET_CRYPTO_hkdf_expand_fixed_v (void *result,
* @return #GNUNET_YES on success
*/
-#define GNUNET_CRYPTO_hkdf_expand_fixed(result, \
- out_len, \
- prk, \
- ...) \
- GNUNET_CRYPTO_hkdf_expand_fixed_v (result, out_len, \
- prk, \
- _HKDF_ARGS_VECLEN_HELPER (__VA_ARGS__ \
- ), \
- _HKDF_ARGS_VEC_HELPER (__VA_ARGS__))
+#define GNUNET_CRYPTO_hkdf_expand(result, \
+ out_len, \
+ prk, \
+ ...) \
+ GNUNET_CRYPTO_hkdf_expand_v (result, out_len, \
+ prk, \
+ _HKDF_ARGS_VECLEN_HELPER (__VA_ARGS__ \
+ ), \
+ _HKDF_ARGS_VEC_HELPER (__VA_ARGS__))
/**
diff --git a/src/lib/util/crypto_hkdf.c b/src/lib/util/crypto_hkdf.c
@@ -163,13 +163,13 @@ GNUNET_CRYPTO_hkdf_gnunet_v (void *result,
enum GNUNET_GenericReturnValue
-GNUNET_CRYPTO_hkdf_expand_fixed_v (void *result,
- size_t out_len,
- const struct GNUNET_ShortHashCode *prk,
- size_t hkdf_args_len,
- const struct
- GNUNET_CRYPTO_KdfInputArgument hkdf_args[
- hkdf_args_len])
+GNUNET_CRYPTO_hkdf_expand_v (void *result,
+ size_t out_len,
+ const struct GNUNET_ShortHashCode *prk,
+ size_t hkdf_args_len,
+ const struct
+ GNUNET_CRYPTO_KdfInputArgument hkdf_args[
+ hkdf_args_len])
{
return hkdf_expand_fixed (result, out_len,
(unsigned char*) prk, sizeof *prk,
diff --git a/src/lib/util/crypto_hpke.c b/src/lib/util/crypto_hpke.c
@@ -115,7 +115,7 @@ labeled_expand (const char *ctx_str,
memcpy (tmp, label, label_len);
tmp += label_len;
memcpy (tmp, info, info_len);
- return GNUNET_CRYPTO_hkdf_expand_fixed (
+ return GNUNET_CRYPTO_hkdf_expand (
out_buf,
out_len,
prk,
diff --git a/src/lib/util/test_crypto_hkdf.c b/src/lib/util/test_crypto_hkdf.c
@@ -53,7 +53,7 @@ tc1 (void)
memset (result, 0, sizeof(result));
GNUNET_CRYPTO_hkdf_extract (&prk, salt, sizeof(salt), ikm, sizeof(ikm));
- GNUNET_assert (GNUNET_CRYPTO_hkdf_expand_fixed
+ GNUNET_assert (GNUNET_CRYPTO_hkdf_expand
(result,
l,
&prk,
@@ -105,7 +105,7 @@ tc2 ()
memset (result, 0, sizeof(result));
GNUNET_CRYPTO_hkdf_extract (&prk, salt, sizeof(salt), ikm, sizeof(ikm));
- GNUNET_assert (GNUNET_CRYPTO_hkdf_expand_fixed
+ GNUNET_assert (GNUNET_CRYPTO_hkdf_expand
(result, l, &prk,
GNUNET_CRYPTO_kdf_arg (info, sizeof(info))) == GNUNET_YES);
GNUNET_assert (memcmp (result, okm, l) == 0);
@@ -130,7 +130,7 @@ tc3 ()
memset (result, 0, sizeof(result));
GNUNET_CRYPTO_hkdf_extract (&prk, NULL, 0, ikm, sizeof(ikm));
- GNUNET_assert (GNUNET_CRYPTO_hkdf_expand_fixed
+ GNUNET_assert (GNUNET_CRYPTO_hkdf_expand
(result, l, &prk) == GNUNET_YES);
GNUNET_assert (memcmp (result, okm, l) == 0);
GNUNET_assert (memcmp (result + l, "\0", 2) == 0);
diff --git a/src/service/core/gnunet-service-core_kx.c b/src/service/core/gnunet-service-core_kx.c
@@ -799,7 +799,7 @@ derive_es_ets (const struct GNUNET_HashCode *transcript,
;
GNUNET_assert (0);
}
- ret = GNUNET_CRYPTO_hkdf_expand_fixed (
+ ret = GNUNET_CRYPTO_hkdf_expand (
ets,
sizeof (*ets),
es,
@@ -825,7 +825,7 @@ derive_sn (const struct GNUNET_ShortHashCode *secret,
size_t sn_len)
{
GNUNET_assert (GNUNET_OK ==
- GNUNET_CRYPTO_hkdf_expand_fixed (
+ GNUNET_CRYPTO_hkdf_expand (
sn,
sn_len,
secret,
@@ -850,7 +850,7 @@ derive_hs (const struct GNUNET_ShortHashCode *es,
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ES: %s\n", GNUNET_B2S (es)
);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ss_e: %s\n", GNUNET_B2S (ss_e));
- ret = GNUNET_CRYPTO_hkdf_expand_fixed (
+ ret = GNUNET_CRYPTO_hkdf_expand (
&derived_early_secret,
sizeof (derived_early_secret),
es,
@@ -890,7 +890,7 @@ derive_ihts (const struct GNUNET_HashCode *transcript,
struct GNUNET_ShortHashCode *ihts)
{
GNUNET_assert (GNUNET_OK ==
- GNUNET_CRYPTO_hkdf_expand_fixed (
+ GNUNET_CRYPTO_hkdf_expand (
ihts, // result
sizeof (*ihts), // result len
hs, // prk?
@@ -910,7 +910,7 @@ derive_rhts (const struct GNUNET_HashCode *transcript,
struct GNUNET_ShortHashCode *rhts)
{
GNUNET_assert (GNUNET_OK ==
- GNUNET_CRYPTO_hkdf_expand_fixed (
+ GNUNET_CRYPTO_hkdf_expand (
rhts,
sizeof (*rhts),
hs, // prk? TODO
@@ -932,7 +932,7 @@ derive_ms (const struct GNUNET_ShortHashCode *hs,
uint64_t ret;
struct GNUNET_ShortHashCode derived_handshake_secret;
- ret = GNUNET_CRYPTO_hkdf_expand_fixed (
+ ret = GNUNET_CRYPTO_hkdf_expand (
&derived_handshake_secret,
sizeof (derived_handshake_secret),
hs,
@@ -999,7 +999,7 @@ derive_per_message_secrets (
unsigned char nonce_tmp[AEAD_NONCE_BYTES];
/* derive actual key */
GNUNET_assert (GNUNET_OK ==
- GNUNET_CRYPTO_hkdf_expand_fixed (
+ GNUNET_CRYPTO_hkdf_expand (
key,
AEAD_KEY_BYTES,
ts,
@@ -1008,7 +1008,7 @@ derive_per_message_secrets (
/* derive nonce */
GNUNET_assert (GNUNET_OK ==
- GNUNET_CRYPTO_hkdf_expand_fixed (
+ GNUNET_CRYPTO_hkdf_expand (
nonce_tmp,
AEAD_NONCE_BYTES,
ts,
@@ -1031,7 +1031,7 @@ derive_next_ats (const struct GNUNET_ShortHashCode *old_ats,
int8_t ret;
// FIXME: Not sure of PRK and output may overlap here!
- ret = GNUNET_CRYPTO_hkdf_expand_fixed (
+ ret = GNUNET_CRYPTO_hkdf_expand (
new_ats,
sizeof (*new_ats),
old_ats,
@@ -1063,7 +1063,7 @@ derive_initial_ats (const struct GNUNET_HashCode *transcript,
else
traffic_str = R_AP_TRAFFIC_STR;
GNUNET_assert (GNUNET_OK ==
- GNUNET_CRYPTO_hkdf_expand_fixed (
+ GNUNET_CRYPTO_hkdf_expand (
initial_ats, // result
sizeof (*initial_ats), // result len
ms,
@@ -1087,7 +1087,7 @@ generate_responder_finished (const struct GNUNET_HashCode *transcript,
enum GNUNET_GenericReturnValue ret;
struct GNUNET_CRYPTO_AuthKey fk_R; // We might want to save this in kx?
- ret = GNUNET_CRYPTO_hkdf_expand_fixed (
+ ret = GNUNET_CRYPTO_hkdf_expand (
&fk_R, // result
sizeof (fk_R),
ms,
@@ -1121,7 +1121,7 @@ generate_initiator_finished (const struct GNUNET_HashCode *transcript,
enum GNUNET_GenericReturnValue ret;
struct GNUNET_CRYPTO_AuthKey fk_I; // We might want to save this in kx?
- ret = GNUNET_CRYPTO_hkdf_expand_fixed (
+ ret = GNUNET_CRYPTO_hkdf_expand (
&fk_I, // result
sizeof (fk_I),
ms,
diff --git a/src/service/pils/pils_api.c b/src/service/pils/pils_api.c
@@ -529,7 +529,7 @@ GNUNET_PILS_derive_pid (size_t seed_key_bytes,
* For that, we may want to add a counter to the initial secret key
* to the above PRF.
*/
- GNUNET_CRYPTO_hkdf_expand_fixed (
+ GNUNET_CRYPTO_hkdf_expand (
outkey,
sizeof *outkey,
&prk,
diff --git a/src/service/transport/gnunet-communicator-tcp.c b/src/service/transport/gnunet-communicator-tcp.c
@@ -1275,7 +1275,7 @@ setup_cipher (const struct GNUNET_ShortHashCode *prk,
GCRY_CIPHER_MODE_CTR,
0 /* flags */));
GNUNET_assert (GNUNET_YES ==
- GNUNET_CRYPTO_hkdf_expand_fixed (
+ GNUNET_CRYPTO_hkdf_expand (
key,
sizeof(key),
prk,
@@ -1283,7 +1283,7 @@ setup_cipher (const struct GNUNET_ShortHashCode *prk,
);
GNUNET_assert (0 == gcry_cipher_setkey (*cipher, key, sizeof(key)));
GNUNET_assert (GNUNET_YES ==
- GNUNET_CRYPTO_hkdf_expand_fixed (
+ GNUNET_CRYPTO_hkdf_expand (
ctr,
sizeof(ctr),
prk,
@@ -1291,7 +1291,7 @@ setup_cipher (const struct GNUNET_ShortHashCode *prk,
);
gcry_cipher_setctr (*cipher, ctr, sizeof(ctr));
GNUNET_assert (GNUNET_YES ==
- GNUNET_CRYPTO_hkdf_expand_fixed (
+ GNUNET_CRYPTO_hkdf_expand (
hmac_key,
sizeof(struct GNUNET_HashCode),
prk,
diff --git a/src/service/transport/gnunet-communicator-udp.c b/src/service/transport/gnunet-communicator-udp.c
@@ -1050,7 +1050,7 @@ get_kid (const struct GNUNET_ShortHashCode *msec,
&sid, sizeof (sid),
msec, sizeof (*msec));
- GNUNET_CRYPTO_hkdf_expand_fixed (
+ GNUNET_CRYPTO_hkdf_expand (
kid,
sizeof(*kid),
&prk,
@@ -1186,13 +1186,13 @@ get_iv_key (const struct GNUNET_ShortHashCode *msec,
{
uint32_t sid = htonl (serial);
- GNUNET_CRYPTO_hkdf_expand_fixed (
+ GNUNET_CRYPTO_hkdf_expand (
key,
AES_KEY_SIZE,
msec,
GNUNET_CRYPTO_kdf_arg_string ("gnunet-communicator-udp-key"),
GNUNET_CRYPTO_kdf_arg_auto (&sid));
- GNUNET_CRYPTO_hkdf_expand_fixed (
+ GNUNET_CRYPTO_hkdf_expand (
iv,
AES_IV_SIZE,
msec,
@@ -1281,7 +1281,7 @@ check_timeouts (void *cls)
static void
calculate_cmac (struct SharedSecret *ss)
{
- GNUNET_CRYPTO_hkdf_expand_fixed (
+ GNUNET_CRYPTO_hkdf_expand (
&ss->cmac,
sizeof(ss->cmac),
&ss->master,
diff --git a/src/service/transport/gnunet-service-transport.c b/src/service/transport/gnunet-service-transport.c
@@ -5099,7 +5099,7 @@ dv_setup_key_state_from_km (const struct GNUNET_ShortHashCode *km,
{
/* must match what we defive from decapsulated key */
GNUNET_assert (GNUNET_YES ==
- GNUNET_CRYPTO_hkdf_expand_fixed (
+ GNUNET_CRYPTO_hkdf_expand (
&key->material,
sizeof(key->material),
km,
