[svn-upgrade] Integrating new upstream version, strongswan (4.1.11)

3 files changed, 13 insertions, 9 deletions

diff --git a/src/charon/encoding/payloads/eap_payload.c b/src/charon/encoding/payloads/eap_payload.c
index 345114af0..da2498c5e 100644
--- a/src/charon/encoding/payloads/eap_payload.c
+++ b/src/charon/encoding/payloads/eap_payload.c
@@ -312,13 +312,13 @@ eap_payload_t *eap_payload_create_data(chunk_t data)
 /*
  * Described in header
  */
-eap_payload_t *eap_payload_create_code(eap_code_t code)
+eap_payload_t *eap_payload_create_code(eap_code_t code, u_int8_t identifier)
 {
 	eap_payload_t *this = eap_payload_create();
 	chunk_t data = chunk_alloca(4);
 	
 	*(data.ptr + 0) = code;
-	*(data.ptr + 1) = 0;
+	*(data.ptr + 1) = identifier;
 	*(u_int16_t*)(data.ptr + 2) = htons(data.len);
 	
 	this->set_data(this, data);
@@ -328,13 +328,13 @@ eap_payload_t *eap_payload_create_code(eap_code_t code)
 /*
  * Described in header
  */
-eap_payload_t *eap_payload_create_nak()
+eap_payload_t *eap_payload_create_nak(u_int8_t identifier)
 {
 	eap_payload_t *this = eap_payload_create();
 	chunk_t data = chunk_alloca(5);
 	
 	*(data.ptr + 0) = EAP_RESPONSE;
-	*(data.ptr + 1) = 0;
+	*(data.ptr + 1) = identifier;
 	*(u_int16_t*)(data.ptr + 2) = htons(data.len);
 	*(data.ptr + 4) = EAP_NAK;
 	
diff --git a/src/charon/encoding/payloads/eap_payload.h b/src/charon/encoding/payloads/eap_payload.h
index 3addbb838..e4f8663c2 100644
--- a/src/charon/encoding/payloads/eap_payload.h
+++ b/src/charon/encoding/payloads/eap_payload.h
@@ -132,19 +132,22 @@ eap_payload_t *eap_payload_create_data(chunk_t data);
  * Could should be either EAP_SUCCESS/EAP_FAILURE, use 
  * constructor above otherwise.
  *
- * @return eap_payload_t object
+ * @param code			EAP status code
+ * @param identifier	EAP identifier to use in payload
+ * @return 				eap_payload_t object
  *
  * @ingroup payloads
  */
-eap_payload_t *eap_payload_create_code(eap_code_t code);
+eap_payload_t *eap_payload_create_code(eap_code_t code, u_int8_t identifier);
 
 /**
  * @brief Creates an eap_payload_t EAP_RESPONSE containing an EAP_NAK.
  *
- * @return eap_payload_t object
+ * @param identifier	EAP identifier to use in payload
+ * @return 				eap_payload_t object
  *
  * @ingroup payloads
  */
-eap_payload_t *eap_payload_create_nak();
+eap_payload_t *eap_payload_create_nak(u_int8_t identifier);
 
 #endif /* EAP_PAYLOAD_H_ */
diff --git a/src/charon/encoding/payloads/id_payload.c b/src/charon/encoding/payloads/id_payload.c
index eee5e92db..aef8f6b7e 100644
--- a/src/charon/encoding/payloads/id_payload.c
+++ b/src/charon/encoding/payloads/id_payload.c
@@ -9,6 +9,7 @@
  * Copyright (C) 2007 Tobias Brunner
  * Copyright (C) 2005-2006 Martin Willi
  * Copyright (C) 2005 Jan Hutter
+ *
  * Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -49,7 +50,7 @@ struct private_id_payload_t {
 	/**
 	 * Next payload type.
 	 */
-	payload_type_t next_payload;
+	u_int8_t next_payload;
 
 	/**
 	 * Critical flag.