- changed way of freeing chunks

- ike_sa is checked out differently

3 files changed, 17 insertions, 17 deletions

diff --git a/Source/charon/testcases/generator_test.c b/Source/charon/testcases/generator_test.c
index 0d32ba137..95a124984 100644
--- a/Source/charon/testcases/generator_test.c
+++ b/Source/charon/testcases/generator_test.c
@@ -83,7 +83,7 @@ void test_generator_with_header_payload(tester_t *tester)
 	tester->assert_true(tester,(generated_data.len == sizeof(expected_generation)), "compare generated data length");
 	logger->log_chunk(logger,RAW,"generated header",&generated_data);		
 	tester->assert_true(tester,(memcmp(expected_generation,generated_data.ptr,sizeof(expected_generation)) == 0), "compare generated data 1");
-	allocator_free_chunk(generated_data);
+	allocator_free_chunk(&generated_data);
 	
 	tester->assert_true(tester,(generator->destroy(generator) == SUCCESS), "generator destroy call check");
 
@@ -119,7 +119,7 @@ void test_generator_with_header_payload(tester_t *tester)
 	logger->log_chunk(logger,RAW,"generated header",&generated_data);
 
 	tester->assert_true(tester,(memcmp(expected_generation2,generated_data.ptr,sizeof(expected_generation2)) == 0), "compare generated data 2");
-	allocator_free_chunk(generated_data);
+	allocator_free_chunk(&generated_data);
 
 	header_data->destroy(header_data);
 	
@@ -154,7 +154,7 @@ void test_generator_with_transform_attribute(tester_t *tester)
 		0x80,0x00,0x00,0x00,
 	};
 	tester->assert_true(tester,(memcmp(expected_generation,generated_data.ptr,sizeof(expected_generation)) == 0), "compare generated data");
-	allocator_free_chunk(generated_data);
+	allocator_free_chunk(&generated_data);
 	tester->assert_true(tester,(attribute->destroy(attribute) == SUCCESS), "attribute destroy call check");
 	tester->assert_true(tester,(generator->destroy(generator) == SUCCESS), "generator destroy call check");
 	
@@ -180,7 +180,7 @@ void test_generator_with_transform_attribute(tester_t *tester)
 	};
 	tester->assert_true(tester,(memcmp(expected_generation2,generated_data.ptr,sizeof(expected_generation2)) == 0), "compare generated data");
 
-	allocator_free_chunk(generated_data);
+	allocator_free_chunk(&generated_data);
 	tester->assert_true(tester,(attribute->destroy(attribute) == SUCCESS), "attribute destroy call check");
 	tester->assert_true(tester,(generator->destroy(generator) == SUCCESS), "generator destroy call check");
 
@@ -219,7 +219,7 @@ void test_generator_with_transform_attribute(tester_t *tester)
 	};
 	tester->assert_true(tester,(memcmp(expected_generation3,generated_data.ptr,sizeof(expected_generation3)) == 0), "compare generated data");
 
-	allocator_free_chunk(generated_data);
+	allocator_free_chunk(&generated_data);
 	tester->assert_true(tester,(attribute->destroy(attribute) == SUCCESS), "attribute destroy call check");
 	tester->assert_true(tester,(generator->destroy(generator) == SUCCESS), "generator destroy call check");
 		
@@ -300,7 +300,7 @@ void test_generator_with_transform_substructure(tester_t *tester)
 	};
 	tester->assert_true(tester,(memcmp(expected_generation3,generated_data.ptr,sizeof(expected_generation3)) == 0), "compare generated data");
 
-	allocator_free_chunk(generated_data);
+	allocator_free_chunk(&generated_data);
 	tester->assert_true(tester,(transform->destroy(transform) == SUCCESS), "transform destroy call check");
 	tester->assert_true(tester,(generator->destroy(generator) == SUCCESS), "generator destroy call check");
 	
@@ -436,7 +436,7 @@ void test_generator_with_proposal_substructure(tester_t *tester)
 
 	tester->assert_true(tester,(memcmp(expected_generation,generated_data.ptr,sizeof(expected_generation)) == 0), "compare generated data");
 
-	allocator_free_chunk(generated_data);
+	allocator_free_chunk(&generated_data);
 	tester->assert_true(tester,(proposal->destroy(proposal) == SUCCESS), "proposal destroy call check");
 	tester->assert_true(tester,(generator->destroy(generator) == SUCCESS), "generator destroy call check");
 	
@@ -615,7 +615,7 @@ void test_generator_with_sa_payload(tester_t *tester)
 	
 	tester->assert_true(tester,(memcmp(expected_generation,generated_data.ptr,sizeof(expected_generation)) == 0), "compare generated data");
 
