aboutsummaryrefslogtreecommitdiffstats
path: root/Source/charon/encoding
diff options
context:
space:
mode:
authorMartin Willi <martin@strongswan.org>2005-12-02 16:09:04 +0000
committerMartin Willi <martin@strongswan.org>2005-12-02 16:09:04 +0000
commit01de2f3cd5b2eeb9e39ba5c80926a0cf4f7df033 (patch)
treed4c6680711967ca03b55bde5806d60b7eac732cd /Source/charon/encoding
parent94b0f906e6a97f1130170351cb9ec2a48df7f4a5 (diff)
downloadstrongswan-01de2f3cd5b2eeb9e39ba5c80926a0cf4f7df033.tar.bz2
strongswan-01de2f3cd5b2eeb9e39ba5c80926a0cf4f7df033.tar.xz
- fixes
Diffstat (limited to 'Source/charon/encoding')
-rw-r--r--Source/charon/encoding/message.c2
-rw-r--r--Source/charon/encoding/payloads/encryption_payload.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/charon/encoding/message.c b/Source/charon/encoding/message.c
index a6d237550..7fea8aea3 100644
--- a/Source/charon/encoding/message.c
+++ b/Source/charon/encoding/message.c
@@ -147,7 +147,7 @@ static supported_payload_entry_t supported_ike_auth_r_payloads[] =
{
{NOTIFY,0,1,TRUE,TRUE},
{CERTIFICATE,0,1,TRUE,FALSE},
- {ID_RESPONDER,0,1,TRUE,FALSE},
+ {ID_RESPONDER,1,1,TRUE,FALSE},
{AUTHENTICATION,1,1,TRUE,FALSE},
{SECURITY_ASSOCIATION,1,1,TRUE,FALSE},
{TRAFFIC_SELECTOR_INITIATOR,1,1,TRUE,FALSE},
diff --git a/Source/charon/encoding/payloads/encryption_payload.c b/Source/charon/encoding/payloads/encryption_payload.c
index 7ea290404..9f16a66d0 100644
--- a/Source/charon/encoding/payloads/encryption_payload.c
+++ b/Source/charon/encoding/payloads/encryption_payload.c
@@ -353,6 +353,7 @@ static status_t decrypt(private_encryption_payload_t *this)
/* get IV */
iv.len = this->crypter->get_block_size(this->crypter);
+
iv.ptr = this->encrypted.ptr;
/* point concatenated to data + padding + padding_length*/
@@ -394,7 +395,6 @@ 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(this->logger, CONTROL|MOST, "decryption successful, trying to parse content");
return (this->parse(this));
}