From: Martin Willi <martin@revosec.ch>
Date: Fri, 18 Nov 2011 08:16:54 +0000 (+0100)
Subject: Re-enable static inclusion of PSK auth method into IKEv1 proposal
X-Git-Tag: 5.0.0~338^2~9^2~477
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72b3146092fdf426a13fbc50f10b2cfab5ecd9c4;p=thirdparty%2Fstrongswan.git

Re-enable static inclusion of PSK auth method into IKEv1 proposal
---

diff --git a/src/libcharon/encoding/payloads/proposal_substructure.c b/src/libcharon/encoding/payloads/proposal_substructure.c
index 20f4e223d0..aa3f0674f1 100644
--- a/src/libcharon/encoding/payloads/proposal_substructure.c
+++ b/src/libcharon/encoding/payloads/proposal_substructure.c
@@ -780,10 +780,10 @@ static void set_from_proposal_v1_ike(private_proposal_substructure_t *this,
 	}
 	enumerator->destroy(enumerator);
 
-	/* TODO-IKEv1: Add lifetime, non-fixed auth-method and other attributes
+	/* TODO-IKEv1: Add lifetime, non-fixed auth-method and other attributes */
 	transform->add_transform_attribute(transform,
 		transform_attribute_create_value(TRANSFORM_ATTRIBUTE_V1,
-							TATTR_PH1_AUTH_METHOD, IKEV1_AUTH_PSK));*/
+							TATTR_PH1_AUTH_METHOD, IKEV1_AUTH_PSK));
 
 	add_transform_substructure(this, transform);
 }