update for new names

diff --git a/raddb/mods-config/attr_filter/access_reject b/raddb/mods-config/attr_filter/access_reject
index 50414d04f6532bdaef99fb64ec0f1fca0de7c7de..7969fb4bc327b90434711c6053982e8e2da435b5 100644 (file)
--- a/raddb/mods-config/attr_filter/access_reject
+++ b/raddb/mods-config/attr_filter/access_reject
@@ -14,6 +14,6 @@ DEFAULT
        Message-Authenticator =* ANY,
        Error-Cause =* ANY,
        Reply-Message =* ANY,
-       MS-CHAP-Error =* ANY,
+       Vendor-Specific.Microsoft.CHAP-Error =* ANY,
        Proxy-State =* ANY,
        Error-Cause =* ANY

diff --git a/raddb/mods-config/attr_filter/post-proxy b/raddb/mods-config/attr_filter/post-proxy
index 21a3af9c7ad97563b372d445bee2b37d564448fe..df43e1804c173cb03ddd173ba2dedbbf4409b5bc 100644 (file)
--- a/raddb/mods-config/attr_filter/post-proxy
+++ b/raddb/mods-config/attr_filter/post-proxy
@@ -118,9 +118,9 @@ DEFAULT
        Proxy-State =* ANY,
        EAP-Message =* ANY,
        Message-Authenticator =* ANY,
-       MS-MPPE-Recv-Key =* ANY,
-       MS-MPPE-Send-Key =* ANY,
-       MS-CHAP-MPPE-Keys =* ANY,
+       Vendor-Specific.Microsoft.MPPE-Recv-Key =* ANY,
+       Vendor-Specific.Microsoft.MPPE-Send-Key =* ANY,
+       Vendor-Specific.Microsoft.CHAP-MPPE-Keys =* ANY,
        State =* ANY,
        Session-Timeout <= 28800,
        Idle-Timeout <= 600,

diff --git a/raddb/mods-config/attr_filter/pre-proxy b/raddb/mods-config/attr_filter/pre-proxy
index 11e0ee8f1cf7731998f77280bc676abe5ad2b210..1ee5bf1f2998d36209cc101f0e5a0464607f120b 100644 (file)
--- a/raddb/mods-config/attr_filter/pre-proxy
+++ b/raddb/mods-config/attr_filter/pre-proxy
@@ -52,8 +52,8 @@ DEFAULT
        User-Password =* ANY,
        CHAP-Password =* ANY,
        CHAP-Challenge =* ANY,
-       MS-CHAP-Challenge =* ANY,
-       MS-CHAP-Response =* ANY,
+       Vendor-Specific.Microsoft.CHAP-Challenge =* ANY,
+       Vendor-Specific.Microsoft.CHAP-Response =* ANY,
        EAP-Message =* ANY,
        Message-Authenticator =* ANY,
        State =* ANY,

diff --git a/share/dictionary/radius/dictionary.freeradius b/share/dictionary/radius/dictionary.freeradius
index d828beea7f4a52ab693736359ce137f4c03c2efa..9c4d990cfb2dc9cb15d85dfa23d0f31472ae4bba 100644 (file)
--- a/share/dictionary/radius/dictionary.freeradius
+++ b/share/dictionary/radius/dictionary.freeradius
@@ -22,7 +22,7 @@ ATTRIBUTE     Session-Start-Time              2       date
 #
 #  FreeRADIUS v4 produces statistics in its own TLV
 #
-ATTRIBUTE      Stats4-TLV                      15      tlv
+ATTRIBUTE      Stats4                          15      tlv
 ATTRIBUTE      Stats4-Type                     .1      integer
 
 VALUE  Stats4-Type             Global                  1
@@ -30,7 +30,7 @@ VALUE Stats4-Type             Client                  2
 VALUE  Stats4-Type             Listener                3
 
 ATTRIBUTE      Stats4-Name                     .2      string
-ATTRIBUTE      Stats4-Number           .3      string
+ATTRIBUTE      Stats4-Number                   .3      string
 ATTRIBUTE      Stats4-IPv4-Address             .4      ipaddr
 ATTRIBUTE      Stats4-IPv6-Address             .5      ipv6addr
 ATTRIBUTE      Stats4-Port                     .6      integer

diff --git a/share/dictionary/snmp/dictionary.freeradius b/share/dictionary/snmp/dictionary.freeradius
index 1e0967852ab3e29a1962de75fbbea5546139aef2..cf9b3a9843c4a8e196455b894a6753df27e8f665 100644 (file)
--- a/share/dictionary/snmp/dictionary.freeradius
+++ b/share/dictionary/snmp/dictionary.freeradius
@@ -50,10 +50,10 @@ ATTRIBUTE   FreeRADIUS-Mib-2                        .3.6.1.2.1      tlv
 #
 BEGIN-TLV      FreeRADIUS-Mib-2
 ATTRIBUTE      Radius-Mib                              67      tlv
-ATTRIBUTE      Radius-Authentication                   .1      tlv
-ATTRIBUTE      Radius-Auth-Serv-Mib                    .1.1    tlv
-ATTRIBUTE      Radius-Auth-Serv-Mib-Objects            .1.1.1  tlv
-ATTRIBUTE      Radius-Auth-Serv                        .1.1.1.1        tlv
+ATTRIBUTE      Radius-Authentication                   67.1    tlv
+ATTRIBUTE      Radius-Auth-Serv-Mib                    67.1.1  tlv
+ATTRIBUTE      Radius-Auth-Serv-Mib-Objects            67.1.1.1        tlv
+ATTRIBUTE      Radius-Auth-Serv                        67.1.1.1.1      tlv
 
 BEGIN-TLV      Radius-Auth-Serv
 ATTRIBUTE      Radius-Auth-Serv-Ident                  1       string
@@ -116,7 +116,7 @@ ATTRIBUTE   Radius-Auth-Serv-Ext-Bad-Authenticators 11      integer
 ATTRIBUTE      Radius-Auth-Serv-Ext-Packet-Dropped     12      integer
 ATTRIBUTE      Radius-Auth-Serv-Ext-Unknown-Types      13      integer
 ATTRIBUTE      Radius-Auth-Serv-Counter-Discontinuity  14      integer
-END-TLV                Radius-Auth-Client-Ext-Entry
+END-TLV                16.Radius-Auth-Client-Ext-Entry
 
-END-TLV                Radius-Auth-Serv
-END-TLV                FreeRADIUS-Mib-2
+END-TLV                67.1.1.1.Radius-Auth-Serv
+END-TLV                1.3.6.1.2.FreeRADIUS-Mib-2

diff --git a/src/bin/radtest.in b/src/bin/radtest.in
index cfa69f1a8495dc81ae114d7d06f179d0a1deecf5..11e929147ac599191edea3a9aac62a2dcb17f2de 100644 (file)
--- a/src/bin/radtest.in
+++ b/src/bin/radtest.in
@@ -75,7 +75,7 @@ do
                                PASSWORD="CHAP-Password"
                                ;;
                        mschap)
-                               PASSWORD="MS-CHAP-Password"
+                               PASSWORD="Vendor-Specific.Microsoft.CHAP-Password"
                                ;;
                        *)
                                usage

diff --git a/src/tests/auth/digest.attrs b/src/tests/auth/digest.attrs
index 9d2c4b6b7b96fd1fddde2e59b0fa844241b7289e..ac5575a6b2ca6e4a8c3e6dc85278ea8d3e914b0c 100644 (file)
--- a/src/tests/auth/digest.attrs
+++ b/src/tests/auth/digest.attrs
@@ -10,16 +10,16 @@
 #
 User-Name = "bob",
 Digest-Response = "bdbeebb2da6adb6bca02599c2239e192"
-Digest-Realm = "biloxi.com",
-Digest-Nonce = "dcd98b7102dd2f0e8b11d0f600bfb0c093",
-Digest-Method = "INVITE",
-Digest-URI = "sip:bob@biloxi.com",
-Digest-Algorithm = "MD5",
-Digest-User-Name = "bob",
-Digest-QOP = "auth-int",
-Digest-Nonce-Count = "00000001",
-Digest-CNonce = "0a4f113b",
-Digest-Body-Digest = "c1ed018b8ec4a3b170c0921f5b564e48",
+Digest-Attributes.Realm = "biloxi.com",
+Digest-Attributes.Nonce = "dcd98b7102dd2f0e8b11d0f600bfb0c093",
+Digest-Attributes.Method = "INVITE",
+Digest-Attributes.URI = "sip:bob@biloxi.com",
+Digest-Attributes.Algorithm = "MD5",
+Digest-Attributes.User-Name = "bob",
+Digest-Attributes.QOP = "auth-int",
+Digest-Attributes.Nonce-Count = "00000001",
+Digest-Attributes.CNonce = "0a4f113b",
+Digest-Attributes.Body-Digest = "c1ed018b8ec4a3b170c0921f5b564e48",
 Message-Authenticator = ""
 
 Packet-Type == Access-Accept

diff --git a/src/tests/auth/wimax.attrs b/src/tests/auth/wimax.attrs
index 2d3f9fd78b3993b6e871098baa1c9e16dd448515..28985bcd78ef2b559995f9e19e0d23b11292d581 100644 (file)
--- a/src/tests/auth/wimax.attrs
+++ b/src/tests/auth/wimax.attrs
@@ -5,21 +5,21 @@
 #
 User-Name = "bob"
 User-Password = "hello"
