From 6b1bbb11b36644b06dedef94369d3e6142f9c592 Mon Sep 17 00:00:00 2001 From: "Alan T. DeKok" Date: Thu, 15 Jul 2010 14:13:17 +0200 Subject: [PATCH] Updates to use new octets[#] code, and added VALUEs for some attributes --- share/dictionary.microsoft | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/share/dictionary.microsoft b/share/dictionary.microsoft index 5500619..5b18947 100644 --- a/share/dictionary.microsoft +++ b/share/dictionary.microsoft @@ -8,17 +8,26 @@ VENDOR Microsoft 311 BEGIN-VENDOR Microsoft -ATTRIBUTE MS-CHAP-Response 1 octets +ATTRIBUTE MS-CHAP-Response 1 octets[50] ATTRIBUTE MS-CHAP-Error 2 string -ATTRIBUTE MS-CHAP-CPW-1 3 octets -ATTRIBUTE MS-CHAP-CPW-2 4 octets +ATTRIBUTE MS-CHAP-CPW-1 3 octets[70] +ATTRIBUTE MS-CHAP-CPW-2 4 octets[84] ATTRIBUTE MS-CHAP-LM-Enc-PW 5 octets ATTRIBUTE MS-CHAP-NT-Enc-PW 6 octets -ATTRIBUTE MS-MPPE-Encryption-Policy 7 octets +ATTRIBUTE MS-MPPE-Encryption-Policy 7 integer + +VALUE MS-MPPE-Encryption-Policy Encryption-Allowed 1 +VALUE MS-MPPE-Encryption-Policy Encryption-Required 2 + # This is referred to as both singular and plural in the RFC. # Plural seems to make more sense. -ATTRIBUTE MS-MPPE-Encryption-Type 8 octets -ATTRIBUTE MS-MPPE-Encryption-Types 8 octets +ATTRIBUTE MS-MPPE-Encryption-Type 8 integer +ATTRIBUTE MS-MPPE-Encryption-Types 8 integer + +VALUE MS-MPPE-Encryption-Types RC4-40bit-Allowed 1 +VALUE MS-MPPE-Encryption-Types RC4-128bit-Allowed 2 +VALUE MS-MPPE-Encryption-Types RC4-40or128-bit-Allowed 6 + ATTRIBUTE MS-RAS-Vendor 9 integer # content is Vendor-ID ATTRIBUTE MS-CHAP-Domain 10 string ATTRIBUTE MS-CHAP-Challenge 11 octets @@ -37,16 +46,16 @@ ATTRIBUTE MS-Filter 22 octets ATTRIBUTE MS-Acct-Auth-Type 23 integer ATTRIBUTE MS-Acct-EAP-Type 24 integer -ATTRIBUTE MS-CHAP2-Response 25 octets +ATTRIBUTE MS-CHAP2-Response 25 octets[50] ATTRIBUTE MS-CHAP2-Success 26 octets -ATTRIBUTE MS-CHAP2-CPW 27 octets +ATTRIBUTE MS-CHAP2-CPW 27 octets[68] ATTRIBUTE MS-Primary-DNS-Server 28 ipaddr ATTRIBUTE MS-Secondary-DNS-Server 29 ipaddr ATTRIBUTE MS-Primary-NBNS-Server 30 ipaddr ATTRIBUTE MS-Secondary-NBNS-Server 31 ipaddr -#ATTRIBUTE MS-ARAP-Challenge 33 octets +#ATTRIBUTE MS-ARAP-Challenge 33 octets[8] ## MS-RNAP # -- 2.1.4