No commit message

MetSystem · Jun 15, 2013 · ab62e52 · ab62e52
1 parent 43f3459
commit ab62e52
Show file tree

Hide file tree

Showing 4 changed files with 536 additions and 2 deletions.
diff --git a/WinRadius/src/modules/rlm_eap/eap_aka.h b/WinRadius/src/modules/rlm_eap/eap_aka.h
@@ -35,7 +35,7 @@ RCSIDH(eap_aka_h, "$Id$")
 enum eapaka_subtype {
   eapaka_challenge   = 1,
   eapaka_authentication_reject = 2,
-  eapaka_synchronization_failure = 4,	//add by wuweijie 2012-07-12 for sqn sync
+  eapaka_synchronization_failure = 4,	
   eapaka_notification= 12,
   eapaka_reauth      = 13,
   eapaka_client_error = 14,
@@ -101,7 +101,7 @@ struct eapaka_keys {
   unsigned char ik[EAPAKA_IK_SIZE];
   unsigned char ck[EAPAKA_CK_SIZE];
   unsigned char res[EAPSIM_RES_SIZE];
-  unsigned char auts[14]; //add by wuweijie 2012-07-20 for sqn sync
+  unsigned char auts[14]; 
   /*unsigned char ak[6];
   unsigned char k[16];
   unsigned char sqn[6];

diff --git a/WinRadius/src/modules/rlm_eap/eap_sim.h b/WinRadius/src/modules/rlm_eap/eap_sim.h
@@ -53,6 +53,15 @@ RCSIDH(eap_sim_h, "$Id$")
 #define ATTRIBUTE_EAP_SIM_KC2           1213
 #define ATTRIBUTE_EAP_SIM_KC3           1214
 
+#define ATTRIBUTE_EAP_AKA_IK            1215	
+#define ATTRIBUTE_EAP_AKA_CK            1216
+#define ATTRIBUTE_EAP_AKA_SQN			1217
+#define ATTRIBUTE_EAP_AKA_K				1218
+#define ATTRIBUTE_EAP_AKA_AMF			1219
+#define ATTRIBUTE_EAP_AKA_OP			1220
+#define ATTRIBUTE_EAP_AKA_MODEL			1221
+#define ATTRIBUTE_EAP_AKA_OPC        	1222
+
 enum eapsim_subtype {
   eapsim_start       = 10,
   eapsim_challenge   = 11,
@@ -81,6 +90,9 @@ enum eapsim_serverstates {
 };
 
 #define PW_EAP_SIM_RAND                 1
+#define PW_EAP_SIM_AUTN                 2	
+#define PW_EAP_SIM_RES                  3	
+#define PW_EAP_SIM_AUTS					4	
 #define PW_EAP_SIM_PADDING              6
 #define PW_EAP_SIM_NONCE_MT             7
 #define PW_EAP_SIM_PERMANENT_ID_REQ    10
@@ -94,6 +106,7 @@ enum eapsim_serverstates {
 #define PW_EAP_SIM_COUNTER             19
 #define PW_EAP_SIM_COUNTER_TOO_SMALL   20
 #define PW_EAP_SIM_NONCE_S             21
+#define PW_EAP_SIM_CLIENT_ERROR_CODE   22	
 #define PW_EAP_SIM_IV                 129
 #define PW_EAP_SIM_ENCR_DATA          130
 #define PW_EAP_SIM_NEXT_PSEUDONUM     132
@@ -125,6 +138,8 @@ extern int unmap_eapsim_basictypes(RADIUS_PACKET *r,
 #define EAPSIM_CALCMAC_SIZE 20
 #define EAPSIM_NONCEMT_SIZE 16
 #define EAPSIM_AUTH_SIZE    16
+#define EAPSIM_AUTN_SIZE    16	
+#define EAPSIM_RES_SIZE     16	
 
 struct eapsim_keys {
   /* inputs */

diff --git a/WinRadius/src/modules/rlm_eap/eap_types.h b/WinRadius/src/modules/rlm_eap/eap_types.h
@@ -53,6 +53,7 @@ RCSIDH(eap_types_h, "$Id$")
 #define PW_EAP_LEAP		17
 #define PW_EAP_SIM              18
 #define PW_EAP_TTLS		21
+#define PW_EAP_AKA              23
 #define PW_EAP_PEAP		25
 #define PW_EAP_MSCHAPV2		26
 #define PW_EAP_CISCO_MSCHAPV2	29