From: Tobias Brunner <tobias@strongswan.org>
Date: Mon, 23 Feb 2015 12:48:34 +0000 (+0100)
Subject: ikev2: Add new authentication method defined by RFC 7427
X-Git-Tag: 5.3.0dr1~39^2~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cd8371da28df9b62a0cb57eda068a74a6ce4deb;p=thirdparty%2Fstrongswan.git

ikev2: Add new authentication method defined by RFC 7427
---

diff --git a/src/libcharon/sa/authenticator.c b/src/libcharon/sa/authenticator.c
index a3d67ed7af..c6cf04869a 100644
--- 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 aefb942941..33a007666e 100644
--- 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
 	 */