wip: notify-payload: Add notify types for optimized rekeying

wip: identifiers are still TBD

diff --git a/src/libcharon/encoding/payloads/notify_payload.c b/src/libcharon/encoding/payloads/notify_payload.c
index 2b2c6e93071d5cd15079b36460c95ed35da848f5..ee37141b6b4242f6932b4982bddfdaba35bc969e 100644 (file)
--- a/src/libcharon/encoding/payloads/notify_payload.c
+++ b/src/libcharon/encoding/payloads/notify_payload.c
@@ -123,7 +123,10 @@ ENUM_NEXT(notify_type_names, USE_PPK, INTERMEDIATE_EXCHANGE_SUPPORTED, SIGNATURE
        "INTERMEDIATE_EXCHANGE_SUPPORTED");
 ENUM_NEXT(notify_type_names, ADDITIONAL_KEY_EXCHANGE, ADDITIONAL_KEY_EXCHANGE, INTERMEDIATE_EXCHANGE_SUPPORTED,
        "ADDITIONAL_KEY_EXCHANGE");
-ENUM_NEXT(notify_type_names, INITIAL_CONTACT_IKEV1, INITIAL_CONTACT_IKEV1, ADDITIONAL_KEY_EXCHANGE,
+ENUM_NEXT(notify_type_names, OPTIMIZED_REKEY_SUPPORTED, OPTIMIZED_REKEY, ADDITIONAL_KEY_EXCHANGE,
+       "OPTIMIZED_REKEY_SUPPORTED",
+       "OPTIMIZED_REKEY");
+ENUM_NEXT(notify_type_names, INITIAL_CONTACT_IKEV1, INITIAL_CONTACT_IKEV1, OPTIMIZED_REKEY,
        "INITIAL_CONTACT");
 ENUM_NEXT(notify_type_names, DPD_R_U_THERE, DPD_R_U_THERE_ACK, INITIAL_CONTACT_IKEV1,
        "DPD_R_U_THERE",
@@ -242,7 +245,10 @@ ENUM_NEXT(notify_type_short_names, USE_PPK, INTERMEDIATE_EXCHANGE_SUPPORTED, SIG
        "IKE_INT_SUP");
 ENUM_NEXT(notify_type_short_names, ADDITIONAL_KEY_EXCHANGE, ADDITIONAL_KEY_EXCHANGE, INTERMEDIATE_EXCHANGE_SUPPORTED,
        "ADD_KE");
-ENUM_NEXT(notify_type_short_names, INITIAL_CONTACT_IKEV1, INITIAL_CONTACT_IKEV1, ADDITIONAL_KEY_EXCHANGE,
+ENUM_NEXT(notify_type_short_names, OPTIMIZED_REKEY_SUPPORTED, OPTIMIZED_REKEY, ADDITIONAL_KEY_EXCHANGE,
+       "OPT_REKEY_SUP",
+       "OPT_REKEY");
+ENUM_NEXT(notify_type_short_names, INITIAL_CONTACT_IKEV1, INITIAL_CONTACT_IKEV1, OPTIMIZED_REKEY,
        "INITIAL_CONTACT");
 ENUM_NEXT(notify_type_short_names, DPD_R_U_THERE, DPD_R_U_THERE_ACK, INITIAL_CONTACT_IKEV1,
        "DPD",

diff --git a/src/libcharon/encoding/payloads/notify_payload.h b/src/libcharon/encoding/payloads/notify_payload.h
index eb0784b3edb6cf942d1d6286d58e72b7ff698759..81c7e66328a63765c7409ddfce5a09f1d27edb4a 100644 (file)
--- a/src/libcharon/encoding/payloads/notify_payload.h
+++ b/src/libcharon/encoding/payloads/notify_payload.h
@@ -170,6 +170,11 @@ enum notify_type_t {
        /* multiple key exchanges, RFC 9370 */
        ADDITIONAL_KEY_EXCHANGE = 16441,
 
+       /* Optimized rekeying supported (draft-ietf-ipsecme-ikev2-sa-ts-payloads-opt) */
+       OPTIMIZED_REKEY_SUPPORTED = 16443,
+       /* Optimized rekeying (draft-ietf-ipsecme-ikev2-sa-ts-payloads-opt) */
+       OPTIMIZED_REKEY = 16444,
+
        /* IKEv1 initial contact */
        INITIAL_CONTACT_IKEV1 = 24578,