-WiMAX-GMT-Timezone-offset = -1
-WiMAX-AAA-Session-Id = 0x01020304
-WiMAX-hHA-IP-MIP4 = 192.0.2.1
+Vendor-Specific.WiMAX.GMT-Timezone-offset = -1
+Vendor-Specific.WiMAX.AAA-Session-Id = 0x01020304
+Vendor-Specific.WiMAX.hHA-IP-MIP4 = 192.0.2.1
 #
 #  Automatically encoded capability
 #
-WiMAX-Accounting-Capabilities = 2
-WiMAX-Release = "1.0"
-WiMAX-Packet-Data-Flow-Id = 1
+Vendor-Specific.WiMAX.Capability.Accounting-Capabilities = 2
+Vendor-Specific.WiMAX.Capability.Release = "1.0"
+Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Packet-Data-Flow-Id = 1
 #
 #  Long string
 #
-WiMAX-Hotline-Indicator = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxaaaaaaaaaabbbbbbbbbbcccccccccc123"
-WiMAX-Service-Data-Flow-Id = 2
-WiMAX-hHA-IP-MIP4 = 192.0.2.2
+Vendor-Specific.WiMAX.Hotline-Indicator = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxaaaaaaaaaabbbbbbbbbbcccccccccc123"
+Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Data-Flow-Id = 2
+Vendor-Specific.WiMAX.hHA-IP-MIP4 = 192.0.2.2
 
 # and the response
 Packet-Type == Access-Accept

diff --git a/src/tests/digest/all.mk b/src/tests/digest/all.mk
index 95437dc4853cf0ac8efbde0d96ea062c378d5fe9..e51c1ef5bd0588de423219277b49b73138ef254d 100644 (file)
--- a/src/tests/digest/all.mk
+++ b/src/tests/digest/all.mk
@@ -33,8 +33,8 @@ $(OUTPUT)/%: $(DIR)/% | $(TEST).radiusd_kill $(TEST).radiusd_start
        ${Q}for _num in $$(sed '/^#.*TESTS/!d; s/.*TESTS//g' $<); do    \
                echo "DIGEST-TEST $(TARGET)_$${_num}";                  \
                cp -f $< $@.request;                                    \
-               echo "Test-Name = \"$(TARGET)\"" >> $@.request;         \
-               echo "Test-Number = \"$${_num}\"" >> $@.request;        \
+               echo "Vendor-Specific.Test.Test-Name = \"$(TARGET)\"" >> $@.request;            \
+               echo "Vendor-Specific.Test.Test-Number = \"$${_num}\"" >> $@.request;   \
                if ! $(TEST_BIN)/radclient -f $@.request -xF -d src/tests/digest/config -D share/dictionary 127.0.0.1:$(PORT) auth $(SECRET) > $@.out; then \
                        echo "FAILED";                                  \
                        cat $@.out;                                     \

diff --git a/src/tests/digest/auth-MD5.txt b/src/tests/digest/auth-MD5.txt
index 2831482fea9b345cbba556eedfdea0652d662934..c9352377fd16c18777dcbe701630b0438f55f560 100644 (file)
--- a/src/tests/digest/auth-MD5.txt
+++ b/src/tests/digest/auth-MD5.txt
@@ -4,10 +4,10 @@
 #  Section 3.3
 #
 #
-#  In the "users" file: 
+#  In the "users" file:
 #
 #       bob            Password.Cleartext := "zanzibar"
-#  Or  bob             Digest-HA1 := "12af60467a33e8518da5c68bbff12b11"
+#  Or  bob             Digest-Attributes.HA1 := "12af60467a33e8518da5c68bbff12b11"
 #
 #
 #
@@ -17,12 +17,12 @@
 #
 User-Name = "bob",
 Digest-Response = "89eb0059246c02b2f6ee02c7961d5ea3",
-Digest-Realm = "biloxi.com",
-Digest-Nonce = "dcd98b7102dd2f0e8b11d0f600bfb0c093",
-Digest-Method = "INVITE",
-Digest-URI = "sip:bob@biloxi.com",
-Digest-User-Name = "bob",
-Digest-QOP = "auth",
-Digest-Algorithm = "MD5",
-Digest-Nonce-Count = "00000001",
-Digest-CNonce = "0a4f113b",
+Digest-Attributes.Realm = "biloxi.com",
+Digest-Attributes.Nonce = "dcd98b7102dd2f0e8b11d0f600bfb0c093",
+Digest-Attributes.Method = "INVITE",
+Digest-Attributes.URI = "sip:bob@biloxi.com",
+Digest-Attributes.User-Name = "bob",
+Digest-Attributes.QOP = "auth",
+Digest-Attributes.Algorithm = "MD5",
+Digest-Attributes.Nonce-Count = "00000001",
+Digest-Attributes.CNonce = "0a4f113b",

diff --git a/src/tests/digest/auth-MD5_Sess.txt b/src/tests/digest/auth-MD5_Sess.txt
index 1c8d0ac453672ab40ce4732d366b2f183fcafd08..cd2670965e9eae96fb63cbc3de701af6ca3e956d 100644 (file)
--- a/src/tests/digest/auth-MD5_Sess.txt
+++ b/src/tests/digest/auth-MD5_Sess.txt
@@ -4,20 +4,20 @@
 #  3.4
 #
 #
-#  In the "users" file: 
+#  In the "users" file:
 #       bob            User-Password := "zanzibar"
-#  Or  bob             Digest-HA1 := "12af60467a33e8518da5c68bbff12b11"
+#  Or  bob             Digest-Attributes.HA1 := "12af60467a33e8518da5c68bbff12b11"
 #
 #      TESTS   1 2
 #
 User-Name = "bob",
 Digest-Response = "e4e4ea61d186d07a92c9e1f6919902e9",
-Digest-Realm = "biloxi.com",
-Digest-Nonce = "dcd98b7102dd2f0e8b11d0f600bfb0c093",
-Digest-Method = "INVITE",
-Digest-URI = "sip:bob@biloxi.com",
-Digest-User-Name = "bob",
-Digest-QOP = "auth",
-Digest-Algorithm = "MD5-Sess",
-Digest-Nonce-Count = "00000001",
-Digest-CNonce = "0a4f113b",
+Digest-Attributes.Realm = "biloxi.com",
+Digest-Attributes.Nonce = "dcd98b7102dd2f0e8b11d0f600bfb0c093",
+Digest-Attributes.Method = "INVITE",
+Digest-Attributes.URI = "sip:bob@biloxi.com",
+Digest-Attributes.User-Name = "bob",
+Digest-Attributes.QOP = "auth",
+Digest-Attributes.Algorithm = "MD5-Sess",
+Digest-Attributes.Nonce-Count = "00000001",
+Digest-Attributes.CNonce = "0a4f113b",

diff --git a/src/tests/digest/auth-int.txt b/src/tests/digest/auth-int.txt
index a76baa9bf229cf6cd4969aa38709522f6724256b..e301f99694e0491a0a095889f3144f8c5b17e0cc 100644 (file)
--- a/src/tests/digest/auth-int.txt
+++ b/src/tests/digest/auth-int.txt
@@ -10,14 +10,14 @@
 #
 User-Name = "bob",
 Digest-Response = "bdbeebb2da6adb6bca02599c2239e192"
-Digest-Realm = "biloxi.com",
-Digest-Nonce = "dcd98b7102dd2f0e8b11d0f600bfb0c093",
-Digest-Method = "INVITE",
-Digest-URI = "sip:bob@biloxi.com",
-Digest-Algorithm = "MD5",
-Digest-User-Name = "bob",
-Digest-QOP = "auth-int",
-Digest-Nonce-Count = "00000001",
-Digest-CNonce = "0a4f113b",
-Digest-Body-Digest = "c1ed018b8ec4a3b170c0921f5b564e48",
+Digest-Attributes.Realm = "biloxi.com",
+Digest-Attributes.Nonce = "dcd98b7102dd2f0e8b11d0f600bfb0c093",
+Digest-Attributes.Method = "INVITE",
+Digest-Attributes.URI = "sip:bob@biloxi.com",
+Digest-Attributes.Algorithm = "MD5",
+Digest-Attributes.User-Name = "bob",
+Digest-Attributes.QOP = "auth-int",
+Digest-Attributes.Nonce-Count = "00000001",
+Digest-Attributes.CNonce = "0a4f113b",
+Digest-Attributes.Body-Digest = "c1ed018b8ec4a3b170c0921f5b564e48",
 Message-Authenticator = ""

diff --git a/src/tests/digest/auth-noalgo.txt b/src/tests/digest/auth-noalgo.txt
index 1ab6ba60864cb658b042b357c448f87b3c730f73..7d3834bdd4420b45df643040a830a307dcdde690 100644 (file)
--- a/src/tests/digest/auth-noalgo.txt
+++ b/src/tests/digest/auth-noalgo.txt
@@ -3,19 +3,19 @@
 #
 #  3.2
 #
-#  In the "users" file: 
+#  In the "users" file:
 #       bob            User-Password := "zanzibar"
-#  Or  bob             Digest-HA1 := "12af60467a33e8518da5c68bbff12b11"
+#  Or  bob             Digest-Attributes.HA1 := "12af60467a33e8518da5c68bbff12b11"
 #
 #      TESTS   1
 #
 User-Name = "bob",
 Digest-Response = "89eb0059246c02b2f6ee02c7961d5ea3",
