diff options
| author | Martin Willi <martin@strongswan.org> | 2006-02-14 14:52:00 +0000 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2006-02-14 14:52:00 +0000 |
| commit | ce461bbd13c5ea6a94ba0b34cbb4d1be8159b67e (patch) | |
| tree | d3ba1aa2e97e7aeb7b24163d4b8671abbeb9a7c9 /Source/charon/sa/states/ike_sa_init_responded.c | |
| parent | 409d010131f14e551e0645e9b88ad7621d08b781 (diff) | |
| download | strongswan-ce461bbd13c5ea6a94ba0b34cbb4d1be8159b67e.tar.bz2 strongswan-ce461bbd13c5ea6a94ba0b34cbb4d1be8159b67e.tar.xz | |
- 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
Diffstat (limited to 'Source/charon/sa/states/ike_sa_init_responded.c')
| -rw-r--r-- | Source/charon/sa/states/ike_sa_init_responded.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/charon/sa/states/ike_sa_init_responded.c b/Source/charon/sa/states/ike_sa_init_responded.c index 2c21992e6..536041d0d 100644 --- a/Source/charon/sa/states/ike_sa_init_responded.c +++ b/Source/charon/sa/states/ike_sa_init_responded.c @@ -387,7 +387,7 @@ static status_t build_idr_payload(private_ike_sa_init_responded_t *this, id_payl */ static status_t build_sa_payload(private_ike_sa_init_responded_t *this, sa_payload_t *request, message_t *response) { - child_proposal_t *proposal, *proposal_tmp; + proposal_t *proposal, *proposal_tmp; linked_list_t *proposal_list; sa_payload_t *sa_response; child_sa_t *child_sa; @@ -397,7 +397,7 @@ static status_t build_sa_payload(private_ike_sa_init_responded_t *this, sa_paylo /* TODO: child sa stuff */ /* get proposals from request */ - proposal_list = request->get_child_proposals(request); + proposal_list = request->get_proposals(request); if (proposal_list->get_count(proposal_list) == 0) { /* if the other side did not offer any proposals, we do not create child sa's */ @@ -426,7 +426,7 @@ static status_t build_sa_payload(private_ike_sa_init_responded_t *this, sa_paylo } /* create payload with selected propsal */ - sa_response = sa_payload_create_from_child_proposal(proposal); + sa_response = sa_payload_create_from_proposal(proposal); response->add_payload(response, (payload_t*)sa_response); /* install child SAs for AH and esp */ |