eap: Use pen_t instead of uint32_t for vendor ID

src/libcharon/encoding/message.c

@@ -1335,8 +1335,8 @@ static char* get_string(private_message_t *this, char *buf, int len)
 		if (payload->get_type(payload) == PLV2_EAP)
 		{
 			eap_payload_t *eap = (eap_payload_t*)payload;
-			uint32_t vendor;
 			eap_type_t type;
+			pen_t vendor;
 			char method[64] = "";
 
 			type = eap->get_type(eap, &vendor);

src/libcharon/encoding/payloads/eap_payload.c

@@ -225,7 +225,7 @@ METHOD(eap_payload_t, get_identifier, uint8_t,
  * @return	the new offset or 0 if failed
  */
 static size_t extract_type(private_eap_payload_t *this, size_t offset,
-					       eap_type_t *type, uint32_t *vendor)
+					       eap_type_t *type, pen_t *vendor)
 {
 	if (this->data.len > offset)
 	{
@@ -246,7 +246,7 @@ static size_t extract_type(private_eap_payload_t *this, size_t offset,
 }
 
 METHOD(eap_payload_t, get_type, eap_type_t,
-	private_eap_payload_t *this, uint32_t *vendor)
+	private_eap_payload_t *this, pen_t *vendor)
 {
 	eap_type_t type;
 
@@ -274,7 +274,7 @@ METHOD(enumerator_t, enumerate_types, bool,
 	type_enumerator_t *this, va_list args)
 {
 	eap_type_t *type;
-	uint32_t *vendor;
+	pen_t *vendor;
 
 	VA_ARGS_VGET(args, type, vendor);
 	this->offset = extract_type(this->payload, this->offset, type, vendor);
@@ -286,7 +286,7 @@ METHOD(eap_payload_t, get_types, enumerator_t*,
 {
 	type_enumerator_t *enumerator;
 	eap_type_t type;
-	uint32_t vendor;
+	pen_t vendor;
 	size_t offset;
 
 	offset = extract_type(this, 4, &type, &vendor);
@@ -391,7 +391,7 @@ eap_payload_t *eap_payload_create_code(eap_code_t code, uint8_t identifier)
 /**
  * Write the given type either expanded or not
  */
-static void write_type(bio_writer_t *writer, eap_type_t type, uint32_t vendor,
+static void write_type(bio_writer_t *writer, eap_type_t type, pen_t vendor,
 					   bool expanded)
 {
 	if (expanded)
@@ -410,11 +410,11 @@ static void write_type(bio_writer_t *writer, eap_type_t type, uint32_t vendor,
  * Described in header
  */
 eap_payload_t *eap_payload_create_nak(uint8_t identifier, eap_type_t type,
-									  uint32_t vendor, bool expanded)
+									  pen_t vendor, bool expanded)
 {
 	enumerator_t *enumerator;
 	eap_type_t reg_type;
-	uint32_t reg_vendor;
+	pen_t reg_vendor;
 	bio_writer_t *writer;
 	chunk_t data;
 	bool added_any = FALSE, found_vendor = FALSE;

src/libcharon/encoding/payloads/eap_payload.h

@@ -81,13 +81,13 @@ struct eap_payload_t {
 	 * @param vendor	pointer receiving vendor identifier
 	 * @return			EAP method type, vendor specific if vendor != 0
 	 */
-	eap_type_t (*get_type) (eap_payload_t *this, uint32_t *vendor);
+	eap_type_t (*get_type) (eap_payload_t *this, pen_t *vendor);
 
 	/**
 	 * Enumerate the EAP method types contained in an EAP-Nak (i.e. get_type()
 	 * returns EAP_NAK).
 	 *
-	 * @return			enumerator over (eap_type_t type, uint32_t vendor)
+	 * @return			enumerator over (eap_type_t type, pen_t vendor)
 	 */
 	enumerator_t* (*get_types) (eap_payload_t *this);
 
@@ -149,6 +149,6 @@ eap_payload_t *eap_payload_create_code(eap_code_t code, uint8_t identifier);
  * @return 				eap_payload_t object
  */
 eap_payload_t *eap_payload_create_nak(uint8_t identifier, eap_type_t type,
-									  uint32_t vendor, bool expanded);
+									  pen_t vendor, bool expanded);
 
 #endif /** EAP_PAYLOAD_H_ @}*/