-Digest-Realm = "biloxi.com",
-Digest-Nonce = "dcd98b7102dd2f0e8b11d0f600bfb0c093",
-Digest-Method = "INVITE",
-Digest-URI = "sip:bob@biloxi.com",
-Digest-User-Name = "bob",
-Digest-QOP = "auth",
-Digest-Nonce-Count = "00000001",
-Digest-CNonce = "0a4f113b",
+Digest-Attributes.Realm = "biloxi.com",
+Digest-Attributes.Nonce = "dcd98b7102dd2f0e8b11d0f600bfb0c093",
+Digest-Attributes.Method = "INVITE",
+Digest-Attributes.URI = "sip:bob@biloxi.com",
+Digest-Attributes.User-Name = "bob",
+Digest-Attributes.QOP = "auth",
+Digest-Attributes.Nonce-Count = "00000001",
+Digest-Attributes.CNonce = "0a4f113b",

diff --git a/src/tests/digest/auth_int-MD5.txt b/src/tests/digest/auth_int-MD5.txt
index 30e1c48fecc7f359eb12f903a3d4edae42f1a652..5e77dd339da9eb34338d61e70b7581278036ee40 100644 (file)
--- a/src/tests/digest/auth_int-MD5.txt
+++ b/src/tests/digest/auth_int-MD5.txt
@@ -3,21 +3,21 @@
 #
 #  3.5.2
 #
-#  In the "users" file: 
+#  In the "users" file:
 #       bob            User-Password := "zanzibar"
-#  Or  bob             Digest-HA1 := "12af60467a33e8518da5c68bbff12b11"
+#  Or  bob             Digest-Attributes.HA1 := "12af60467a33e8518da5c68bbff12b11"
 #
 #      TESTS   1 2
 #
 User-Name = "bob",
 Digest-Response = "bdbeebb2da6adb6bca02599c2239e192"
-Digest-Realm = "biloxi.com",
-Digest-Nonce = "dcd98b7102dd2f0e8b11d0f600bfb0c093",
-Digest-Method = "INVITE",
-Digest-URI = "sip:bob@biloxi.com",
-Digest-Algorithm = "MD5",
-Digest-User-Name = "bob",
-Digest-QOP = "auth-int",
-Digest-Nonce-Count = "00000001",
-Digest-CNonce = "0a4f113b",
-Digest-Body-Digest = "c1ed018b8ec4a3b170c0921f5b564e48",
+Digest-Attributes.Realm = "biloxi.com",
+Digest-Attributes.Nonce = "dcd98b7102dd2f0e8b11d0f600bfb0c093",
+Digest-Attributes.Method = "INVITE",
+Digest-Attributes.URI = "sip:bob@biloxi.com",
+Digest-Attributes.Algorithm = "MD5",
+Digest-Attributes.User-Name = "bob",
+Digest-Attributes.QOP = "auth-int",
+Digest-Attributes.Nonce-Count = "00000001",
+Digest-Attributes.CNonce = "0a4f113b",
+Digest-Attributes.Body-Digest = "c1ed018b8ec4a3b170c0921f5b564e48",

diff --git a/src/tests/digest/auth_int-MD5_Sess.txt b/src/tests/digest/auth_int-MD5_Sess.txt
index 7665bc0ee7b8a6285971f70bfc701ee9c4ff0a73..dae2e39eace44ee76c7327636514c60e9c40926e 100644 (file)
--- a/src/tests/digest/auth_int-MD5_Sess.txt
+++ b/src/tests/digest/auth_int-MD5_Sess.txt
@@ -3,22 +3,22 @@
 ##
 #  3.6
 #
-#  In the "users" file: 
+#  In the "users" file:
 #       bob            User-Password := "zanzibar"
-#  Or  bob             Digest-HA1 := "12af60467a33e8518da5c68bbff12b11"
+#  Or  bob             Digest-Attributes.HA1 := "12af60467a33e8518da5c68bbff12b11"
 #
 #
 #      TESTS   1 2
 #
 User-Name = "bob",
 Digest-Response = "91984da2d8663716e91554859c22ca70",
-Digest-Realm = "biloxi.com",
-Digest-Nonce = "dcd98b7102dd2f0e8b11d0f600bfb0c093",
-Digest-Method = "INVITE",
-Digest-URI = "sip:bob@biloxi.com",
-Digest-User-Name = "bob",
-Digest-QOP = "auth-int",
-Digest-Algorithm = "MD5-Sess",
-Digest-Nonce-Count = "00000001",
-Digest-CNonce = "0a4f113b",
-Digest-Body-Digest = "c1ed018b8ec4a3b170c0921f5b564e48",
+Digest-Attributes.Realm = "biloxi.com",
+Digest-Attributes.Nonce = "dcd98b7102dd2f0e8b11d0f600bfb0c093",
+Digest-Attributes.Method = "INVITE",
+Digest-Attributes.URI = "sip:bob@biloxi.com",
+Digest-Attributes.User-Name = "bob",
+Digest-Attributes.QOP = "auth-int",
+Digest-Attributes.Algorithm = "MD5-Sess",
+Digest-Attributes.Nonce-Count = "00000001",
+Digest-Attributes.CNonce = "0a4f113b",
+Digest-Attributes.Body-Digest = "c1ed018b8ec4a3b170c0921f5b564e48",

diff --git a/src/tests/digest/auth_int-noalgo.txt b/src/tests/digest/auth_int-noalgo.txt
index 83675d84a656c698f72af0bdbc771b14c4c16010..d01e420e26da6efe15ecf62dd399d74e979206d5 100644 (file)
--- a/src/tests/digest/auth_int-noalgo.txt
+++ b/src/tests/digest/auth_int-noalgo.txt
@@ -3,20 +3,20 @@
 #
 #  3.5.2
 #
-#  In the "users" file: 
+#  In the "users" file:
 #       bob            User-Password := "zanzibar"
-#  Or  bob             Digest-HA1 := "12af60467a33e8518da5c68bbff12b11"
+#  Or  bob             Digest-Attributes.HA1 := "12af60467a33e8518da5c68bbff12b11"
 #
 #      TESTS   1 2
 #
 User-Name = "bob",
 Digest-Response = "bdbeebb2da6adb6bca02599c2239e192"
-Digest-Realm = "biloxi.com",
-Digest-Nonce = "dcd98b7102dd2f0e8b11d0f600bfb0c093",
-Digest-Method = "INVITE",
-Digest-URI = "sip:bob@biloxi.com",
-Digest-User-Name = "bob",
-Digest-QOP = "auth-int",
-Digest-Nonce-Count = "00000001",
-Digest-CNonce = "0a4f113b",
-Digest-Body-Digest = "c1ed018b8ec4a3b170c0921f5b564e48",
+Digest-Attributes.Realm = "biloxi.com",
+Digest-Attributes.Nonce = "dcd98b7102dd2f0e8b11d0f600bfb0c093",
+Digest-Attributes.Method = "INVITE",
+Digest-Attributes.URI = "sip:bob@biloxi.com",
+Digest-Attributes.User-Name = "bob",
+Digest-Attributes.QOP = "auth-int",
+Digest-Attributes.Nonce-Count = "00000001",
+Digest-Attributes.CNonce = "0a4f113b",
+Digest-Attributes.Body-Digest = "c1ed018b8ec4a3b170c0921f5b564e48",

