sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-10-07 00:01:49 -04:00
Code Issues Projects Releases Wiki Activity

wip: ike-header: Add IKE_INTERMEDIATE exchange type

Browse Source
This commit is contained in:
Tobias Brunner 2019-10-25 14:39:54 +02:00
parent 020e838a5a
commit c61b3c677c
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/libcharon/encoding/payloads/ike_header.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2007 Tobias Brunner * Copyright (C) 2007-2020 Tobias Brunner
* Copyright (C) 2005-2006 Martin Willi * Copyright (C) 2005-2006 Martin Willi
* Copyright (C) 2005 Jan Hutter * Copyright (C) 2005 Jan Hutter
* HSR Hochschule fuer Technik Rapperswil * HSR Hochschule fuer Technik Rapperswil
@ -128,15 +128,17 @@ ENUM_NEXT(exchange_type_names, QUICK_MODE, IKE_SESSION_RESUME, TRANSACTION,
"CREATE_CHILD_SA", "CREATE_CHILD_SA",
"INFORMATIONAL", "INFORMATIONAL",
"IKE_SESSION_RESUME"); "IKE_SESSION_RESUME");
ENUM_NEXT(exchange_type_names, IKE_INTERMEDIATE, IKE_INTERMEDIATE, IKE_SESSION_RESUME,
"IKE_INTERMEDIATE");
#ifdef ME #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"); "ME_CONNECT");
ENUM_NEXT(exchange_type_names, EXCHANGE_TYPE_UNDEFINED, ENUM_NEXT(exchange_type_names, EXCHANGE_TYPE_UNDEFINED, EXCHANGE_TYPE_UNDEFINED,
EXCHANGE_TYPE_UNDEFINED, ME_CONNECT, ME_CONNECT,
"EXCHANGE_TYPE_UNDEFINED"); "EXCHANGE_TYPE_UNDEFINED");
#else #else
ENUM_NEXT(exchange_type_names, EXCHANGE_TYPE_UNDEFINED, ENUM_NEXT(exchange_type_names, EXCHANGE_TYPE_UNDEFINED, EXCHANGE_TYPE_UNDEFINED,
EXCHANGE_TYPE_UNDEFINED, IKE_SESSION_RESUME, IKE_INTERMEDIATE,
"EXCHANGE_TYPE_UNDEFINED"); "EXCHANGE_TYPE_UNDEFINED");
#endif /* ME */ #endif /* ME */
ENUM_END(exchange_type_names, EXCHANGE_TYPE_UNDEFINED); ENUM_END(exchange_type_names, EXCHANGE_TYPE_UNDEFINED);
@ -217,6 +219,7 @@ METHOD(payload_t, verify, status_t,
} }
break; break;
case IKE_SA_INIT: case IKE_SA_INIT:
case IKE_INTERMEDIATE:
case IKE_AUTH: case IKE_AUTH:
case CREATE_CHILD_SA: case CREATE_CHILD_SA:
case INFORMATIONAL: case INFORMATIONAL:

5
src/libcharon/encoding/payloads/ike_header.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2007 Tobias Brunner * Copyright (C) 2007-2020 Tobias Brunner
* Copyright (C) 2005-2011 Martin Willi * Copyright (C) 2005-2011 Martin Willi
* Copyright (C) 2005 Jan Hutter * Copyright (C) 2005 Jan Hutter
* HSR Hochschule fuer Technik Rapperswil * HSR Hochschule fuer Technik Rapperswil
@ -121,6 +121,9 @@ enum exchange_type_t{
*/ */
IKE_SESSION_RESUME = 38, IKE_SESSION_RESUME = 38,
/* IKE_INTERMEDIATE (draft-ietf-ipsecme-ikev2-intermediate) */
IKE_INTERMEDIATE = 43,
#ifdef ME #ifdef ME
/** /**
* ME_CONNECT * ME_CONNECT