ikev2: Add new authentication method defined by RFC 7427

diff --git a/src/libcharon/sa/authenticator.c b/src/libcharon/sa/authenticator.c
index a3d67ed7afb61f5520da757a6ba089df42180dec..c6cf04869af1ead57f0a52ff3e75852e28e4c452 100644 (file)
--- a/src/libcharon/sa/authenticator.c
+++ b/src/libcharon/sa/authenticator.c
@@ -31,13 +31,14 @@ 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_NULL, AUTH_DSS,
+ENUM_NEXT(auth_method_names, AUTH_ECDSA_256, AUTH_DS, AUTH_DSS,
        "ECDSA-256 signature",
        "ECDSA-384 signature",
        "ECDSA-521 signature",
        "secure password method",
-       "NULL authentication");
-ENUM_NEXT(auth_method_names, AUTH_BLISS, AUTH_BLISS, AUTH_NULL,
+       "NULL authentication",
+       "digital signature");
+ENUM_NEXT(auth_method_names, AUTH_BLISS, AUTH_BLISS, AUTH_DS,
        "BLISS signature");
 ENUM_NEXT(auth_method_names, AUTH_XAUTH_INIT_PSK, AUTH_HYBRID_RESP_RSA, AUTH_BLISS,
        "XAuthInitPSK",

diff --git a/src/libcharon/sa/authenticator.h b/src/libcharon/sa/authenticator.h
index aefb942941e6170e15de5ecb27014287d48d647f..33a007666e633729ed9f6e867c0586084cf0d7dd 100644 (file)
--- a/src/libcharon/sa/authenticator.h
+++ b/src/libcharon/sa/authenticator.h
@@ -84,6 +84,11 @@ enum auth_method_t {
         */
        AUTH_NULL = 13,
 
+       /**
+        * Digital Signature as specified in RFC 7427
+        */
+       AUTH_DS = 14,
+
        /**
         * BLISS Authentication Method
         */