gnunet

commit 06c3c610c685f09008ad0b223bb25df7715903aa
parent c75a8b9b3c61ff7344d2136347abfc08469581a3
Author: Jacki <jacki@thejackimonster.de>
Date:   Thu, 20 Nov 2025 03:18:34 +0100

util: rename hpke type enum and increase libgnunetutil version

Signed-off-by: Jacki <jacki@thejackimonster.de>

Diffstat:
M
src/include/gnunet_crypto_lib.h
 | 
4
++--
M
src/lib/util/crypto_hpke.c
 | 
10
+++++-----

2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h
@@ -397,9 +397,9 @@ enum GNUNET_CRYPTO_KeyType
 enum GNUNET_CRYPTO_HpkeKeyType
 {
   /**
-   * ECDHE hybrid public key encryption.
+   * Type for X25519 hybrid public key encryption.
    */
-  GNUNET_CRYPTO_HPKE_KEY_TYPE_ECDHE = 1
+  GNUNET_CRYPTO_HPKE_KEY_TYPE_X25519 = 0
 };
 
 /**
diff --git a/src/lib/util/crypto_hpke.c b/src/lib/util/crypto_hpke.c
@@ -842,13 +842,13 @@ GNUNET_CRYPTO_hpke_pk_to_x25519 (const struct GNUNET_CRYPTO_BlindablePublicKey *
     if (0 != crypto_sign_ed25519_pk_to_curve25519 (x25519->ecdhe_key.q_y,
                                                    pk->ecdsa_key.q_y))
       return GNUNET_SYSERR;
-    x25519->type = htonl (GNUNET_CRYPTO_HPKE_KEY_TYPE_ECDHE);
+    x25519->type = htonl (GNUNET_CRYPTO_HPKE_KEY_TYPE_X25519);
     return GNUNET_OK;
   case GNUNET_PUBLIC_KEY_TYPE_EDDSA:
     if (0 != crypto_sign_ed25519_pk_to_curve25519 (x25519->ecdhe_key.q_y,
                                                    pk->eddsa_key.q_y))
       return GNUNET_SYSERR;
-    x25519->type = htonl (GNUNET_CRYPTO_HPKE_KEY_TYPE_ECDHE);
+    x25519->type = htonl (GNUNET_CRYPTO_HPKE_KEY_TYPE_X25519);
     return GNUNET_OK;
   default:
     return GNUNET_SYSERR;
@@ -870,13 +870,13 @@ GNUNET_CRYPTO_hpke_sk_to_x25519 (const struct
     memcpy (x25519->ecdhe_key.d,
             sk->ecdsa_key.d,
             sizeof sk->ecdsa_key.d);
-    x25519->type = htonl (GNUNET_CRYPTO_HPKE_KEY_TYPE_ECDHE);
+    x25519->type = htonl (GNUNET_CRYPTO_HPKE_KEY_TYPE_X25519);
     return GNUNET_OK;
   case GNUNET_PUBLIC_KEY_TYPE_EDDSA:
     if (0 != crypto_sign_ed25519_sk_to_curve25519 (x25519->ecdhe_key.d,
                                                    sk->eddsa_key.d))
       return GNUNET_SYSERR;
-    x25519->type = htonl (GNUNET_CRYPTO_HPKE_KEY_TYPE_ECDHE);
+    x25519->type = htonl (GNUNET_CRYPTO_HPKE_KEY_TYPE_X25519);
     return GNUNET_OK;
   default:
     return GNUNET_SYSERR;
@@ -892,7 +892,7 @@ GNUNET_CRYPTO_hpke_pk_get_length (
 {
   switch (ntohl (key->type))
   {
-  case GNUNET_CRYPTO_HPKE_KEY_TYPE_ECDHE:
+  case GNUNET_CRYPTO_HPKE_KEY_TYPE_X25519:
     return sizeof (key->type) + sizeof (key->ecdhe_key);
   default:
     GNUNET_break (0);