wip: notify-payload: Add notify type for IKE_INTERMEDIATE exchange

This commit is contained in:
Tobias Brunner 2019-12-18 18:42:59 +01:00 committed by Andreas Steffen
parent 45d0ae5d4f
commit 6110ad0181
2 changed files with 12 additions and 8 deletions

View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2006-2018 Tobias Brunner * Copyright (C) 2006-2019 Tobias Brunner
* Copyright (C) 2005-2010 Martin Willi * Copyright (C) 2005-2010 Martin Willi
* Copyright (C) 2010 revosec AG * Copyright (C) 2010 revosec AG
* Copyright (C) 2006 Daniel Roethlisberger * Copyright (C) 2006 Daniel Roethlisberger
@ -114,11 +114,12 @@ ENUM_NEXT(notify_type_names, INITIAL_CONTACT, SIGNATURE_HASH_ALGORITHMS, MS_NOTI
"SENDER_REQUEST_ID", "SENDER_REQUEST_ID",
"FRAGMENTATION_SUPPORTED", "FRAGMENTATION_SUPPORTED",
"SIGNATURE_HASH_ALGORITHMS"); "SIGNATURE_HASH_ALGORITHMS");
ENUM_NEXT(notify_type_names, USE_PPK, NO_PPK_AUTH, SIGNATURE_HASH_ALGORITHMS, ENUM_NEXT(notify_type_names, USE_PPK, INTERMEDIATE_EXCHANGE_SUPPORTED, SIGNATURE_HASH_ALGORITHMS,
"USE_PPK", "USE_PPK",
"PPK_IDENTITY", "PPK_IDENTITY",
"NO_PPK_AUTH"); "NO_PPK_AUTH",
ENUM_NEXT(notify_type_names, INITIAL_CONTACT_IKEV1, INITIAL_CONTACT_IKEV1, NO_PPK_AUTH, "INTERMEDIATE_EXCHANGE_SUPPORTED");
ENUM_NEXT(notify_type_names, INITIAL_CONTACT_IKEV1, INITIAL_CONTACT_IKEV1, INTERMEDIATE_EXCHANGE_SUPPORTED,
"INITIAL_CONTACT"); "INITIAL_CONTACT");
ENUM_NEXT(notify_type_names, DPD_R_U_THERE, DPD_R_U_THERE_ACK, INITIAL_CONTACT_IKEV1, ENUM_NEXT(notify_type_names, DPD_R_U_THERE, DPD_R_U_THERE_ACK, INITIAL_CONTACT_IKEV1,
"DPD_R_U_THERE", "DPD_R_U_THERE",
@ -228,11 +229,12 @@ ENUM_NEXT(notify_type_short_names, INITIAL_CONTACT, SIGNATURE_HASH_ALGORITHMS, M
"SENDER_REQ_ID", "SENDER_REQ_ID",
"FRAG_SUP", "FRAG_SUP",
"HASH_ALG"); "HASH_ALG");
ENUM_NEXT(notify_type_short_names, USE_PPK, NO_PPK_AUTH, SIGNATURE_HASH_ALGORITHMS, ENUM_NEXT(notify_type_short_names, USE_PPK, INTERMEDIATE_EXCHANGE_SUPPORTED, SIGNATURE_HASH_ALGORITHMS,
"USE_PPK", "USE_PPK",
"PPK_ID", "PPK_ID",
"NO_PPK"); "NO_PPK",
ENUM_NEXT(notify_type_short_names, INITIAL_CONTACT_IKEV1, INITIAL_CONTACT_IKEV1, NO_PPK_AUTH, "IKE_INT_SUP");
ENUM_NEXT(notify_type_short_names, INITIAL_CONTACT_IKEV1, INITIAL_CONTACT_IKEV1, INTERMEDIATE_EXCHANGE_SUPPORTED,
"INITIAL_CONTACT"); "INITIAL_CONTACT");
ENUM_NEXT(notify_type_short_names, DPD_R_U_THERE, DPD_R_U_THERE_ACK, INITIAL_CONTACT_IKEV1, ENUM_NEXT(notify_type_short_names, DPD_R_U_THERE, DPD_R_U_THERE_ACK, INITIAL_CONTACT_IKEV1,
"DPD", "DPD",

View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2006-2018 Tobias Brunner * Copyright (C) 2006-2019 Tobias Brunner
* Copyright (C) 2006 Daniel Roethlisberger * Copyright (C) 2006 Daniel Roethlisberger
* Copyright (C) 2005-2006 Martin Willi * Copyright (C) 2005-2006 Martin Willi
* Copyright (C) 2005 Jan Hutter * Copyright (C) 2005 Jan Hutter
@ -159,6 +159,8 @@ enum notify_type_t {
PPK_IDENTITY = 16436, PPK_IDENTITY = 16436,
/* No Postquantum Preshared Key Auth, RFC 8784 */ /* No Postquantum Preshared Key Auth, RFC 8784 */
NO_PPK_AUTH = 16437, NO_PPK_AUTH = 16437,
/* draft-ietf-ipsecme-ikev2-intermediate */
INTERMEDIATE_EXCHANGE_SUPPORTED = 16438,
/* IKEv1 initial contact */ /* IKEv1 initial contact */
INITIAL_CONTACT_IKEV1 = 24578, INITIAL_CONTACT_IKEV1 = 24578,
/* IKEv1 DPD */ /* IKEv1 DPD */