From: Martin Willi <martin@revosec.ch>
Date: Thu, 14 Jun 2012 14:08:28 +0000 (+0200)
Subject: Map XAuth responder authentication methods between IKEv1 and IKEv2
X-Git-Tag: 5.0.0~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9aa75b90e638b49825cb612dc21f5d4600c4141;p=thirdparty%2Fstrongswan.git

Map XAuth responder authentication methods between IKEv1 and IKEv2
---

diff --git a/src/libcharon/encoding/payloads/proposal_substructure.c b/src/libcharon/encoding/payloads/proposal_substructure.c
index afeeb09e35..653f51a460 100644
--- a/src/libcharon/encoding/payloads/proposal_substructure.c
+++ b/src/libcharon/encoding/payloads/proposal_substructure.c
@@ -785,10 +785,16 @@ static u_int16_t get_ikev1_auth(auth_method_t method)
 			return IKEV1_AUTH_DSS_SIG;
 		case AUTH_XAUTH_INIT_PSK:
 			return IKEV1_AUTH_XAUTH_INIT_PSK;
+		case AUTH_XAUTH_RESP_PSK:
+			return IKEV1_AUTH_XAUTH_RESP_PSK;
 		case AUTH_XAUTH_INIT_RSA:
 			return IKEV1_AUTH_XAUTH_INIT_RSA;
+		case AUTH_XAUTH_RESP_RSA:
+			return IKEV1_AUTH_XAUTH_RESP_RSA;
 		case AUTH_HYBRID_INIT_RSA:
 			return IKEV1_AUTH_HYBRID_INIT_RSA;
+		case AUTH_HYBRID_RESP_RSA:
+			return IKEV1_AUTH_HYBRID_RESP_RSA;
 		case AUTH_ECDSA_256:
 			return IKEV1_AUTH_ECDSA_256;
 		case AUTH_ECDSA_384:
@@ -1087,10 +1093,16 @@ METHOD(proposal_substructure_t, get_auth_method, auth_method_t,
 			return AUTH_DSS;
 		case IKEV1_AUTH_XAUTH_INIT_PSK:
 			return AUTH_XAUTH_INIT_PSK;
+		case IKEV1_AUTH_XAUTH_RESP_PSK:
+			return AUTH_XAUTH_RESP_PSK;
 		case IKEV1_AUTH_XAUTH_INIT_RSA:
 			return AUTH_XAUTH_INIT_RSA;
+		case IKEV1_AUTH_XAUTH_RESP_RSA:
+			return AUTH_XAUTH_RESP_RSA;
 		case IKEV1_AUTH_HYBRID_INIT_RSA:
 			return AUTH_HYBRID_INIT_RSA;
+		case IKEV1_AUTH_HYBRID_RESP_RSA:
+			return AUTH_HYBRID_RESP_RSA;
 		case IKEV1_AUTH_ECDSA_256:
 			return AUTH_ECDSA_256;
 		case IKEV1_AUTH_ECDSA_384:
@@ -1564,4 +1576,4 @@ proposal_substructure_t *proposal_substructure_create_for_ipcomp_v1(
 	compute_length(this);
 
 	return &this->public;
-}
\ No newline at end of file
+}