minor cleanups for EAP attributes and rearrangements

diff --git a/src/lib/eap_aka_sim/attrs.h b/src/lib/eap_aka_sim/attrs.h
index b77ce8f26aa3c19b43517cdafe8dad7d9aed1589..f185b405e35251744cdd0d4cba2fe483f905f0b6 100644 (file)
--- a/src/lib/eap_aka_sim/attrs.h
+++ b/src/lib/eap_aka_sim/attrs.h
@@ -63,7 +63,6 @@ extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_next_reauth_id;
 extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_nonce_mt;
 extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_nonce_s;
 extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_notification;
-extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_padding;
 extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_permanent_id_req;
 extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_permanent_identity;
 extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_rand;

diff --git a/src/lib/eap_aka_sim/base.c b/src/lib/eap_aka_sim/base.c
index 14dd7c8ffbb61b41ffb00be0324bbde564e99baf..cf035434f5cc3f92bfa0ea6b6f33f65ae6b10667 100644 (file)
--- a/src/lib/eap_aka_sim/base.c
+++ b/src/lib/eap_aka_sim/base.c
@@ -89,7 +89,6 @@ fr_dict_attr_t const *attr_eap_aka_sim_next_reauth_id;
 fr_dict_attr_t const *attr_eap_aka_sim_nonce_mt;
 fr_dict_attr_t const *attr_eap_aka_sim_nonce_s;
 fr_dict_attr_t const *attr_eap_aka_sim_notification;
-fr_dict_attr_t const *attr_eap_aka_sim_padding;
 fr_dict_attr_t const *attr_eap_aka_sim_permanent_id_req;
 fr_dict_attr_t const *attr_eap_aka_sim_permanent_identity;
 fr_dict_attr_t const *attr_eap_aka_sim_rand;
