aboutsummaryrefslogtreecommitdiffstats
path: root/src/libcharon/encoding/payloads/id_payload.c
diff options
context:
space:
mode:
authorVolker RĂ¼melin <vr_strongswan@t-online.de>2012-12-15 14:11:26 +0100
committerTobias Brunner <tobias@strongswan.org>2012-12-19 11:03:42 +0100
commit0ff8d20a89e50a386584a79424a4c04c5a6c1e95 (patch)
tree8a8320e41c8e93cc5230de5784822dc3e29073c4 /src/libcharon/encoding/payloads/id_payload.c
parentecdd5aedac519eb3065bf2017a70b595ac9d75a3 (diff)
downloadstrongswan-0ff8d20a89e50a386584a79424a4c04c5a6c1e95.tar.bz2
strongswan-0ff8d20a89e50a386584a79424a4c04c5a6c1e95.tar.xz
Add support for draft-ietf-ipsec-nat-t-ike-03 and earlier
This adds support for early versions of the draft that eventually resulted in RFC 3947.
Diffstat (limited to 'src/libcharon/encoding/payloads/id_payload.c')
-rw-r--r--src/libcharon/encoding/payloads/id_payload.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libcharon/encoding/payloads/id_payload.c b/src/libcharon/encoding/payloads/id_payload.c
index 02b07d691..7470bb3b4 100644
--- a/src/libcharon/encoding/payloads/id_payload.c
+++ b/src/libcharon/encoding/payloads/id_payload.c
@@ -165,7 +165,7 @@ METHOD(payload_t, verify, status_t,
{
bool bad_length = FALSE;
- if (this->type == NAT_OA_V1 &&
+ if ((this->type == NAT_OA_V1 || this->type == NAT_OA_DRAFT_00_03_V1) &&
this->id_type != ID_IPV4_ADDR && this->id_type != ID_IPV6_ADDR)
{
DBG1(DBG_ENC, "invalid ID type %N for %N payload", id_type_names,
@@ -195,7 +195,8 @@ METHOD(payload_t, verify, status_t,
METHOD(payload_t, get_encoding_rules, int,
private_id_payload_t *this, encoding_rule_t **rules)
{
- if (this->type == ID_V1 || this->type == NAT_OA_V1)
+ if (this->type == ID_V1 ||
+ this->type == NAT_OA_V1 || this->type == NAT_OA_DRAFT_00_03_V1)
{
*rules = encodings_v1;
return countof(encodings_v1);