bus: Extend and reorder arguments of ike_derived_keys() hook

This now includes all key material derived for IKE_SAs in the order
defined in the RFC:

  {SK_d | SK_ai | SK_ar | SK_ei | SK_er | SK_pi | SK_pr}
               = prf+ (SKEYSEED, Ni | Nr | SPIi | SPIr)

Signed-off-by: Thomas Egerer <[email protected]>
This commit is contained in:
Thomas Egerer
2021-06-07 17:08:27 +02:00
committed by Tobias Brunner
parent 9c85a52956
commit 4e29d6fac1
6 changed files with 69 additions and 59 deletions
@@ -276,8 +276,9 @@ static inline void esp_names(proposal_t *proposal, const char **enc,
}
METHOD(listener_t, ike_derived_keys, bool,
private_save_keys_listener_t *this, ike_sa_t *ike_sa, chunk_t sk_ei,
chunk_t sk_er, chunk_t sk_ai, chunk_t sk_ar)
private_save_keys_listener_t *this, ike_sa_t *ike_sa, chunk_t sk_d,
chunk_t sk_ai, chunk_t sk_ar, chunk_t sk_ei, chunk_t sk_er, chunk_t sk_pi,
chunk_t sk_pr)
{
ike_version_t version;
ike_sa_id_t *id;