From a4e579680f01d7fa64393644e73f9eaf78aefb4a Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Fri, 25 Oct 2019 14:39:54 +0200 Subject: [PATCH] ike-header: Add IKE_INTERMEDIATE exchange type --- src/libcharon/encoding/payloads/ike_header.c | 15 +++++++++------ src/libcharon/encoding/payloads/ike_header.h | 5 ++++- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/libcharon/encoding/payloads/ike_header.c b/src/libcharon/encoding/payloads/ike_header.c index 2aee4496d5..8cf503ab20 100644 --- a/src/libcharon/encoding/payloads/ike_header.c +++ b/src/libcharon/encoding/payloads/ike_header.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 Tobias Brunner + * Copyright (C) 2007-2020 Tobias Brunner * Copyright (C) 2005-2006 Martin Willi * Copyright (C) 2005 Jan Hutter * @@ -129,15 +129,17 @@ ENUM_NEXT(exchange_type_names, QUICK_MODE, IKE_SESSION_RESUME, TRANSACTION, "CREATE_CHILD_SA", "INFORMATIONAL", "IKE_SESSION_RESUME"); +ENUM_NEXT(exchange_type_names, IKE_INTERMEDIATE, IKE_INTERMEDIATE, IKE_SESSION_RESUME, + "IKE_INTERMEDIATE"); #ifdef ME -ENUM_NEXT(exchange_type_names, ME_CONNECT, ME_CONNECT, IKE_SESSION_RESUME, +ENUM_NEXT(exchange_type_names, ME_CONNECT, ME_CONNECT, IKE_INTERMEDIATE, "ME_CONNECT"); -ENUM_NEXT(exchange_type_names, EXCHANGE_TYPE_UNDEFINED, - EXCHANGE_TYPE_UNDEFINED, ME_CONNECT, +ENUM_NEXT(exchange_type_names, EXCHANGE_TYPE_UNDEFINED, EXCHANGE_TYPE_UNDEFINED, + ME_CONNECT, "EXCHANGE_TYPE_UNDEFINED"); #else -ENUM_NEXT(exchange_type_names, EXCHANGE_TYPE_UNDEFINED, - EXCHANGE_TYPE_UNDEFINED, IKE_SESSION_RESUME, +ENUM_NEXT(exchange_type_names, EXCHANGE_TYPE_UNDEFINED, EXCHANGE_TYPE_UNDEFINED, + IKE_INTERMEDIATE, "EXCHANGE_TYPE_UNDEFINED"); #endif /* ME */ ENUM_END(exchange_type_names, EXCHANGE_TYPE_UNDEFINED); @@ -218,6 +220,7 @@ METHOD(payload_t, verify, status_t, } break; case IKE_SA_INIT: + case IKE_INTERMEDIATE: case IKE_AUTH: case CREATE_CHILD_SA: case INFORMATIONAL: diff --git a/src/libcharon/encoding/payloads/ike_header.h b/src/libcharon/encoding/payloads/ike_header.h index 5a38ad6589..72f6103778 100644 --- a/src/libcharon/encoding/payloads/ike_header.h +++ b/src/libcharon/encoding/payloads/ike_header.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 Tobias Brunner + * Copyright (C) 2007-2020 Tobias Brunner * Copyright (C) 2005-2011 Martin Willi * Copyright (C) 2005 Jan Hutter * @@ -122,6 +122,9 @@ enum exchange_type_t{ */ IKE_SESSION_RESUME = 38, + /* IKE_INTERMEDIATE (RFC 9242) */ + IKE_INTERMEDIATE = 43, + #ifdef ME /** * ME_CONNECT -- 2.47.2