4 files changed, 22 insertions, 10 deletions
diff --git a/src/libcharon/encoding/payloads/payload.c b/src/libcharon/encoding/payloads/payload.c
index 47fe20cca..78451c5b4 100644
--- a/src/libcharon/encoding/payloads/payload.c
+++ b/src/libcharon/encoding/payloads/payload.c
@@ -192,7 +192,8 @@ payload_t *payload_create(payload_type_t type)
 		case DELETE:
 			return (payload_t*)delete_payload_create(0);
 		case VENDOR_ID:
-			return (payload_t*)vendor_id_payload_create();
+		case VENDOR_ID_V1:
+			return (payload_t*)vendor_id_payload_create(type);
 		case CONFIGURATION:
 			return (payload_t*)cp_payload_create();
 		case CONFIGURATION_ATTRIBUTE:
diff --git a/src/libcharon/encoding/payloads/vendor_id_payload.c b/src/libcharon/encoding/payloads/vendor_id_payload.c
index e9e80e989..3dab3941e 100644
--- a/src/libcharon/encoding/payloads/vendor_id_payload.c
+++ b/src/libcharon/encoding/payloads/vendor_id_payload.c
@@ -55,6 +55,11 @@ struct private_vendor_id_payload_t {
 	 * The contained data.
 	 */
 	chunk_t data;
+
+	/**
+	 * Either a IKEv1 or a IKEv2 vendor ID payload
+	 */
+	payload_type_t type;
 };
 
 /**
@@ -111,7 +116,7 @@ METHOD(payload_t, get_encoding_rules, void,
 METHOD(payload_t, get_type, payload_type_t,
 	private_vendor_id_payload_t *this)
 {
-	return VENDOR_ID;
+	return this->type;
 }
 
 METHOD(payload_t, get_next_type, payload_type_t,
@@ -148,7 +153,8 @@ METHOD2(payload_t, vendor_id_payload_t, destroy, void,
 /*
  * Described in header
  */
-vendor_id_payload_t *vendor_id_payload_create_data(chunk_t data)
+vendor_id_payload_t *vendor_id_payload_create_data(payload_type_t type,
+												   chunk_t data)
 {
 	private_vendor_id_payload_t *this;
 
@@ -169,6 +175,7 @@ vendor_id_payload_t *vendor_id_payload_create_data(chunk_t data)
 		.next_payload = NO_PAYLOAD,
 		.payload_length = VENDOR_ID_PAYLOAD_HEADER_LENGTH + data.len,
 		.data = data,
+		.type = type,
 	);
 	return &this->public;
 }
@@ -176,7 +183,7 @@ vendor_id_payload_t *vendor_id_payload_create_data(chunk_t data)
 /*
  * Described in header
  */
-vendor_id_payload_t *vendor_id_payload_create()
+vendor_id_payload_t *vendor_id_payload_create(payload_type_t type)
 {
-	return vendor_id_payload_create_data(chunk_empty);
+	return vendor_id_payload_create_data(type, chunk_empty);
 }
diff --git a/src/libcharon/encoding/payloads/vendor_id_payload.h b/src/libcharon/encoding/payloads/vendor_id_payload.h
index 4e4e7d8eb..4943af436 100644
--- a/src/libcharon/encoding/payloads/vendor_id_payload.h
+++ b/src/libcharon/encoding/payloads/vendor_id_payload.h
@@ -33,7 +33,7 @@ typedef struct vendor_id_payload_t vendor_id_payload_t;
 #define VENDOR_ID_PAYLOAD_HEADER_LENGTH 4
 
 /**
- * Class representing an IKEv2 VENDOR ID payload.
+ * Class representing an IKEv1/IKEv2 VENDOR ID payload.
  *
  * The VENDOR ID payload format is described in RFC section 3.12.
  */
@@ -58,18 +58,21 @@ struct vendor_id_payload_t {
 };
 
 /**
- * Creates an empty Vendor ID payload.
+ * Creates an empty Vendor ID payload for IKEv1 or IKEv2.
  *
+ * @@param type		VENDOR_ID or VENDOR_ID_V1
  * @return			vendor ID payload
  */
-vendor_id_payload_t *vendor_id_payload_create();
+vendor_id_payload_t *vendor_id_payload_create(payload_type_t type);
 
 /**
  * Creates a vendor ID payload using a chunk of data
  *
+ * @param type		VENDOR_ID or VENDOR_ID_V1
  * @param data		data to use in vendor ID payload, gets owned by payload
  * @return			vendor ID payload
  */
-vendor_id_payload_t *vendor_id_payload_create_data(chunk_t data);
+vendor_id_payload_t *vendor_id_payload_create_data(payload_type_t type,
+												   chunk_t data);
 
 #endif /** VENDOR_ID_PAYLOAD_H_ @}*/
diff --git a/src/libcharon/sa/tasks/ike_vendor.c b/src/libcharon/sa/tasks/ike_vendor.c
index 1c14ee06b..b3a7dddfa 100644
--- a/src/libcharon/sa/tasks/ike_vendor.c
+++ b/src/libcharon/sa/tasks/ike_vendor.c
@@ -57,7 +57,8 @@ METHOD(task_t, build, status_t,
 	{
 		vendor_id_payload_t *vid;
 
-		vid = vendor_id_payload_create_data(chunk_clone(strongswan_vid));
+		vid = vendor_id_payload_create_data(VENDOR_ID,
+											chunk_clone(strongswan_vid));
 		message->add_payload(message, &vid->payload_interface);
 	}