@@ -125,9 +124,6 @@ fr_dict_attr_autoload_t libfreeradius_aka_sim_dict_attr[] = {
        { .out = &attr_eap_aka_sim_checkcode, .name = "Checkcode", .type = FR_TYPE_OCTETS, .dict = &dict_eap_aka_sim },
        { .out = &attr_eap_aka_sim_ck, .name = "CK", .type = FR_TYPE_OCTETS, .dict = &dict_eap_aka_sim },
        { .out = &attr_eap_aka_sim_client_error_code, .name = "Client-Error-Code", .type = FR_TYPE_UINT16, .dict = &dict_eap_aka_sim },
-       { .out = &attr_eap_aka_sim_counter, .name = "Encr-Data.Counter", .type = FR_TYPE_UINT16, .dict = &dict_eap_aka_sim },
-       { .out = &attr_eap_aka_sim_counter_too_small, .name = "Encr-Data.Counter-Too-Small", .type = FR_TYPE_BOOL, .dict = &dict_eap_aka_sim },
-       { .out = &attr_eap_aka_sim_encr_data, .name = "Encr-Data", .type = FR_TYPE_TLV, .dict = &dict_eap_aka_sim },
        { .out = &attr_eap_aka_sim_fullauth_id_req, .name = "Fullauth-ID-Req", .type = FR_TYPE_BOOL, .dict = &dict_eap_aka_sim },
        { .out = &attr_eap_aka_sim_hmac_extra_request, .name = "HMAC-Extra-Request", .type = FR_TYPE_OCTETS, .dict = &dict_eap_aka_sim },
        { .out = &attr_eap_aka_sim_hmac_extra_response, .name = "HMAC-Extra-Response", .type = FR_TYPE_OCTETS, .dict = &dict_eap_aka_sim },
@@ -145,12 +141,8 @@ fr_dict_attr_autoload_t libfreeradius_aka_sim_dict_attr[] = {
        { .out = &attr_eap_aka_sim_mac, .name = "MAC", .type = FR_TYPE_OCTETS, .dict = &dict_eap_aka_sim },
        { .out = &attr_eap_aka_sim_method_hint, .name = "Method-Hint", .type = FR_TYPE_UINT32, .dict = &dict_eap_aka_sim },
        { .out = &attr_eap_aka_sim_mk, .name = "MK", .type = FR_TYPE_OCTETS, .dict = &dict_eap_aka_sim },
-       { .out = &attr_eap_aka_sim_next_pseudonym, .name = "Encr-Data.Next-Pseudonym", .type = FR_TYPE_STRING, .dict = &dict_eap_aka_sim },
-       { .out = &attr_eap_aka_sim_next_reauth_id, .name = "Encr-Data.Next-Reauth-ID", .type = FR_TYPE_STRING, .dict = &dict_eap_aka_sim },
        { .out = &attr_eap_aka_sim_nonce_mt, .name = "Nonce-MT", .type = FR_TYPE_OCTETS, .dict = &dict_eap_aka_sim },
-       { .out = &attr_eap_aka_sim_nonce_s, .name = "Encr-Data.Nonce-S", .type = FR_TYPE_OCTETS, .dict = &dict_eap_aka_sim },
        { .out = &attr_eap_aka_sim_notification, .name = "Notification", .type = FR_TYPE_UINT16, .dict = &dict_eap_aka_sim },
-       { .out = &attr_eap_aka_sim_padding, .name = "Encr-Data.Padding", .type = FR_TYPE_OCTETS, .dict = &dict_eap_aka_sim },
        { .out = &attr_eap_aka_sim_permanent_id_req, .name = "Permanent-Id-Req", .type = FR_TYPE_BOOL, .dict = &dict_eap_aka_sim },
        { .out = &attr_eap_aka_sim_permanent_identity, .name = "Permanent-Identity", .type = FR_TYPE_STRING, .dict = &dict_eap_aka_sim },
        { .out = &attr_eap_aka_sim_rand, .name = "RAND", .type = FR_TYPE_OCTETS, .dict = &dict_eap_aka_sim },
@@ -164,6 +156,13 @@ fr_dict_attr_autoload_t libfreeradius_aka_sim_dict_attr[] = {
        { .out = &attr_session_data, .name = "Session-Data", .type = FR_TYPE_OCTETS, .dict = &dict_eap_aka_sim },
        { .out = &attr_session_id, .name = "Session-Id", .type = FR_TYPE_OCTETS, .dict = &dict_eap_aka_sim },
 
+       { .out = &attr_eap_aka_sim_encr_data, .name = "Encr-Data", .type = FR_TYPE_TLV, .dict = &dict_eap_aka_sim },
+       { .out = &attr_eap_aka_sim_counter, .name = "Encr-Data.Counter", .type = FR_TYPE_UINT16, .dict = &dict_eap_aka_sim },
+       { .out = &attr_eap_aka_sim_nonce_s, .name = "Encr-Data.Nonce-S", .type = FR_TYPE_OCTETS, .dict = &dict_eap_aka_sim },
+       { .out = &attr_eap_aka_sim_next_pseudonym, .name = "Encr-Data.Next-Pseudonym", .type = FR_TYPE_STRING, .dict = &dict_eap_aka_sim },
+       { .out = &attr_eap_aka_sim_next_reauth_id, .name = "Encr-Data.Next-Reauth-ID", .type = FR_TYPE_STRING, .dict = &dict_eap_aka_sim },
+       { .out = &attr_eap_aka_sim_counter_too_small, .name = "Encr-Data.Counter-Too-Small", .type = FR_TYPE_BOOL, .dict = &dict_eap_aka_sim },
+
        { .out = &attr_ms_mppe_send_key, .name = "Vendor-Specific.Microsoft.MPPE-Send-Key", .type = FR_TYPE_OCTETS, .dict = &dict_radius },
        { .out = &attr_ms_mppe_recv_key, .name = "Vendor-Specific.Microsoft.MPPE-Recv-Key", .type = FR_TYPE_OCTETS, .dict = &dict_radius },