diff --git a/src/tests/digest/config/digest.conf b/src/tests/digest/config/digest.conf
index 31a62be09ebbfdd37e73652cc0eecc26a6199330..b5aaf0c98f00c4d6343171f7774d6d410ccc4490 100644 (file)
--- a/src/tests/digest/config/digest.conf
+++ b/src/tests/digest/config/digest.conf
@@ -139,7 +139,7 @@ server test {
 
 recv Access-Request {
        update reply {
-               &Test-Server-Port = "%{Packet-Dst-Port}"
+               &Vendor-Specific.test.Test-Server-Port = "%{Packet-Dst-Port}"
        }
 
        if (&User-Name == "bob") {
@@ -148,14 +148,14 @@ recv Access-Request {
                #  Or, a hashed version thereof.
                #
                if (&Digest-Response) {
-                       if (&Test-Number == "1") {
+                       if (&Vendor-Specific.Test.Test-Number == "1") {
                                update control {
                                        &Password.Cleartext := "zanzibar"
                                }
                        }
-                       elsif (&Test-Number == "2") {
+                       elsif (&Vendor-Specific.Test.Test-Number == "2") {
                                update control {
-                                       &Digest-HA1 := 12af60467a33e8518da5c68bbff12b11
+                                       &Digest-Attributes.HA1 := 12af60467a33e8518da5c68bbff12b11
                                }
                        }
                }

diff --git a/src/tests/digest/md5-sess.txt b/src/tests/digest/md5-sess.txt
index 561b66d772cfaaf5d0cf2ef9e8b1717cd18776d8..1a35586841fac392f5cd1032c98c0b2ec86e4cb0 100644 (file)
--- a/src/tests/digest/md5-sess.txt
+++ b/src/tests/digest/md5-sess.txt
@@ -10,12 +10,12 @@
 #
 User-name = "bob",
 Digest-Response = "e4e4ea61d186d07a92c9e1f6919902e9",
-Digest-Realm = "biloxi.com",
-Digest-Nonce = "dcd98b7102dd2f0e8b11d0f600bfb0c093",
-Digest-Method = "INVITE",
-Digest-URI = "sip:bob@biloxi.com",
-Digest-Algorithm = "MD5-sess",
-Digest-User-Name = "bob",
-Digest-QOP = "auth",
-Digest-Nonce-Count  = "00000001",
-Digest-CNonce = "0a4f113b"
+Digest-Attributes.Realm = "biloxi.com",
+Digest-Attributes.Nonce = "dcd98b7102dd2f0e8b11d0f600bfb0c093",
+Digest-Attributes.Method = "INVITE",
+Digest-Attributes.URI = "sip:bob@biloxi.com",
+Digest-Attributes.Algorithm = "MD5-sess",
+Digest-Attributes.User-Name = "bob",
+Digest-Attributes.QOP = "auth",
+Digest-Attributes.Nonce-Count  = "00000001",
+Digest-Attributes.CNonce = "0a4f113b"

diff --git a/src/tests/digest/mschapv1.txt b/src/tests/digest/mschapv1.txt
index 30003f98da954811ff10bb9dc45989e881729d4f..594459aff10eba25fe4f9448620c50353b1c24c6 100644 (file)
--- a/src/tests/digest/mschapv1.txt
+++ b/src/tests/digest/mschapv1.txt
@@ -12,5 +12,5 @@
 #      NT Hash hash = 0x9a936faf344359a0f1e3c9b5585b9f1f
 #
 User-Name = "bob",
-MS-CHAP-Challenge = 0xb9634adc358b2ab3,
-MS-CHAP-Response = 0xb9010000000000000000000000000000000000000000000000007a42408782f745ef90a86fd21b0d9294132750f4af66a419
+Vendor-Specific.Microsoft.CHAP-Challenge = 0xb9634adc358b2ab3,
+Vendor-Specific.Microsoft.CHAP-Response = 0xb9010000000000000000000000000000000000000000000000007a42408782f745ef90a86fd21b0d9294132750f4af66a419

diff --git a/src/tests/eapol_test/config/aka-prime/mods-enabled/aka-prime b/src/tests/eapol_test/config/aka-prime/mods-enabled/aka-prime
index e03df85ebb5824fc93108fdf907d7962cc78ffff..4d6675bd4383ac8ec37c677c86154dcbb134dc71 100644 (file)
--- a/src/tests/eapol_test/config/aka-prime/mods-enabled/aka-prime
+++ b/src/tests/eapol_test/config/aka-prime/mods-enabled/aka-prime
@@ -13,7 +13,7 @@ cache eap_aka_prime_cache {
        #  update <section> { ... }::
        #
        update {
-               &session-state.Session-Data     := &session-state.Session-Data
-               &session-state.Counter          := &session-state.Counter
+               &session-state.Session-Data             := &session-state.Session-Data
+               &session-state.Encr-Data.Counter        := &session-state.Encr-Data.Counter
        }
-}
\ No newline at end of file
+}

diff --git a/src/tests/eapol_test/config/aka-prime/sites-enabled/aka-prime b/src/tests/eapol_test/config/aka-prime/sites-enabled/aka-prime
index d735dc57b1cbdfca134f972d055bcd20962d9a5c..483d359921c6701ac570b050e3b9a39332aed3cc 100644 (file)
--- a/src/tests/eapol_test/config/aka-prime/sites-enabled/aka-prime
+++ b/src/tests/eapol_test/config/aka-prime/sites-enabled/aka-prime
@@ -25,8 +25,8 @@ server eap-aka-prime {
                         &Sim-SQN := 3
                 }
                update reply {
-                       &Next-Reauth-Id := ""
-                       &Next-Pseudonym := ""
+                       &Encr-Data.Next-Reauth-Id := ""
+                       &Encr-Data.Next-Pseudonym := ""
                }
        }
 
@@ -41,4 +41,4 @@ server eap-aka-prime {
        clear session {
                eap_aka_prime_cache
        }
-}
\ No newline at end of file
+}

diff --git a/src/tests/eapol_test/config/aka/mods-enabled/aka b/src/tests/eapol_test/config/aka/mods-enabled/aka
index 84d1d82fcfb9f2f18e8afa00cb7c4a30fd959a38..030993be293150ce1988f432a8d08acfb9d7c029 100644 (file)
--- a/src/tests/eapol_test/config/aka/mods-enabled/aka
+++ b/src/tests/eapol_test/config/aka/mods-enabled/aka
@@ -13,7 +13,7 @@ cache eap_aka_cache {
        #  update <section> { ... }::
        #
        update {
-               &session-state.Session-Data     := &session-state.Session-Data
-               &session-state.Counter          := &session-state.Counter
+               &session-state.Session-Data             := &session-state.Session-Data
+               &session-state.Encr-Data.Counter        := &session-state.Encr-Data.Counter
        }
-}
\ No newline at end of file
+}

diff --git a/src/tests/eapol_test/config/aka/sites-enabled/aka b/src/tests/eapol_test/config/aka/sites-enabled/aka
index e316dc969d0b2fc31d71deeac12cdce56dfc174e..a61163804c252a3574514d0755b25fb0520bd60c 100644 (file)
--- a/src/tests/eapol_test/config/aka/sites-enabled/aka
+++ b/src/tests/eapol_test/config/aka/sites-enabled/aka
@@ -26,8 +26,8 @@ server eap-aka {
                         &Sim-SQN := 3
                 }
                update reply {
-                       &Next-Reauth-Id := ""
-                       &Next-Pseudonym := ""
+                       &Encr-Data.Next-Reauth-Id := ""
+                       &Encr-Data.Next-Pseudonym := ""
                }
        }
 

diff --git a/src/tests/eapol_test/config/sim/mods-enabled/sim b/src/tests/eapol_test/config/sim/mods-enabled/sim
index dcd6203e0a746b17d6370b215480621f44d357ec..261a7b33e6e4d0993c9773dcefe8129746b4a3a0 100644 (file)
--- a/src/tests/eapol_test/config/sim/mods-enabled/sim
+++ b/src/tests/eapol_test/config/sim/mods-enabled/sim
@@ -13,7 +13,7 @@ cache eap_sim_cache {
        #  update <section> { ... }::
        #
        update {
-               &session-state.Session-Data     := &session-state.Session-Data
-               &session-state.Counter          := &session-state.Counter
+               &session-state.Session-Data             := &session-state.Session-Data
+               &session-state.Encr-Data.Counter        := &session-state.Encr-Data.Counter
        }
-}
\ No newline at end of file
+}

diff --git a/src/tests/eapol_test/config/sim/sites-enabled/sim b/src/tests/eapol_test/config/sim/sites-enabled/sim
index 321e278810706041e9ccf5c3dccd75edaf271dbe..82f3acf956b5187ca9434622348e5361b20334e8 100644 (file)
--- a/src/tests/eapol_test/config/sim/sites-enabled/sim
+++ b/src/tests/eapol_test/config/sim/sites-enabled/sim
@@ -25,16 +25,16 @@ server eap-sim {
                         &Sim-SQN := 3
                 }
                update reply {
-                       &Next-Reauth-Id := ""
-                       &Next-Pseudonym := ""
+                       &Encr-Data.Next-Reauth-Id := ""
+                       &Encr-Data.Next-Pseudonym := ""
                }
                ok
        }
 
        send Reauthentication-Request {
                update reply {
-                       &Next-Reauth-Id := ""
-                       &Next-Pseudonym := ""
+                       &Encr-Data.Next-Reauth-Id := ""
+                       &Encr-Data.Next-Pseudonym := ""
                }
                ok
        }

diff --git a/src/tests/modules/dict/map.unlang b/src/tests/modules/dict/map.unlang
index 17da5286ff204ba3e20f03c18ee4a23d90a9bc02..ba0e66ba835cea4a994c2b5449e149dbfebf67bc 100644 (file)
--- a/src/tests/modules/dict/map.unlang
+++ b/src/tests/modules/dict/map.unlang
@@ -33,14 +33,14 @@ else {
        test_fail
 }
 
