Updated version 5.6.0 from 'upstream/5.6.0'

with Debian dir e138a03837a338ec35cc53a33de19381770a5f0c

4 files changed, 7 insertions, 7 deletions

diff --git a/src/libcharon/encoding/generator.c b/src/libcharon/encoding/generator.c
index 41aacd4ed..dee1a3f73 100644
--- a/src/libcharon/encoding/generator.c
+++ b/src/libcharon/encoding/generator.c
@@ -86,7 +86,7 @@ struct private_generator_t {
 	uint8_t current_bit;
 
 	/**
-	 * Associated data struct to read informations from.
+	 * Associated data struct to read information from.
 	 */
 	void *data_struct;
 
diff --git a/src/libcharon/encoding/message.h b/src/libcharon/encoding/message.h
index 8c4372974..732fd9b54 100644
--- a/src/libcharon/encoding/message.h
+++ b/src/libcharon/encoding/message.h
@@ -312,7 +312,7 @@ struct message_t {
 	status_t (*add_fragment)(message_t *this, message_t *fragment);
 
 	/**
-	 * Gets the source host informations.
+	 * Gets the source host information.
 	 *
 	 * @warning Returned host_t object is not getting cloned,
 	 * do not destroy nor modify.
@@ -322,7 +322,7 @@ struct message_t {
 	host_t * (*get_source) (message_t *this);
 
 	/**
-	 * Sets the source host informations.
+	 * Sets the source host information.
 	 *
 	 * @warning host_t object is not getting cloned and gets destroyed by
 	 *			message_t.destroy or next call of message_t.set_source.
@@ -332,7 +332,7 @@ struct message_t {
 	void (*set_source) (message_t *this, host_t *host);
 
 	/**
-	 * Gets the destination host informations.
+	 * Gets the destination host information.
 	 *
 	 * @warning Returned host_t object is not getting cloned,
 	 * do not destroy nor modify.
@@ -342,7 +342,7 @@ struct message_t {
 	host_t * (*get_destination) (message_t *this);
 
 	/**
-	 * Sets the destination host informations.
+	 * Sets the destination host information.
 	 *
 	 * @warning host_t object is not getting cloned and gets destroyed by
 	 *			message_t.destroy or next call of message_t.set_destination.
diff --git a/src/libcharon/encoding/payloads/encodings.h b/src/libcharon/encoding/payloads/encodings.h
index 442bf7489..9ff23753a 100644
--- a/src/libcharon/encoding/payloads/encodings.h
+++ b/src/libcharon/encoding/payloads/encodings.h
@@ -37,7 +37,7 @@ typedef struct encoding_rule_t encoding_rule_t;
  * Header is parsed like a payload and gets its one payload_id
  * from PRIVATE USE space. Also the substructures
  * of specific payload types get their own payload_id
- * from PRIVATE_USE space. See IKEv2-Draft for more informations.
+ * from PRIVATE_USE space. See IKEv2-Draft for more information.
  */
 enum encoding_type_t {
 
diff --git a/src/libcharon/encoding/payloads/proposal_substructure.c b/src/libcharon/encoding/payloads/proposal_substructure.c
index 55641e145..c3f06391a 100644
--- a/src/libcharon/encoding/payloads/proposal_substructure.c
+++ b/src/libcharon/encoding/payloads/proposal_substructure.c
@@ -1360,10 +1360,10 @@ static void set_from_proposal_v1(private_proposal_substructure_t *this,
 	enumerator = proposal->create_enumerator(proposal, INTEGRITY_ALGORITHM);
 	if (enumerator->enumerate(enumerator, &alg, &key_size))
 	{
+		transid = get_ikev1_transid_from_alg(INTEGRITY_ALGORITHM, alg);
 		alg = get_ikev1_auth_from_alg(alg);
 		if (alg)
 		{
-			transid = get_ikev1_transid_from_alg(INTEGRITY_ALGORITHM, alg);
 			if (!transform && transid)
 			{
 				transform = transform_substructure_create_type(