ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

wip: ike-init: Indicate support for IKE_INTERMEDIATE 

wip: Not strictly necessary. I guess we should also add some checks if
the notify was not received.
This commit is contained in:
Tobias Brunner 2019-11-05 16:42:58 +01:00
parent c09bbf715c
commit 6fcb9cb301
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/libcharon/sa/ike_sa.h
View File

@ -167,6 +167,11 @@ enum ike_extension_t {
* Responder accepts childless IKE_SAs, RFC 6023
*/
EXT_IKE_CHILDLESS = (1<<16),
/**
* IKE_INTERMEDIATE, draft-ietf-ipsecme-ikev2-intermediate
*/
EXT_IKE_INTERMEDIATE = (1<<17),
};
/**

21
src/libcharon/sa/ikev2/tasks/ike_init.c
View File

@ -346,6 +346,7 @@ static bool build_payloads(private_ike_init_t *this, message_t *message)
proposal_t *proposal;
enumerator_t *enumerator;
ike_cfg_t *ike_cfg;
bool additional_ke = FALSE;
id = this->ike_sa->get_id(this->ike_sa);
@ -370,6 +371,8 @@ static bool build_payloads(private_ike_init_t *this, message_t *message)
proposal_list->remove_at(proposal_list, enumerator);
other_dh_groups->insert_last(other_dh_groups, proposal);
}
additional_ke = additional_ke ||
proposal_has_additional_ke(proposal);
}
enumerator->destroy(enumerator);
/* add proposals that don't contain the selected group */
@ -392,6 +395,7 @@ static bool build_payloads(private_ike_init_t *this, message_t *message)
this->proposal->set_spi(this->proposal, id->get_responder_spi(id));
}
sa_payload = sa_payload_create_from_proposal_v2(this->proposal);
additional_ke = proposal_has_additional_ke(this->proposal);
}
message->add_payload(message, (payload_t*)sa_payload);
@ -465,6 +469,16 @@ static bool build_payloads(private_ike_init_t *this, message_t *message)
message->add_notify(message, FALSE, CHILDLESS_IKEV2_SUPPORTED,
chunk_empty);
}
if (!this->old_sa && additional_ke)
{
if (this->initiator ||
this->ike_sa->supports_extension(this->ike_sa,
EXT_IKE_INTERMEDIATE))
{
message->add_notify(message, FALSE, INTERMEDIATE_EXCHANGE_SUPPORTED,
chunk_empty);
}
}
return TRUE;
}
@ -724,6 +738,13 @@ static void process_payloads(private_ike_init_t *this, message_t *message)
EXT_IKE_CHILDLESS);
}
break;
case INTERMEDIATE_EXCHANGE_SUPPORTED:
if (!this->old_sa)
{
this->ike_sa->enable_extension(this->ike_sa,
EXT_IKE_INTERMEDIATE);
}
break;
default:
/* other notifies are handled elsewhere */
break;