From ce461bbd13c5ea6a94ba0b34cbb4d1be8159b67e Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Tue, 14 Feb 2006 14:52:00 +0000 Subject: - refactored ike proposal - uses now proposal_t, wich is also used by child proposals - ike key derivation refactored - crypter_t api has get_key_size now - some other improvements here and there --- Source/charon/encoding/payloads/proposal_substructure.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Source/charon/encoding/payloads/proposal_substructure.h') diff --git a/Source/charon/encoding/payloads/proposal_substructure.h b/Source/charon/encoding/payloads/proposal_substructure.h index 0247584bb..2270a525b 100644 --- a/Source/charon/encoding/payloads/proposal_substructure.h +++ b/Source/charon/encoding/payloads/proposal_substructure.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include @@ -173,7 +173,7 @@ struct proposal_substructure_t { */ void (*set_spi) (proposal_substructure_t *this, chunk_t spi); - void (*add_to_child_proposal) (proposal_substructure_t *this, child_proposal_t *proposal); + void (*add_to_proposal) (proposal_substructure_t *this, proposal_t *proposal); /** * @brief Clones an proposal_substructure_t object. @@ -201,7 +201,7 @@ struct proposal_substructure_t { proposal_substructure_t *proposal_substructure_create(); /** - * @brief Creates a proposal substructure from a child_proposal. + * @brief Creates a proposal substructure from a proposal. * * Since a child proposal may contain data for both AH and ESP, * the protocol must be specified. If the proposal does not contain @@ -215,7 +215,7 @@ proposal_substructure_t *proposal_substructure_create(); * * @ingroup payloads */ -proposal_substructure_t *proposal_substructure_create_from_child_proposal(child_proposal_t *proposal, protocol_id_t proto); +proposal_substructure_t *proposal_substructure_create_from_proposal(proposal_t *proposal, protocol_id_t proto); #endif /*PROPOSAL_SUBSTRUCTURE_H_*/ -- cgit v1.2.3