-	allocator_free_chunk(generated_data);
+	allocator_free_chunk(&generated_data);
 	tester->assert_true(tester,(ike_header->destroy(ike_header) == SUCCESS), "ike_header destroy call check");
 	tester->assert_true(tester,(sa_payload->destroy(sa_payload) == SUCCESS), "sa_payload destroy call check");
 	tester->assert_true(tester,(generator->destroy(generator) == SUCCESS), "generator destroy call check");
@@ -672,7 +672,7 @@ void test_generator_with_ke_payload(tester_t *tester)
 	
 	tester->assert_true(tester,(memcmp(expected_generation,generated_data.ptr,sizeof(expected_generation)) == 0), "compare generated data");
 
-	allocator_free_chunk(generated_data);	
+	allocator_free_chunk(&generated_data);	
 	
 	tester->assert_true(tester,(ke_payload->destroy(ke_payload) == SUCCESS), "sa_payload destroy call check");
 	tester->assert_true(tester,(generator->destroy(generator) == SUCCESS), "generator destroy call check");
@@ -734,7 +734,7 @@ void test_generator_with_notify_payload(tester_t *tester)
 	
 	tester->assert_true(tester,(memcmp(expected_generation,generated_data.ptr,sizeof(expected_generation)) == 0), "compare generated data");
 
-	allocator_free_chunk(generated_data);	
+	allocator_free_chunk(&generated_data);	
 	
 	tester->assert_true(tester,(notify_payload->destroy(notify_payload) == SUCCESS), "notify_payload destroy call check");
 	tester->assert_true(tester,(generator->destroy(generator) == SUCCESS), "generator destroy call check");
@@ -789,7 +789,7 @@ void test_generator_with_nonce_payload(tester_t *tester)
 	
 	tester->assert_true(tester,(memcmp(expected_generation,generated_data.ptr,sizeof(expected_generation)) == 0), "compare generated data");
 
-	allocator_free_chunk(generated_data);
+	allocator_free_chunk(&generated_data);
 	
 	
 	tester->assert_true(tester,(nonce_payload->destroy(nonce_payload) == SUCCESS), "notify_payload destroy call check");
diff --git a/Source/charon/testcases/ike_sa_manager_test.c b/Source/charon/testcases/ike_sa_manager_test.c
index df6f034c8..f49779159 100644
--- a/Source/charon/testcases/ike_sa_manager_test.c
+++ b/Source/charon/testcases/ike_sa_manager_test.c
@@ -94,12 +94,8 @@ void test_ike_sa_manager(tester_t *tester)
 	 * create an IKE_SA, 
 	 * 
 	 */
-	memset(&initiator, 0, sizeof(initiator));
-	memset(&responder, 0, sizeof(responder));
-	
-	ike_sa_id = ike_sa_id_create(initiator, responder, TRUE);
 
-	status = td.isam->checkout(td.isam, ike_sa_id, &ike_sa);
+	status = td.isam->create_and_checkout(td.isam, &ike_sa);
 	tester->assert_true(tester, (status == SUCCESS), "checkout unexisting IKE_SA");
 	/* for testing purposes, we manipulate the responder spi.
 	 * this is usually done be the response from the communication partner, 
@@ -109,6 +105,10 @@ void test_ike_sa_manager(tester_t *tester)
 
 	sa_id = ike_sa->get_id(ike_sa);
 	sa_id->set_responder_spi(sa_id, responder);	
+	
+	status = sa_id->clone(sa_id,&ike_sa_id);
+	tester->assert_true(tester, (status == SUCCESS), "clone sa id");
+		
 	/* check in, so we should have a "completed" sa, specified by ike_sa_id */
 	status = td.isam->checkin(td.isam, ike_sa);
 	tester->assert_true(tester, (status == SUCCESS), "checkin modified IKE_SA");
diff --git a/Source/charon/testcases/parser_test.c b/Source/charon/testcases/parser_test.c
index 0cc9a2920..087fe87c5 100644
--- a/Source/charon/testcases/parser_test.c
+++ b/Source/charon/testcases/parser_test.c
@@ -219,7 +219,7 @@ void test_parser_with_nonce_payload(tester_t *tester)
 	tester->assert_true(tester,(result.len == 16), "parsed nonce lenght");
 	tester->assert_false(tester,(memcmp(nonce_bytes + 4, result.ptr, result.len)), "parsed nonce data");
 	nonce_payload->destroy(nonce_payload);
-	allocator_free_chunk(result);
+	allocator_free_chunk(&result);
 }
 
 /*