- reworked configuration framework completly

- configuration is now split up in: connections, policies, credentials and daemon config
- further alloc/free fixes needed!

1 files changed, 8 insertions, 8 deletions

diff --git a/Source/charon/encoding/payloads/encryption_payload.c b/Source/charon/encoding/payloads/encryption_payload.c
index 8cbf5566c..e642bb318 100644
--- a/Source/charon/encoding/payloads/encryption_payload.c
+++ b/Source/charon/encoding/payloads/encryption_payload.c
@@ -289,7 +289,7 @@ static status_t encrypt(private_encryption_payload_t *this)
 	this->generate(this);
 	
 	this->logger->log(this->logger, CONTROL|LEVEL2, "encrypting payloads");
-	this->logger->log_chunk(this->logger, RAW|LEVEL2, "data to encrypt", &this->decrypted);
+	this->logger->log_chunk(this->logger, RAW|LEVEL2, "data to encrypt", this->decrypted);
 	
 	/* build padding */
 	block_size = this->crypter->get_block_size(this->crypter);
@@ -309,7 +309,7 @@ static status_t encrypt(private_encryption_payload_t *this)
 	randomizer->allocate_pseudo_random_bytes(randomizer, iv.len, &iv);
 	randomizer->destroy(randomizer);
 	
-	this->logger->log_chunk(this->logger, RAW|LEVEL2, "data before encryption with padding", &to_crypt);
+	this->logger->log_chunk(this->logger, RAW|LEVEL2, "data before encryption with padding", to_crypt);
 		
 	/* encrypt to_crypt chunk */
 	allocator_free(this->encrypted.ptr);
@@ -322,7 +322,7 @@ static status_t encrypt(private_encryption_payload_t *this)
 		allocator_free(iv.ptr);
 		return status;
 	}
-	this->logger->log_chunk(this->logger, RAW|LEVEL2, "data after encryption", &result);
+	this->logger->log_chunk(this->logger, RAW|LEVEL2, "data after encryption", result);
 	
 	
 	/* build encrypted result with iv and signature */
@@ -336,7 +336,7 @@ static status_t encrypt(private_encryption_payload_t *this)
 	
 	allocator_free(result.ptr);
 	allocator_free(iv.ptr);
-	this->logger->log_chunk(this->logger, RAW|LEVEL2, "data after encryption with IV and (invalid) signature", &this->encrypted);
+	this->logger->log_chunk(this->logger, RAW|LEVEL2, "data after encryption with IV and (invalid) signature", this->encrypted);
 	
 	return SUCCESS;
 }
@@ -352,7 +352,7 @@ static status_t decrypt(private_encryption_payload_t *this)
 	
 	
 	this->logger->log(this->logger, CONTROL|LEVEL2, "decrypting encryption payload");
-	this->logger->log_chunk(this->logger, RAW|LEVEL2, "data before decryption with IV and (invalid) signature", &this->encrypted);
+	this->logger->log_chunk(this->logger, RAW|LEVEL2, "data before decryption with IV and (invalid) signature", this->encrypted);
 	
 	
 	if (this->signer == NULL || this->crypter == NULL)
@@ -382,7 +382,7 @@ static status_t decrypt(private_encryption_payload_t *this)
 	/* free previus data, if any */
 	allocator_free(this->decrypted.ptr);
 	
-	this->logger->log_chunk(this->logger, RAW|LEVEL2, "data before decryption", &concatenated);
+	this->logger->log_chunk(this->logger, RAW|LEVEL2, "data before decryption", concatenated);
 	
 	status = this->crypter->decrypt(this->crypter, concatenated, iv, &(this->decrypted));
 	if (status != SUCCESS)
@@ -390,7 +390,7 @@ static status_t decrypt(private_encryption_payload_t *this)
 		this->logger->log(this->logger, ERROR|LEVEL1, "could not decrypt, decryption failed");
 		return FAILED;
 	}
-	this->logger->log_chunk(this->logger, RAW|LEVEL2, "data after decryption with padding", &this->decrypted);
+	this->logger->log_chunk(this->logger, RAW|LEVEL2, "data after decryption with padding", this->decrypted);
 	
 	
 	/* get padding length, sits just bevore signature */
@@ -409,7 +409,7 @@ static status_t decrypt(private_encryption_payload_t *this)
 	
 	/* free padding */
 	this->decrypted.ptr = allocator_realloc(this->decrypted.ptr, this->decrypted.len);
-	this->logger->log_chunk(this->logger, RAW|LEVEL2, "data after decryption without padding", &this->decrypted);
+	this->logger->log_chunk(this->logger, RAW|LEVEL2, "data after decryption without padding", this->decrypted);
 	this->logger->log(this->logger, CONTROL|LEVEL2, "decryption successful, trying to parse content");
 	return (this->parse(this));
 }