Attributes and definitions fo channel bindings

diff --git a/share/dictionary.freeradius.internal b/share/dictionary.freeradius.internal
index c1e09a8..48f507a 100644 (file)
--- a/share/dictionary.freeradius.internal
+++ b/share/dictionary.freeradius.internal
@@ -241,6 +241,12 @@ VALUE      Cache-Read-Only                 yes                     1
 
 ATTRIBUTE      OTP-Challenge                           1145    string
 ATTRIBUTE      EAP-Session-Id                          1146    octets
+ATTRIBUTE      Chbind-Response-Code                    1147    integer
+
+ATTRIBUTE      Chbind-Response-Code                    1147    integer
+
+VALUE  Chbind-Response-Code            success                 2
+VALUE  Chbind-Response-Code            failure                 3
 
 ATTRIBUTE      Acct-Input-Octets64                     1148    integer64
 ATTRIBUTE      Acct-Output-Octets64                    1149    integer64

diff --git a/share/dictionary.ukerna b/share/dictionary.ukerna
index c390b5b..89268dd 100644 (file)
--- a/share/dictionary.ukerna
+++ b/share/dictionary.ukerna
@@ -10,6 +10,11 @@ VENDOR               UKERNA                          25622
 
 BEGIN-VENDOR   UKERNA
 
-ATTRIBUTE      SAML-AAA-Assertion                      132     string
+ATTRIBUTE      UKERNA-GSS-Acceptor-Service-Name        128     string
+ATTRIBUTE      UKERNA-GSS-Acceptor-Host-Name           129     string
+ATTRIBUTE      UKERNA-GSS-Acceptor-Service-Specific    130     string
+ATTRIBUTE      Ukerna-GSS-Acceptor-Realm-Name          131     string
+ATTRIBUTE      SAML-AAA-Assertion              132     string
+ATTRIBUTE      EAP-Channel-Binding-Message     135     octets
 
 END-VENDOR UKERNA

diff --git a/src/include/radius.h b/src/include/radius.h
index 9d6cd89..eaf2cc2 100644 (file)
--- a/src/include/radius.h
+++ b/src/include/radius.h
@@ -228,6 +228,7 @@ typedef enum {
 #define VENDORPEC_MICROSOFT            311
 #define VENDORPEC_FREERADIUS           11344
 #define VENDORPEC_WIMAX                        24757
+#define VENDORPEC_UKERNA               25622
 
 /*
  * Vendor specific attributes
@@ -271,3 +272,9 @@ typedef enum {
 #define PW_VQP_MAC                     0x2c06
 #define PW_VQP_UNKNOWN                 0x2c07
 #define PW_VQP_COOKIE                  0x2c08
+
+/*
+ * JANET's code for transporting eap channel binding data over ttls
+ */
+
+#define PW_UKERNA_CHBIND               135