added IKEv2 Generic Secure Password Authentication Method

diff --git a/src/libcharon/sa/authenticators/authenticator.c b/src/libcharon/sa/authenticators/authenticator.c
index 83f5fbaad55ce5eb7908c3d45b5689dad65bc7ae..9ffe661ccac9dbf47619ed4d7034903d963fc1e7 100644 (file)
--- a/src/libcharon/sa/authenticators/authenticator.c
+++ b/src/libcharon/sa/authenticators/authenticator.c
@@ -28,11 +28,12 @@ ENUM_BEGIN(auth_method_names, AUTH_RSA, AUTH_DSS,
        "RSA signature",
        "pre-shared key",
        "DSS signature");
-ENUM_NEXT(auth_method_names, AUTH_ECDSA_256, AUTH_ECDSA_521, AUTH_DSS,
+ENUM_NEXT(auth_method_names, AUTH_ECDSA_256, AUTH_GSPM, AUTH_DSS,
        "ECDSA-256 signature",
        "ECDSA-384 signature",
-       "ECDSA-521 signature");
-ENUM_END(auth_method_names, AUTH_ECDSA_521);
+       "ECDSA-521 signature",
+       "secure password method");
+ENUM_END(auth_method_names, AUTH_GSPM);
 
 /**
  * Described in header.

diff --git a/src/libcharon/sa/authenticators/authenticator.h b/src/libcharon/sa/authenticators/authenticator.h
index d27e006a36e16583bdee6f428e6e8e4d064d8981..5042e4a732d5350c6f57367d9b33c6de0014cab1 100644 (file)
--- a/src/libcharon/sa/authenticators/authenticator.h
+++ b/src/libcharon/sa/authenticators/authenticator.h
@@ -67,6 +67,12 @@ enum auth_method_t {
         * ECDSA with SHA-512 on the P-521 curve as specified in RFC 4754
         */
        AUTH_ECDSA_521 = 11,
+
+       /**
+        * Generic Secure Password Authentication Method as specified in RFC 6467
+        */
+       AUTH_GSPM = 12,
+
 };
 
 /**