-if ("%{attr_by_oid:26.11344.1}" == 'Vendor-Specific.FreeRADIUS.Proxied-To') {
+if ("%{attr_by_oid:26.11344.1}" == 'Proxied-To') {
        test_pass
 }
 else {
        test_fail
 }
 
-if ("%{attr:Vendor-Specific.FreeRADIUS.Proxied-To}" == 'FreeRADIUS-Proxied-To') {
+if ("%{attr:Vendor-Specific.FreeRADIUS.Proxied-To}" == 'Proxied-To') {
        test_pass
 }
 else {

diff --git a/src/tests/modules/ldap/acct.attrs b/src/tests/modules/ldap/acct.attrs
index a1f54346c1ef9464d82af46acf593313c864645e..e1456362fd959024fa1ff1809e726bc98e63244f 100644 (file)
--- a/src/tests/modules/ldap/acct.attrs
+++ b/src/tests/modules/ldap/acct.attrs
@@ -26,7 +26,7 @@ Framed-Protocol = PPP
 Acct-Link-Count = 0
 Idle-Timeout = 0
 Session-Timeout = 604800
-Access-Loop-Encapsulation = 0x000000
+Vendor-Specific.ADSL-Forum.Access-Loop-Encapsulation = 0x000000
 Proxy-State = 0x323531
 
 #

diff --git a/src/tests/modules/ldap/module.conf b/src/tests/modules/ldap/module.conf
index 0e1a8c3c8cf75a6a6918bcc2da2c9c66bad73cae..a4151e79d7882049b2820ee5cdb9e7d9397d9f33 100644 (file)
--- a/src/tests/modules/ldap/module.conf
+++ b/src/tests/modules/ldap/module.conf
@@ -103,7 +103,7 @@ ldap {
                &control.Password.With-Header   += 'userPassword'
                &reply.Idle-Timeout             := 'radiusIdleTimeout'
                &reply.Framed-IP-Netmask        := 'radiusFramedIPNetmask'
-#              &control.NT-Password            := 'ntPassword'
+#              &control.Password.NT            := 'ntPassword'
 #              &reply.Reply-Message            := 'radiusReplyMessage'
 #              &reply.Tunnel-Type              := 'radiusTunnelType'
 #              &reply.Tunnel-Medium-Type       := 'radiusTunnelMediumType'

diff --git a/src/tests/modules/pap/pbkfd2_dig_big.unlang b/src/tests/modules/pap/pbkfd2_dig_big.unlang
index 449967fab0ec5e001a5838d6aa3ccd949d131a62..76325d1e5115b5c83b670be9ba1c69813a6c0a9a 100644 (file)
--- a/src/tests/modules/pap/pbkfd2_dig_big.unlang
+++ b/src/tests/modules/pap/pbkfd2_dig_big.unlang
@@ -5,7 +5,7 @@ if ("${feature.tls}" == no) {
 
 if (&User-Name == 'pbkdf2_dig_big') {
        update control {
-               &PBKDF2-Password := 'HMACSHA2+256:AAAAAQ:E+VXOSsE8RwyYGdygQoW9Q==:UivlvrwHML4VtZHMJLiT/xlH7oyoyvbXQceivptq9TI='
+               &Password.PBKDF2 := 'HMACSHA2+256:AAAAAQ:E+VXOSsE8RwyYGdygQoW9Q==:UivlvrwHML4VtZHMJLiT/xlH7oyoyvbXQceivptq9TI='
        }
        pap.authorize
        pap.authenticate

diff --git a/src/tests/modules/pap/pbkfd2_dig_small.unlang b/src/tests/modules/pap/pbkfd2_dig_small.unlang
index 37f08ee04988e8a018bcf1490f424092af1f8b93..b9a9c4f0a289f4ccddc6c396b9b3bed20b5d6b88 100644 (file)
--- a/src/tests/modules/pap/pbkfd2_dig_small.unlang
+++ b/src/tests/modules/pap/pbkfd2_dig_small.unlang
@@ -5,7 +5,7 @@ if ("${feature.tls}" == no) {
 
 if (&User-Name == 'pbkdf2_dig_small') {
        update control {
-               &PBKDF2-Password := 'HMACSHA2+256:AAAAAQ:E+VXOSsE8RwyYGdygQoW9Q==:UivlvrwHML4VtZHMJLiT/xlH7oyoyvbXQceivptq9TI'
+               &Password.PBKDF2 := 'HMACSHA2+256:AAAAAQ:E+VXOSsE8RwyYGdygQoW9Q==:UivlvrwHML4VtZHMJLiT/xlH7oyoyvbXQceivptq9TI'
        }
        pap.authorize
        pap.authenticate

diff --git a/src/tests/modules/pap/pbkfd2_iter0.unlang b/src/tests/modules/pap/pbkfd2_iter0.unlang
index ca362c9fc14bfb74bee248815272289f6b2ac89c..773fd0a3f64e3a693ea7a2dca73e99d56363a854 100644 (file)
--- a/src/tests/modules/pap/pbkfd2_iter0.unlang
+++ b/src/tests/modules/pap/pbkfd2_iter0.unlang
@@ -5,7 +5,7 @@ if ("${feature.tls}" == no) {
 
 if (&User-Name == 'pbkdf2_iter0') {
        update control {
-               &PBKDF2-Password := 'HMACSHA2+256:AAAAAP:CuNDJ9NimZoP5ljnPNCBUA==:f09zV7dReGg5SIv/EXY9tCL4XQRr5guhL0Q6UXSKI3c='
+               &Password.PBKDF2 := 'HMACSHA2+256:AAAAAP:CuNDJ9NimZoP5ljnPNCBUA==:f09zV7dReGg5SIv/EXY9tCL4XQRr5guhL0Q6UXSKI3c='
        }
        pap.authorize
        pap.authenticate

diff --git a/src/tests/modules/pap/pbkfd2_iter1.unlang b/src/tests/modules/pap/pbkfd2_iter1.unlang
index 6758c9b5956907a43854fa7a9228d3fb26006390..ec048cbd54168ea83f7cfc5d6d2278f28fd7c1f3 100644 (file)
--- a/src/tests/modules/pap/pbkfd2_iter1.unlang
+++ b/src/tests/modules/pap/pbkfd2_iter1.unlang
@@ -5,7 +5,7 @@ if ("${feature.tls}" == no) {
 
 if (&User-Name == 'pbkdf2_iter1') {
        update control {
-               &PBKDF2-Password := 'HMACSHA2+256:AAAAAQ:OErtptMl2hOxhQqvNw7sNw==:4KkrgL+3Q9j8KlHPivtApBKRZAjyWjtDWmZEz2UjNko='
+               &Password.PBKDF2 := 'HMACSHA2+256:AAAAAQ:OErtptMl2hOxhQqvNw7sNw==:4KkrgL+3Q9j8KlHPivtApBKRZAjyWjtDWmZEz2UjNko='
        }
        pap.authorize
        pap.authenticate

diff --git a/src/tests/modules/pap/pbkfd2_iter1000.unlang b/src/tests/modules/pap/pbkfd2_iter1000.unlang
index 18fe6804447fe3711711afffeca3671dd70f7745..69b68b63f5a134ebe2fbc58a185e4ed48f197db2 100644 (file)
--- a/src/tests/modules/pap/pbkfd2_iter1000.unlang
+++ b/src/tests/modules/pap/pbkfd2_iter1000.unlang
@@ -5,7 +5,7 @@ if ("${feature.tls}" == no) {
 
 if (&User-Name == 'pbkdf2_iter1000') {
        update control {
-               &PBKDF2-Password := 'HMACSHA2+256:AAAD6A:yhmqoKrtPLY2KYK6cNjnfw==:Y6gkSZEo4TRtlsryHqnGYZhoe2qn5tJ4IUyyVHb/3WU='
+               &Password.PBKDF2 := 'HMACSHA2+256:AAAD6A:yhmqoKrtPLY2KYK6cNjnfw==:Y6gkSZEo4TRtlsryHqnGYZhoe2qn5tJ4IUyyVHb/3WU='
        }
        pap.authorize
        pap.authenticate

diff --git a/src/tests/modules/pap/pbkfd2_iter100000.unlang b/src/tests/modules/pap/pbkfd2_iter100000.unlang
index a1253e6175b19a92922713230b8565ffbbe32978..d1f22bf682fe055b24a63050fd4df58e67f9cc4c 100644 (file)
--- a/src/tests/modules/pap/pbkfd2_iter100000.unlang
+++ b/src/tests/modules/pap/pbkfd2_iter100000.unlang
@@ -5,7 +5,7 @@ if ("${feature.tls}" == no) {
 
 if (&User-Name == 'pbkdf2_iter100000') {
        update control {
-               &PBKDF2-Password := 'HMACSHA2+256:AA9CQA:fCfnJGMVC1QLtTOPiaSICA==:KCmjMpQ+lokMvyFTl4f4pPJNc0xJq4iHZPdtHa0OEXM='
+               &Password.PBKDF2 := 'HMACSHA2+256:AA9CQA:fCfnJGMVC1QLtTOPiaSICA==:KCmjMpQ+lokMvyFTl4f4pPJNc0xJq4iHZPdtHa0OEXM='
        }
        pap.authorize
        pap.authenticate

diff --git a/src/tests/modules/pap/pbkfd2_iter_big.unlang b/src/tests/modules/pap/pbkfd2_iter_big.unlang
index 464d94475d5db77f6e5892e290894eb4ec7071cd..634a6d812dcb6e66973bcb5f265331285218b08b 100644 (file)
--- a/src/tests/modules/pap/pbkfd2_iter_big.unlang
+++ b/src/tests/modules/pap/pbkfd2_iter_big.unlang
@@ -5,7 +5,7 @@ if ("${feature.tls}" == no) {
 
 if (&User-Name == 'pbkdf2_iter_big') {
        update control {
-               &PBKDF2-Password := 'HMACSHA2+256:AAAAAQ==:E+VXOSsE8RwyYGdygQoW9Q==:UivlvrwHML4VtZHMJLiT/xlH7oyoyvbXQceivptq9TI='
+               &Password.PBKDF2 := 'HMACSHA2+256:AAAAAQ==:E+VXOSsE8RwyYGdygQoW9Q==:UivlvrwHML4VtZHMJLiT/xlH7oyoyvbXQceivptq9TI='
        }
        pap.authorize
        pap.authenticate

diff --git a/src/tests/modules/pap/pbkfd2_iter_miss.unlang b/src/tests/modules/pap/pbkfd2_iter_miss.unlang
index 44d961a4eb981e215b15b35e9eafe9a45e73cba2..b459a0ed07de189b40d6471f4818572a5fc5256f 100644 (file)
--- a/src/tests/modules/pap/pbkfd2_iter_miss.unlang
+++ b/src/tests/modules/pap/pbkfd2_iter_miss.unlang
@@ -5,7 +5,7 @@ if ("${feature.tls}" == no) {
 
 if (&User-Name == 'pbkdf2_iter_miss') {
        update control {
-               &PBKDF2-Password := 'HMACSHA2+256::E+VXOSsE8RwyYGdygQoW9Q==:UivlvrwHML4VtZHMJLiT/xlH7oyoyvbXQceivptq9TI='
+               &Password.PBKDF2 := 'HMACSHA2+256::E+VXOSsE8RwyYGdygQoW9Q==:UivlvrwHML4VtZHMJLiT/xlH7oyoyvbXQceivptq9TI='
        }
        pap.authorize
        pap.authenticate {

diff --git a/src/tests/modules/pap/pbkfd2_iter_small.unlang b/src/tests/modules/pap/pbkfd2_iter_small.unlang
index 7edee8092696a7486381d87d9b508ad015a3079d..b35f7fb0c090e945bbf8cf265af1093d5c64f29f 100644 (file)
--- a/src/tests/modules/pap/pbkfd2_iter_small.unlang
+++ b/src/tests/modules/pap/pbkfd2_iter_small.unlang
@@ -5,7 +5,7 @@ if ("${feature.tls}" == no) {
 
 if (&User-Name == 'pbkdf2_iter_small') {
        update control {
-               &PBKDF2-Password := 'HMACSHA2+256:AAAAA:E+VXOSsE8RwyYGdygQoW9Q==:UivlvrwHML4VtZHMJLiT/xlH7oyoyvbXQceivptq9TI='
+               &Password.PBKDF2 := 'HMACSHA2+256:AAAAA:E+VXOSsE8RwyYGdygQoW9Q==:UivlvrwHML4VtZHMJLiT/xlH7oyoyvbXQceivptq9TI='
        }
        pap.authorize
        pap.authenticate {

diff --git a/src/tests/modules/pap/pbkfd2_passlib.unlang b/src/tests/modules/pap/pbkfd2_passlib.unlang
index 6d0f27d234148f0bb82cbbf6ab0a3f26242bc113..cc84f656cd586250e05a8f66ce4b67ce5fb65da9 100644 (file)
--- a/src/tests/modules/pap/pbkfd2_passlib.unlang
+++ b/src/tests/modules/pap/pbkfd2_passlib.unlang
@@ -8,7 +8,7 @@ test_pass
 
 #if (&User-Name == 'pbkdf2_passlib') {
 #      update control {
-#              &PBKDF2-Password := '$pbkdf2-sha256$29000$9t7be09prfXee2/NOUeotQ$Y.RDnnq8vsezSZSKy1QNy6xhKPdoBIwc.0XDdRm9sJ8'
+#              &Password.PBKDF2 := '$pbkdf2-sha256$29000$9t7be09prfXee2/NOUeotQ$Y.RDnnq8vsezSZSKy1QNy6xhKPdoBIwc.0XDdRm9sJ8'
 #      }
 #      pap.authorize
 #      pap.authenticate

diff --git a/src/tests/modules/pap/pbkfd2_salt0.unlang b/src/tests/modules/pap/pbkfd2_salt0.unlang
index 173f768e6bdccfb5d8ac6936cfaab5a418a13b1b..5aa60ab43132b7201b8e6f9db6289e1deb155d4b 100644 (file)
--- a/src/tests/modules/pap/pbkfd2_salt0.unlang
+++ b/src/tests/modules/pap/pbkfd2_salt0.unlang
@@ -5,7 +5,7 @@ if ("${feature.tls}" == no) {
 
 if (&User-Name == 'pbkdf2_salt0') {
        update control {
-               &PBKDF2-Password := 'HMACSHA2+256:AAAnEA::4RJEKVFQ5nE8126aURI0cJO9tqy/DIAhq64piBEwshA='
+               &Password.PBKDF2 := 'HMACSHA2+256:AAAnEA::4RJEKVFQ5nE8126aURI0cJO9tqy/DIAhq64piBEwshA='
        }
        pap.authorize
        pap.authenticate {

diff --git a/src/tests/modules/pap/pbkfd2_salt1.unlang b/src/tests/modules/pap/pbkfd2_salt1.unlang
index 4aa0fce8278b32df6d2d4b2dbd88c43f7b5816b7..9c9e8c8ffce598b4e9d020bb7e58b2c8bea72d72 100644 (file)
--- a/src/tests/modules/pap/pbkfd2_salt1.unlang
+++ b/src/tests/modules/pap/pbkfd2_salt1.unlang
@@ -5,7 +5,7 @@ if ("${feature.tls}" == no) {
 
 if (&User-Name == 'pbkdf2_salt1') {
        update control {
-               &PBKDF2-Password := 'HMACSHA2+256:AAAnEA:qg==:KQzCdedgOZYFwx+mQp1TKA8VM4fwf02pqSdJEh2ekwM='
+               &Password.PBKDF2 := 'HMACSHA2+256:AAAnEA:qg==:KQzCdedgOZYFwx+mQp1TKA8VM4fwf02pqSdJEh2ekwM='
        }
        pap.authorize
        pap.authenticate

diff --git a/src/tests/modules/pap/pbkfd2_salt1024.unlang b/src/tests/modules/pap/pbkfd2_salt1024.unlang
index a4aab5ec8cd46b3e41365643b57e8d8aef9d9743..4c90087e2fe2a73d18a154f06dfcfac66b76f475 100644 (file)
--- a/src/tests/modules/pap/pbkfd2_salt1024.unlang
+++ b/src/tests/modules/pap/pbkfd2_salt1024.unlang
@@ -5,7 +5,7 @@ if ("${feature.tls}" == no) {
 
 if (&User-Name == 'pbkdf2_salt1024') {
        update control {
-               &PBKDF2-Password := 'HMACSHA2+256:AAAnEA:/IUrkJKe+1kzJNBw7aAMbnQuSFZpjbCqPeKso3cbuSUzWinxngxjK8yyZLiWwF+WE/0Gplfx25zZEQNTdRTvjZZNefoxQBR8Hht0FpdU9YiEBaeErwVo63EDEu83+ycvB18uH0IXpJKGSSkIPRfGpHT3BkwJDGo5SqjRJadDsyQzkc/WJCMrrfJ0igaWMxb5eR5J8qfXIjBFepRrOOU6acZGtANW8qvDYLJwN+TMd9Jb1wDDY14eoAlKglTF21S3kewNMkDDyeP+oDYv29t1S/soFUnnB+Pb5IdR6pDy2VDGx4jFZMQGshSHWTYQFqgulavS/tGEF8TvzcorrJZKuksAjKdTSmfZ6j4aBY3U+oMSQ+2lO131pkNfNQuMsDfr72r9wUA2xRgUiL/J7CgKn7mamL2OCaksl0Rw2PGqqIaHvAYS6Q1EoIzsmLNrWBYYqTRLyCGZw6+hUOahYRon2lglGmnuWHPfowU+LgcaR5gF1QjvTXhXQ8I39mB3ePgdi+7TUn644Z1FB+JTqGJbue92x4V40Zyyy+Qdt52QsR49iYokbKAwQRiqfVJ7J8NzCY/kIQnqT9RE0NCxZoMBRzboZxVPchxdpmWGQ9dXP06PqIuDCFFiJlVQUfyPMgOAxIlVJ/9NAmj5MWFdWMrmlBNDx9ihEV1FdTv23iFZH5Ejg+x4D3qN5oOyCDL2i9lobzFXh5z4EDpbbogQaFkUzqKEaxRGPBrfYVOi6XXYujVUnxHJaRxbs2UqjpJNsXMg8f7P78aRvOKCIbW70CHWlt7nF0pA5+kFUQRLXKuq7bW+ivoXKeDW5o4FVP3+Pcr67+DOsUXuehALLj9Mu2ICWlMIV/AWcM2szaqk1bwSo7bAeG4RtDKmNjGA7gpnT+w2x+/qS1eWbc832Sumqc1IA8aY6HNVDPsJZf99To4BR+N0rCoQQ/KIZybI31mQagR3+FR9yNzqWzKIl+qf69RTc1CbUCkKVF8pxWZ0ocP+CAdoKadgpdF8evQIiGcUD73HiJ0RsDWo21y0tN0P5jfzWo3WMhCk9e2wl6o1JAfKw54uHzWJnNlGLBK1LXF+R2m+WvNGBgvUhh4PtYV9gPSudumFdk614oak/Aqcn6xi+YZqOMPkW4WYaiczhHyS7qAyefqKaQkRVYS0Af+79CSjlxZJq57HrD7/1E+d/i0gKmSAbPe80uGHs2a13V3VxztFMBi4xD7zj9Mq7+0goVPD4MNXcR651MZ7vxDRGbvPPmclddZe/nkTEn1YB/909b9mC5P/XzximZYW8gEhBReZouukADRTAjuH8zgSIv6/uyTURnmSVoOumVLBpL7veJIzDm4dZ38BWiasiBnzgMuG9A==:RUoCF5O11OgwLFMTqnKY/yRJy6DYh+yNq4xHZC7COGM='
+               &Password.PBKDF2 := 'HMACSHA2+256:AAAnEA:/IUrkJKe+1kzJNBw7aAMbnQuSFZpjbCqPeKso3cbuSUzWinxngxjK8yyZLiWwF+WE/0Gplfx25zZEQNTdRTvjZZNefoxQBR8Hht0FpdU9YiEBaeErwVo63EDEu83+ycvB18uH0IXpJKGSSkIPRfGpHT3BkwJDGo5SqjRJadDsyQzkc/WJCMrrfJ0igaWMxb5eR5J8qfXIjBFepRrOOU6acZGtANW8qvDYLJwN+TMd9Jb1wDDY14eoAlKglTF21S3kewNMkDDyeP+oDYv29t1S/soFUnnB+Pb5IdR6pDy2VDGx4jFZMQGshSHWTYQFqgulavS/tGEF8TvzcorrJZKuksAjKdTSmfZ6j4aBY3U+oMSQ+2lO131pkNfNQuMsDfr72r9wUA2xRgUiL/J7CgKn7mamL2OCaksl0Rw2PGqqIaHvAYS6Q1EoIzsmLNrWBYYqTRLyCGZw6+hUOahYRon2lglGmnuWHPfowU+LgcaR5gF1QjvTXhXQ8I39mB3ePgdi+7TUn644Z1FB+JTqGJbue92x4V40Zyyy+Qdt52QsR49iYokbKAwQRiqfVJ7J8NzCY/kIQnqT9RE0NCxZoMBRzboZxVPchxdpmWGQ9dXP06PqIuDCFFiJlVQUfyPMgOAxIlVJ/9NAmj5MWFdWMrmlBNDx9ihEV1FdTv23iFZH5Ejg+x4D3qN5oOyCDL2i9lobzFXh5z4EDpbbogQaFkUzqKEaxRGPBrfYVOi6XXYujVUnxHJaRxbs2UqjpJNsXMg8f7P78aRvOKCIbW70CHWlt7nF0pA5+kFUQRLXKuq7bW+ivoXKeDW5o4FVP3+Pcr67+DOsUXuehALLj9Mu2ICWlMIV/AWcM2szaqk1bwSo7bAeG4RtDKmNjGA7gpnT+w2x+/qS1eWbc832Sumqc1IA8aY6HNVDPsJZf99To4BR+N0rCoQQ/KIZybI31mQagR3+FR9yNzqWzKIl+qf69RTc1CbUCkKVF8pxWZ0ocP+CAdoKadgpdF8evQIiGcUD73HiJ0RsDWo21y0tN0P5jfzWo3WMhCk9e2wl6o1JAfKw54uHzWJnNlGLBK1LXF+R2m+WvNGBgvUhh4PtYV9gPSudumFdk614oak/Aqcn6xi+YZqOMPkW4WYaiczhHyS7qAyefqKaQkRVYS0Af+79CSjlxZJq57HrD7/1E+d/i0gKmSAbPe80uGHs2a13V3VxztFMBi4xD7zj9Mq7+0goVPD4MNXcR651MZ7vxDRGbvPPmclddZe/nkTEn1YB/909b9mC5P/XzximZYW8gEhBReZouukADRTAjuH8zgSIv6/uyTURnmSVoOumVLBpL7veJIzDm4dZ38BWiasiBnzgMuG9A==:RUoCF5O11OgwLFMTqnKY/yRJy6DYh+yNq4xHZC7COGM='
        }
        pap.authorize
        pap.authenticate

diff --git a/src/tests/modules/pap/pbkfd2_salt64.unlang b/src/tests/modules/pap/pbkfd2_salt64.unlang
index 754cdba544831af3ece47f6021be66c1c47fde82..981d7aa8bebad9e607a788f1742a6dbdf1dae5a4 100644 (file)
--- a/src/tests/modules/pap/pbkfd2_salt64.unlang
+++ b/src/tests/modules/pap/pbkfd2_salt64.unlang
@@ -5,7 +5,7 @@ if ("${feature.tls}" == no) {
 
 if (&User-Name == 'pbkdf2_salt64') {
        update control {
-               &PBKDF2-Password := 'HMACSHA2+256:AAAnEA:msGxE1XuC+wlgRr+H4+ioyxZuiN3KYLUSky2FINDTq7KJylKt4XnqloV+FuHGXUbOu1EWcsFp51u2z8wdXVnQQ==:rAV9BeEJH5kt9uZ6pJt0o5pYpN5LQRe4MAYyk2jvjpU='
+               &Password.PBKDF2 := 'HMACSHA2+256:AAAnEA:msGxE1XuC+wlgRr+H4+ioyxZuiN3KYLUSky2FINDTq7KJylKt4XnqloV+FuHGXUbOu1EWcsFp51u2z8wdXVnQQ==:rAV9BeEJH5kt9uZ6pJt0o5pYpN5LQRe4MAYyk2jvjpU='
        }
        pap.authorize
        pap.authenticate

diff --git a/src/tests/modules/pap/pbkfd2_salt_big.unlang b/src/tests/modules/pap/pbkfd2_salt_big.unlang
index cfc96c5f068fcb6b73181127e0a3f75585808e1c..7707dabbc50ec2701853baafc0d684db3e74b9ae 100644 (file)
--- a/src/tests/modules/pap/pbkfd2_salt_big.unlang
+++ b/src/tests/modules/pap/pbkfd2_salt_big.unlang
@@ -5,7 +5,7 @@ if ("${feature.tls}" == no) {
 
 if (&User-Name == 'pbkdf2_salt_big') {
        update control {
-               &PBKDF2-Password := 'HMACSHA2+256:AAAAAQ:E+VXOSsE8RwyYGdygQoW9QA==:pF23EcxNBhJLQ+9JRtd9wQ1Gz+k4i6YjeNZq+7DRBX8='
+               &Password.PBKDF2 := 'HMACSHA2+256:AAAAAQ:E+VXOSsE8RwyYGdygQoW9QA==:pF23EcxNBhJLQ+9JRtd9wQ1Gz+k4i6YjeNZq+7DRBX8='
        }
        pap.authorize
        pap.authenticate

diff --git a/src/tests/modules/pap/pbkfd2_salt_small.unlang b/src/tests/modules/pap/pbkfd2_salt_small.unlang
index e46982f0eea4ea2d2f541cf7f43dcbf1a4756107..a7d1d0eba8381e710f5cffdf5f645b20e0e5cad1 100644 (file)
--- a/src/tests/modules/pap/pbkfd2_salt_small.unlang
+++ b/src/tests/modules/pap/pbkfd2_salt_small.unlang
@@ -5,7 +5,7 @@ if ("${feature.tls}" == no) {
 
 if (&User-Name == 'pbkdf2_salt_small') {
        update control {
-               &PBKDF2-Password := 'HMACSHA2+256:AAAAAQ:E+VXOSsE8RwyYGdygQoW9Q=:UivlvrwHML4VtZHMJLiT/xlH7oyoyvbXQceivptq9TI='
+               &Password.PBKDF2 := 'HMACSHA2+256:AAAAAQ:E+VXOSsE8RwyYGdygQoW9Q=:UivlvrwHML4VtZHMJLiT/xlH7oyoyvbXQceivptq9TI='
        }
        pap.authorize
        pap.authenticate

diff --git a/src/tests/modules/pap/pbkfd2_sha1.unlang b/src/tests/modules/pap/pbkfd2_sha1.unlang
index 5b796919dea07e333c35a12d0e7a656d58091761..819d043e170560fce820a659771d5c1c0616edbb 100644 (file)
--- a/src/tests/modules/pap/pbkfd2_sha1.unlang
+++ b/src/tests/modules/pap/pbkfd2_sha1.unlang
@@ -5,7 +5,7 @@ if ("${feature.tls}" == no) {
 
 if (&User-Name == 'pbkdf2_sha1') {
        update control {
-               &PBKDF2-Password := 'HMACSHA1:AAAD6A:Xw1P133xrwk=:dtQBXQRiR/No5A8Ip3JFGF/qUC0='
+               &Password.PBKDF2 := 'HMACSHA1:AAAD6A:Xw1P133xrwk=:dtQBXQRiR/No5A8Ip3JFGF/qUC0='
        }
        pap.authorize
        pap.authenticate

diff --git a/src/tests/modules/pap/pbkfd2_sha2_224.unlang b/src/tests/modules/pap/pbkfd2_sha2_224.unlang
index 00fa626dfc18a9673650c9296cb405a4cb2af4e2..acd79ad2e83c44151c9e66eff52949f028848763 100644 (file)
--- a/src/tests/modules/pap/pbkfd2_sha2_224.unlang
+++ b/src/tests/modules/pap/pbkfd2_sha2_224.unlang
@@ -5,7 +5,7 @@ if ("${feature.tls}" == no) {
 
 if (&User-Name == 'pbkdf2_sha2_224') {
        update control {
-               &PBKDF2-Password := 'HMACSHA2+224:AAAnEA:UHScBrg/ZWOyBKqQdAh7bw==:tcFp6CDrkIYdhwa60g24U4ko+mBxzAiFxlpPnA=='
+               &Password.PBKDF2 := 'HMACSHA2+224:AAAnEA:UHScBrg/ZWOyBKqQdAh7bw==:tcFp6CDrkIYdhwa60g24U4ko+mBxzAiFxlpPnA=='
        }
        pap.authorize
        pap.authenticate

diff --git a/src/tests/modules/pap/pbkfd2_sha2_256.unlang b/src/tests/modules/pap/pbkfd2_sha2_256.unlang
index 5c4efcecb87f094301569c38373c1b164754d6d2..18085fe7029ef64aa2458300c49e9210acb78e5d 100644 (file)
--- a/src/tests/modules/pap/pbkfd2_sha2_256.unlang
+++ b/src/tests/modules/pap/pbkfd2_sha2_256.unlang
@@ -5,7 +5,7 @@ if ("${feature.tls}" == no) {
 
 if (&User-Name == 'pbkdf2_sha2_256') {
        update control {
-               &PBKDF2-Password := 'HMACSHA2+256:AAAnEA:a/8HbYW2HWsMthN27JI+Ew==:3nPlXYOlOuDCFOfethUomHxTXkG9JCivOdvh6FDNdGw='
+               &Password.PBKDF2 := 'HMACSHA2+256:AAAnEA:a/8HbYW2HWsMthN27JI+Ew==:3nPlXYOlOuDCFOfethUomHxTXkG9JCivOdvh6FDNdGw='
        }
        pap.authorize
        pap.authenticate

diff --git a/src/tests/modules/pap/pbkfd2_sha2_384.unlang b/src/tests/modules/pap/pbkfd2_sha2_384.unlang
index 034bb83193301ee643cc61c1804acd3a18a418f6..1c4d1ef260a818f54a7858085a49ee12af922957 100644 (file)
--- a/src/tests/modules/pap/pbkfd2_sha2_384.unlang
+++ b/src/tests/modules/pap/pbkfd2_sha2_384.unlang
@@ -5,7 +5,7 @@ if ("${feature.tls}" == no) {
 
 if (&User-Name == 'pbkdf2_sha2_384') {
        update control {
-               &PBKDF2-Password := 'HMACSHA2+384:AAAnEA:pyHRsYLfNZdjszRcu6eHrA==:ktGfNmZ6PyD8FNEgPzFK1fypKERZ13pgvFl+PQdyKouaMXsXIiWPuTMXHqDUCWsx'
+               &Password.PBKDF2 := 'HMACSHA2+384:AAAnEA:pyHRsYLfNZdjszRcu6eHrA==:ktGfNmZ6PyD8FNEgPzFK1fypKERZ13pgvFl+PQdyKouaMXsXIiWPuTMXHqDUCWsx'
        }
        pap.authorize
        pap.authenticate

diff --git a/src/tests/modules/pap/pbkfd2_sha2_512.unlang b/src/tests/modules/pap/pbkfd2_sha2_512.unlang
index 95c1f3eb48f9e893259d6b387516cb74fc3694cd..fc8f4a681954e151e67aaf4ddb4d1fdc79cd9895 100644 (file)
--- a/src/tests/modules/pap/pbkfd2_sha2_512.unlang
+++ b/src/tests/modules/pap/pbkfd2_sha2_512.unlang
@@ -5,7 +5,7 @@ if ("${feature.tls}" == no) {
 
 if (&User-Name == 'pbkdf2_sha2_512') {
        update control {
-               &PBKDF2-Password := 'HMACSHA2+512:AAAnEA:TG8Mb94NEmfPLaePwi5CFA==:SYSFeRf9jr4Uo5DB4NvNUEuc1gmEiLjTac5J4WgyKa7mO58KHKWop9xWmcFeuLtUN/iexLTNSgcubOugAyZcog=='
+               &Password.PBKDF2 := 'HMACSHA2+512:AAAnEA:TG8Mb94NEmfPLaePwi5CFA==:SYSFeRf9jr4Uo5DB4NvNUEuc1gmEiLjTac5J4WgyKa7mO58KHKWop9xWmcFeuLtUN/iexLTNSgcubOugAyZcog=='
        }
        pap.authorize
        pap.authenticate

diff --git a/src/tests/modules/perl/unknown.attrs b/src/tests/modules/perl/unknown.attrs
index 61d6493b6c97f6c67eaae6b0446bfb515bbb2ac2..c0b38e4b85f2543bd4769447333f12205864c050 100644 (file)
--- a/src/tests/modules/perl/unknown.attrs
+++ b/src/tests/modules/perl/unknown.attrs
@@ -3,7 +3,7 @@
 #
 User-Name = "bob"
 User-Password = "hello"
-Attr-17 = 0xabcdef
+raw.17 = 0xabcdef
 
 #
 #  Expected answer

diff --git a/src/tests/modules/sql/acct_0_start.attrs b/src/tests/modules/sql/acct_0_start.attrs
index efc5096edcb6d075e7c21c2065834276cabadc83..94ce7cc27d85782277e03c1577d848267548756b 100644 (file)
--- a/src/tests/modules/sql/acct_0_start.attrs
+++ b/src/tests/modules/sql/acct_0_start.attrs
@@ -26,7 +26,7 @@ Framed-Protocol = PPP
 Acct-Link-Count = 0
 Idle-Timeout = 0
 Session-Timeout = 604800
-Access-Loop-Encapsulation = 0x000000
+Vendor-Specific.ADSL-Forum.Access-Loop-Encapsulation = 0x000000
 Proxy-State = 0x323531
 
 #

diff --git a/src/tests/modules/sql/acct_1_update.attrs b/src/tests/modules/sql/acct_1_update.attrs
index 80d9376f70dd8f5bcd6ed88eb583b7f3618e393a..870e5877f652cc12c2e3458b62826510af78adac 100644 (file)
--- a/src/tests/modules/sql/acct_1_update.attrs
+++ b/src/tests/modules/sql/acct_1_update.attrs
@@ -26,7 +26,7 @@ Framed-Protocol = PPP
 Acct-Link-Count = 0
 Idle-Timeout = 0
 Session-Timeout = 604800
-Access-Loop-Encapsulation = 0x000000
+Vendor-Specific.ADSL-Forum.Access-Loop-Encapsulation = 0x000000
 Proxy-State = 0x323531
 
 #

diff --git a/src/tests/modules/sql/acct_2_stop.attrs b/src/tests/modules/sql/acct_2_stop.attrs
index e41b983a446e3c9254a6b0019dbb03491c362daa..aa203e7ab1c3e4d07bba009cba969b4696bb068f 100644 (file)
--- a/src/tests/modules/sql/acct_2_stop.attrs
+++ b/src/tests/modules/sql/acct_2_stop.attrs
@@ -27,7 +27,7 @@ Framed-Protocol = PPP
 Acct-Link-Count = 0
 Idle-Timeout = 0
 Session-Timeout = 604800
-Access-Loop-Encapsulation = 0x000000
+Vendor-Specific.ADSL-Forum.Access-Loop-Encapsulation = 0x000000
 Proxy-State = 0x323531
 
 #

diff --git a/src/tests/modules/sql/acct_start_conflict.attrs b/src/tests/modules/sql/acct_start_conflict.attrs
index 3b96bb8f324412d67c2aaeff37368b962d964d6b..c26a0f2124a30b0ea81c9f2ba783b6874a4b5e9c 100644 (file)
--- a/src/tests/modules/sql/acct_start_conflict.attrs
+++ b/src/tests/modules/sql/acct_start_conflict.attrs
@@ -26,7 +26,7 @@ Framed-Protocol = PPP
 Acct-Link-Count = 0
 Idle-Timeout = 0
 Session-Timeout = 604800
-Access-Loop-Encapsulation = 0x000000
+Vendor-Specific.ADSL-Forum.Access-Loop-Encapsulation = 0x000000
 Proxy-State = 0x323531
 
 #

diff --git a/src/tests/modules/sql/acct_update_no_start.attrs b/src/tests/modules/sql/acct_update_no_start.attrs
index 997f05227b0ac8d8007f8dc090fb3f69d31aa47a..7d8de7ce48da784a636860c0cd81627905746ead 100644 (file)
--- a/src/tests/modules/sql/acct_update_no_start.attrs
+++ b/src/tests/modules/sql/acct_update_no_start.attrs
@@ -26,7 +26,7 @@ Framed-Protocol = PPP
 Acct-Link-Count = 0
 Idle-Timeout = 0
 Session-Timeout = 604800
-Access-Loop-Encapsulation = 0x000000
+Vendor-Specific.ADSL-Forum.Access-Loop-Encapsulation = 0x000000
 Proxy-State = 0x323531
 
 #

diff --git a/src/tests/radclient/auth_4.out b/src/tests/radclient/auth_4.out
index 5a81c9adc725438a143f1398c39ee5c2e28601a0..84376785ef6c706a3d19a798987b7be7d10343db 100644 (file)
--- a/src/tests/radclient/auth_4.out
+++ b/src/tests/radclient/auth_4.out
@@ -5,5 +5,5 @@ Sent Access-Request Id 123 from 0.0.0.0:1234 to 127.0.0.1:12340 length 51
         NAS-Identifier = "auth_4"
 Received Access-Accept Id 123 from 127.0.0.1:12340 to 0.0.0.0:1234 via lo length 47 
         Class = 0x483d342c493d34
-        Attr-26 = 0x483d342c493d34
-        Attr-26 = 0x483d342c493d43
+        raw.Vendor-Specific = 0x483d342c493d34
+        raw.Vendor-Specific = 0x483d342c493d43