aboutsummaryrefslogtreecommitdiffstats
path: root/src/libcharon/encoding/payloads/proposal_substructure.c
diff options
context:
space:
mode:
authorMartin Willi <martin@revosec.ch>2011-11-24 16:07:13 +0100
committerMartin Willi <martin@revosec.ch>2012-03-20 17:30:53 +0100
commitb4e815354c5b225e718dca4beb59656fdac98875 (patch)
tree5cf4fe95a2552e1716fac929b935fa31c6f2ab15 /src/libcharon/encoding/payloads/proposal_substructure.c
parenteeca2af81c22e04532585d0dd2a5284bd83d8f5c (diff)
downloadstrongswan-b4e815354c5b225e718dca4beb59656fdac98875.tar.bz2
strongswan-b4e815354c5b225e718dca4beb59656fdac98875.tar.xz
Map auth_class to auth method and IKEv1 proposal attribute
Diffstat (limited to 'src/libcharon/encoding/payloads/proposal_substructure.c')
-rw-r--r--src/libcharon/encoding/payloads/proposal_substructure.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/libcharon/encoding/payloads/proposal_substructure.c b/src/libcharon/encoding/payloads/proposal_substructure.c
index ca19ba700..7f075f103 100644
--- a/src/libcharon/encoding/payloads/proposal_substructure.c
+++ b/src/libcharon/encoding/payloads/proposal_substructure.c
@@ -583,8 +583,12 @@ static u_int16_t get_ikev1_auth(auth_method_t method)
return IKEV1_AUTH_RSA_SIG;
case AUTH_DSS:
return IKEV1_AUTH_DSS_SIG;
+ case AUTH_XAUTH_INIT_PSK:
+ return IKEV1_AUTH_XAUTH_INIT_PSK;
+ case AUTH_XAUTH_INIT_RSA:
+ return IKEV1_AUTH_XAUTH_INIT_RSA;
default:
- /* TODO-IKEv1: Handle XAUTH methods */
+ /* TODO-IKEv1: Handle other XAUTH methods */
/* TODO-IKEv1: Handle ECDSA methods */
case AUTH_PSK:
return IKEV1_AUTH_PSK;
@@ -877,8 +881,12 @@ METHOD(proposal_substructure_t, get_auth_method, auth_method_t,
return AUTH_RSA;
case IKEV1_AUTH_DSS_SIG:
return AUTH_DSS;
+ case IKEV1_AUTH_XAUTH_INIT_PSK:
+ return AUTH_XAUTH_INIT_PSK;
+ case IKEV1_AUTH_XAUTH_INIT_RSA:
+ return AUTH_XAUTH_INIT_RSA;
default:
- /* TODO-IKEv1: XAUTH, ECDSA sigs */
+ /* TODO-IKEv1: other XAUTH, ECDSA sigs */
return AUTH_NONE;
}
}