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/testcases/sa_config_test.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/testcases/sa_config_test.c')
-rw-r--r-- | Source/charon/testcases/sa_config_test.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/charon/testcases/sa_config_test.c b/Source/charon/testcases/sa_config_test.c index 8fe624eb2..2dfb1118b 100644 --- a/Source/charon/testcases/sa_config_test.c +++ b/Source/charon/testcases/sa_config_test.c @@ -37,7 +37,7 @@ void test_sa_config(protected_tester_t *tester) { sa_config_t *sa_config; traffic_selector_t *ts_policy[3], *ts_request[4], *ts_reference[3], **ts_result; - child_proposal_t *proposal1, *proposal2, *proposal3, *proposal_sel; + proposal_t *proposal1, *proposal2, *proposal3, *proposal_sel; linked_list_t *proposals_list; iterator_t *iterator; size_t count; @@ -61,15 +61,15 @@ void test_sa_config(protected_tester_t *tester) */ /* esp only prop */ - proposal1 = child_proposal_create(1); + proposal1 = proposal_create(1); proposal1->add_algorithm(proposal1, ESP, ENCRYPTION_ALGORITHM, ENCR_AES_CBC, 16); /* ah only prop */ - proposal2 = child_proposal_create(2); + proposal2 = proposal_create(2); proposal2->add_algorithm(proposal2, AH, INTEGRITY_ALGORITHM, AUTH_HMAC_SHA1_96, 20); /* ah and esp prop */ - proposal3 = child_proposal_create(3); + proposal3 = proposal_create(3); proposal3->add_algorithm(proposal3, ESP, ENCRYPTION_ALGORITHM, ENCR_3DES, 16); proposal3->add_algorithm(proposal3, AH, INTEGRITY_ALGORITHM, AUTH_HMAC_MD5_96, 20); @@ -84,9 +84,9 @@ void test_sa_config(protected_tester_t *tester) proposals_list = linked_list_create(); - proposal1 = child_proposal_create(1); + proposal1 = proposal_create(1); proposal1->add_algorithm(proposal1, ESP, ENCRYPTION_ALGORITHM, ENCR_AES_CBC, 32); - proposal2 = child_proposal_create(2); + proposal2 = proposal_create(2); proposal2->add_algorithm(proposal2, ESP, ENCRYPTION_ALGORITHM, ENCR_AES_CBC, 16); proposal2->add_algorithm(proposal2, ESP, ENCRYPTION_ALGORITHM, ENCR_3DES, 16); proposal2->add_algorithm(proposal2, ESP, ENCRYPTION_ALGORITHM, ENCR_BLOWFISH, 0); |