Add EAP-IKEv2 attributes to the dictionary

diff --git a/share/dictionary.freeradius.internal b/share/dictionary.freeradius.internal
index c02018a..80bb435 100644 (file)
--- a/share/dictionary.freeradius.internal
+++ b/share/dictionary.freeradius.internal
@@ -63,7 +63,7 @@ ATTRIBUTE     Client-Shortname                        1024    string
 ATTRIBUTE      Load-Balance-Key                        1025    string
 
 #
-#      Range:  1024-1026
+#      Range:  1025-1026
 #              unused
 #
 ATTRIBUTE      TNC-VLAN-Access                         1027    string
@@ -138,6 +138,28 @@ ATTRIBUTE  Password-With-Header                    1101    string
 ATTRIBUTE      Inner-Tunnel-User-Name                  1102    string
 
 #
+#      EAP-IKEv2 is experimental.
+#
+ATTRIBUTE      EAP-IKEv2-IDType                        1103    integer
+
+VALUE  EAP-IKEv2-IDType                IPV4_ADDR               1
+VALUE  EAP-IKEv2-IDType                FQDN                    2
+VALUE  EAP-IKEv2-IDType                RFC822_ADDR             3
+VALUE  EAP-IKEv2-IDType                IPV6_ADDR               5
+VALUE  EAP-IKEv2-IDType                DER_ASN1_DN             9
+VALUE  EAP-IKEv2-IDType                DER_ASN1_GN             10
+VALUE  EAP-IKEv2-IDType                KEY_ID                  11
+
+ATTRIBUTE      EAP-IKEv2-ID                            1104    string
+ATTRIBUTE      EAP-IKEv2-Secret                        1105    string
+ATTRIBUTE      EAP-IKEv2-AuthType                      1106    string
+
+VALUE  EAP-IKEv2-AuthType              none                    0
+VALUE  EAP-IKEv2-AuthType              secret                  1
+VALUE  EAP-IKEv2-AuthType              cert                    2
+VALUE  EAP-IKEv2-AuthType              both                    3
+
+#
 #      Range:  1200-1279
 #              EAP-SIM (and other EAP type) weirdness.
 #
@@ -323,8 +345,8 @@ VALUE       Post-Auth-Type                  Local                   0
 VALUE  Fall-Through                    No                      0
 VALUE  Fall-Through                    Yes                     1
 
-VALUE          Strip-User-Name         No                      0
-VALUE          Strip-User-Name         Yes                     1
+VALUE  Strip-User-Name                 No                      0
+VALUE  Strip-User-Name                 Yes                     1
 
 VALUE  Packet-Type                     Access-Request          1
 VALUE  Packet-Type                     Access-Accept           2

diff --git a/src/modules/rlm_eap/types/rlm_eap_ikev2/ike_conf.h b/src/modules/rlm_eap/types/rlm_eap_ikev2/ike_conf.h
index 4abab6b..09b160a 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_ikev2/ike_conf.h
+++ b/src/modules/rlm_eap/types/rlm_eap_ikev2/ike_conf.h
@@ -31,10 +31,10 @@
 #include <EAPIKEv2/connector.h>
 #include "eap.h"
 
-#define RAD_EAP_IKEV2_IDTYPE           1900
-#define RAD_EAP_IKEV2_ID               1901
-#define RAD_EAP_IKEV2_SECRET           1902
-#define RAD_EAP_IKEV2_AUTHTYPE                 1903
+#define RAD_EAP_IKEV2_IDTYPE           1103
+#define RAD_EAP_IKEV2_ID               1104
+#define RAD_EAP_IKEV2_SECRET           1105
+#define RAD_EAP_IKEV2_AUTHTYPE                 1106
 
 
 int rad_load_proposals(ikev2_ctx *i2,CONF_SECTION *cf);