denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ikev2: Add SIGNATURE_HASH_ALGORITHMS notify payload

Browse Source
This commit is contained in:
Tobias Brunner
2015-03-04 13:54:08 +01:00
parent 7cd8371da2
commit 159b7bec9e
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/encoding/payloads/notify_payload.c
+16 -6
View File
@@ -65,7 +65,7 @@ ENUM_NEXT(notify_type_names, ME_CONNECT_FAILED, ME_CONNECT_FAILED, CHILD_SA_NOT_
"ME_CONNECT_FAILED"); "ME_CONNECT_FAILED");
ENUM_NEXT(notify_type_names, MS_NOTIFY_STATUS, MS_NOTIFY_STATUS, ME_CONNECT_FAILED, ENUM_NEXT(notify_type_names, MS_NOTIFY_STATUS, MS_NOTIFY_STATUS, ME_CONNECT_FAILED,
"MS_NOTIFY_STATUS"); "MS_NOTIFY_STATUS");
ENUM_NEXT(notify_type_names, INITIAL_CONTACT, FRAGMENTATION_SUPPORTED, MS_NOTIFY_STATUS, ENUM_NEXT(notify_type_names, INITIAL_CONTACT, SIGNATURE_HASH_ALGORITHMS, MS_NOTIFY_STATUS,
"INITIAL_CONTACT", "INITIAL_CONTACT",
"SET_WINDOW_SIZE", "SET_WINDOW_SIZE",
"ADDITIONAL_TS_POSSIBLE", "ADDITIONAL_TS_POSSIBLE",
@@ -112,8 +112,9 @@ ENUM_NEXT(notify_type_names, INITIAL_CONTACT, FRAGMENTATION_SUPPORTED, MS_NOTIFY
"ERX_SUPPORTED", "ERX_SUPPORTED",
"IFOM_CAPABILITY", "IFOM_CAPABILITY",
"SENDER_REQUEST_ID", "SENDER_REQUEST_ID",
"FRAGMENTATION_SUPPORTED"); "FRAGMENTATION_SUPPORTED",
ENUM_NEXT(notify_type_names, INITIAL_CONTACT_IKEV1, INITIAL_CONTACT_IKEV1, FRAGMENTATION_SUPPORTED, "SIGNATURE_HASH_ALGORITHMS");
ENUM_NEXT(notify_type_names, INITIAL_CONTACT_IKEV1, INITIAL_CONTACT_IKEV1, SIGNATURE_HASH_ALGORITHMS,
"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",
@@ -174,7 +175,7 @@ ENUM_NEXT(notify_type_short_names, ME_CONNECT_FAILED, ME_CONNECT_FAILED, CHILD_S
"ME_CONN_FAIL"); "ME_CONN_FAIL");
ENUM_NEXT(notify_type_short_names, MS_NOTIFY_STATUS, MS_NOTIFY_STATUS, ME_CONNECT_FAILED, ENUM_NEXT(notify_type_short_names, MS_NOTIFY_STATUS, MS_NOTIFY_STATUS, ME_CONNECT_FAILED,
"MS_STATUS"); "MS_STATUS");
ENUM_NEXT(notify_type_short_names, INITIAL_CONTACT, FRAGMENTATION_SUPPORTED, MS_NOTIFY_STATUS, ENUM_NEXT(notify_type_short_names, INITIAL_CONTACT, SIGNATURE_HASH_ALGORITHMS, MS_NOTIFY_STATUS,
"INIT_CONTACT", "INIT_CONTACT",
"SET_WINSIZE", "SET_WINSIZE",
"ADD_TS_POSS", "ADD_TS_POSS",
@@ -221,8 +222,9 @@ ENUM_NEXT(notify_type_short_names, INITIAL_CONTACT, FRAGMENTATION_SUPPORTED, MS_
"ERX_SUP", "ERX_SUP",
"IFOM_CAP", "IFOM_CAP",
"SENDER_REQ_ID", "SENDER_REQ_ID",
"FRAG_SUP"); "FRAG_SUP",
ENUM_NEXT(notify_type_short_names, INITIAL_CONTACT_IKEV1, INITIAL_CONTACT_IKEV1, FRAGMENTATION_SUPPORTED, "HASH_ALG");
ENUM_NEXT(notify_type_short_names, INITIAL_CONTACT_IKEV1, INITIAL_CONTACT_IKEV1, SIGNATURE_HASH_ALGORITHMS,
"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",
@@ -473,6 +475,14 @@ METHOD(payload_t, verify, status_t,
} }
break; break;
} }
case SIGNATURE_HASH_ALGORITHMS:
{
if (this->notify_data.len % 2)
{
bad_length = TRUE;
}
break;
}
case AUTH_LIFETIME: case AUTH_LIFETIME:
{ {
if (this->notify_data.len != 4) if (this->notify_data.len != 4)
src/libcharon/encoding/payloads/notify_payload.h
+2
View File
@@ -151,6 +151,8 @@ enum notify_type_t {
SENDER_REQUEST_ID = 16429, SENDER_REQUEST_ID = 16429,
/* IKEv2 fragmentation supported, RFC 7383 */ /* IKEv2 fragmentation supported, RFC 7383 */
FRAGMENTATION_SUPPORTED = 16430, FRAGMENTATION_SUPPORTED = 16430,
/* Signature Hash Algorithms, RFC 7427 */
SIGNATURE_HASH_ALGORITHMS = 16431,
/* IKEv1 initial contact */ /* IKEv1 initial contact */
INITIAL_CONTACT_IKEV1 = 24578, INITIAL_CONTACT_IKEV1 = 24578,
/* IKEv1 DPD */ /* IKEv1 DPD */