ike: Make check for known payloads depend on IKE version

diff --git a/src/libcharon/encoding/message.c b/src/libcharon/encoding/message.c
index fd476532d5c82024a7fef7ff44a0e5d91f09e48a..ba71238c82e652d60488d7e2c615608230947ab0 100644 (file)
--- a/src/libcharon/encoding/message.c
+++ b/src/libcharon/encoding/message.c
@@ -2475,7 +2475,7 @@ static status_t decrypt_payloads(private_message_t *this, keymat_t *keymat)
                        was_encrypted = "encrypted fragment payload";
                }
 
-               if (payload_is_known(type) && !was_encrypted &&
+               if (payload_is_known(type, this->major_version) && !was_encrypted &&
                        !is_connectivity_check(this, payload) &&
                        this->exchange_type != AGGRESSIVE)
                {

diff --git a/src/libcharon/encoding/payloads/payload.c b/src/libcharon/encoding/payloads/payload.c
index 600b6dd68577f20d5a18757eba31ee0ca1fe621b..cd014fd21f2741311d0a6be9ee9eeb4c5430cc75 100644 (file)
--- a/src/libcharon/encoding/payloads/payload.c
+++ b/src/libcharon/encoding/payloads/payload.c
@@ -266,37 +266,51 @@ payload_t *payload_create(payload_type_t type)
 /**
  * See header.
  */
-bool payload_is_known(payload_type_t type)
+bool payload_is_known(payload_type_t type, u_int8_t maj_ver)
 {
        if (type == PL_HEADER)
        {
                return TRUE;
        }
-       if (type >= PLV1_SECURITY_ASSOCIATION && type <= PLV1_CONFIGURATION)
+       switch (maj_ver)
        {
-               return TRUE;
-       }
-       if (type >= PLV1_NAT_D && type <= PLV1_NAT_OA)
-       {
-               return TRUE;
-       }
-       if (type >= PLV2_SECURITY_ASSOCIATION && type <= PLV2_EAP)
-       {
-               return TRUE;
-       }
-       if (type == PLV2_FRAGMENT)
-       {
-               return TRUE;
-       }
+               case 0:
+               case IKEV1_MAJOR_VERSION:
+                       if (type >= PLV1_SECURITY_ASSOCIATION && type <= PLV1_CONFIGURATION)
+                       {
+                               return TRUE;
+                       }
+                       if (type >= PLV1_NAT_D && type <= PLV1_NAT_OA)
+                       {
+                               return TRUE;
+                       }
+                       if (type >= PLV1_NAT_D_DRAFT_00_03 && type <= PLV1_FRAGMENT)
+                       {
+                               return TRUE;
+                       }
+                       if (maj_ver)
+                       {
+                               break;
+                       }
+                       /* fall-through */
+               case IKEV2_MAJOR_VERSION:
+                       if (type >= PLV2_SECURITY_ASSOCIATION && type <= PLV2_EAP)
+                       {
+                               return TRUE;
+                       }
+                       if (type == PLV2_FRAGMENT)
+                       {
+                               return TRUE;
+                       }
 #ifdef ME
-       if (type == PLV2_ID_PEER)
-       {
-               return TRUE;
-       }
+                       if (type == PLV2_ID_PEER)
+                       {
+                               return TRUE;
+                       }
 #endif
-       if (type >= PLV1_NAT_D_DRAFT_00_03 && type <= PLV1_FRAGMENT)
-       {
-               return TRUE;
+                       break;
+               default:
+                       break;
        }
        return FALSE;
 }

diff --git a/src/libcharon/encoding/payloads/payload.h b/src/libcharon/encoding/payloads/payload.h
index 036cd422d05d034fbb5515766e9733bab433fc67..920779bd1032848b81e8edc583314a3a403501c9 100644 (file)
--- a/src/libcharon/encoding/payloads/payload.h
+++ b/src/libcharon/encoding/payloads/payload.h
@@ -405,9 +405,10 @@ payload_t *payload_create(payload_type_t type);
  * Check if a specific payload is implemented, or handled as unknown payload.
  *
  * @param type         type of the payload to check
+ * @param maj_ver      major IKE version (use 0 to skip version check)
  * @return                     FALSE if payload type handled as unknown payload
  */
-bool payload_is_known(payload_type_t type);
+bool payload_is_known(payload_type_t type, u_int8_t maj_ver);
 
 /**
  * Get the value field in a payload using encoding rules.

diff --git a/src/libcharon/sa/ikev2/task_manager_v2.c b/src/libcharon/sa/ikev2/task_manager_v2.c
index eb7df3516ba7679ceaa099e3f99586664dfc143c..e9a677a655e4ad3636de1a59df225e609b06d0f1 100644 (file)
--- a/src/libcharon/sa/ikev2/task_manager_v2.c
+++ b/src/libcharon/sa/ikev2/task_manager_v2.c
@@ -1170,7 +1170,7 @@ static status_t parse_message(private_task_manager_t *this, message_t *msg)
                {
                        unknown = (unknown_payload_t*)payload;
                        type = payload->get_type(payload);
-                       if (!payload_is_known(type) &&
+                       if (!payload_is_known(type, msg->get_major_version(msg)) &&
                                unknown->is_critical(unknown))
                        {
                                DBG1(DBG_ENC, "payload type %N is not supported, "