From: Arran Cudbard-Bell Date: Sun, 27 Jan 2019 17:05:29 +0000 (+0700) Subject: Fix dictionary lookups for eap_msk and eap_emsk X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e96aa17f4fb256ce0b72f5195e25cf47aced41f;p=thirdparty%2Ffreeradius-server.git Fix dictionary lookups for eap_msk and eap_emsk --- diff --git a/src/modules/rlm_eap/types/rlm_eap_fast/rlm_eap_fast.c b/src/modules/rlm_eap/types/rlm_eap_fast/rlm_eap_fast.c index bfb2389c9bb..996dd3fd4ac 100644 --- a/src/modules/rlm_eap/types/rlm_eap_fast/rlm_eap_fast.c +++ b/src/modules/rlm_eap/types/rlm_eap_fast/rlm_eap_fast.c @@ -86,6 +86,8 @@ fr_dict_autoload_t rlm_eap_fast_dict[] = { { NULL } }; +fr_dict_attr_t const *attr_eap_emsk; +fr_dict_attr_t const *attr_eap_msk; fr_dict_attr_t const *attr_eap_tls_require_client_cert; fr_dict_attr_t const *attr_eap_type; fr_dict_attr_t const *attr_ms_chap_challenge; @@ -93,8 +95,6 @@ fr_dict_attr_t const *attr_ms_chap_peer_challenge; fr_dict_attr_t const *attr_proxy_to_realm; fr_dict_attr_t const *attr_eap_message; -fr_dict_attr_t const *attr_eap_msk; -fr_dict_attr_t const *attr_eap_emsk; fr_dict_attr_t const *attr_freeradius_proxied_to; fr_dict_attr_t const *attr_ms_mppe_send_key; fr_dict_attr_t const *attr_ms_mppe_recv_key; @@ -131,6 +131,8 @@ fr_dict_attr_t const *attr_eap_fast_vendor_specific; extern fr_dict_attr_autoload_t rlm_eap_fast_dict_attr[]; fr_dict_attr_autoload_t rlm_eap_fast_dict_attr[] = { + { .out = &attr_eap_emsk, .name = "EAP-EMSK", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius }, + { .out = &attr_eap_msk, .name = "EAP-MSK", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius }, { .out = &attr_eap_tls_require_client_cert, .name = "EAP-TLS-Require-Client-Cert", .type = FR_TYPE_UINT32, .dict = &dict_freeradius }, { .out = &attr_eap_type, .name = "EAP-Type", .type = FR_TYPE_UINT32, .dict = &dict_freeradius }, { .out = &attr_ms_chap_challenge, .name = "MS-CHAP-Challenge", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius }, @@ -138,8 +140,6 @@ fr_dict_attr_autoload_t rlm_eap_fast_dict_attr[] = { { .out = &attr_proxy_to_realm, .name = "Proxy-To-Realm", .type = FR_TYPE_STRING, .dict = &dict_freeradius }, { .out = &attr_eap_message, .name = "EAP-Message", .type = FR_TYPE_OCTETS, .dict = &dict_radius }, - { .out = &attr_eap_msk, .name = "EAP-MSK", .type = FR_TYPE_OCTETS, .dict = &dict_radius }, - { .out = &attr_eap_emsk, .name = "EAP-EMSK", .type = FR_TYPE_OCTETS, .dict = &dict_radius }, { .out = &attr_freeradius_proxied_to, .name = "FreeRADIUS-Proxied-To", .type = FR_TYPE_IPV4_ADDR, .dict = &dict_radius }, { .out = &attr_ms_mppe_send_key, .name = "MS-MPPE-Send-Key", .type = FR_TYPE_OCTETS, .dict = &dict_radius }, { .out = &attr_ms_mppe_recv_key, .name = "MS-MPPE-Recv-Key", .type = FR_TYPE_OCTETS, .dict = &dict_radius }, diff --git a/src/modules/rlm_wimax/rlm_wimax.c b/src/modules/rlm_wimax/rlm_wimax.c index a73fd208a39..d821c8f8f99 100644 --- a/src/modules/rlm_wimax/rlm_wimax.c +++ b/src/modules/rlm_wimax/rlm_wimax.c @@ -58,12 +58,13 @@ fr_dict_autoload_t rlm_wimax_dict[] = { { NULL } }; -static fr_dict_attr_t const *attr_calling_station_id; -static fr_dict_attr_t const *attr_eap_msk; static fr_dict_attr_t const *attr_eap_emsk; +static fr_dict_attr_t const *attr_eap_msk; +static fr_dict_attr_t const *attr_wimax_mn_nai; + +static fr_dict_attr_t const *attr_calling_station_id; static fr_dict_attr_t const *attr_wimax_msk; -static fr_dict_attr_t const *attr_wimax_mn_nai; static fr_dict_attr_t const *attr_wimax_ip_technology; static fr_dict_attr_t const *attr_wimax_mn_hha_mip4_key; static fr_dict_attr_t const *attr_wimax_mn_hha_mip4_spi; @@ -82,13 +83,13 @@ static fr_dict_attr_t const *attr_ms_mppe_recv_key; extern fr_dict_attr_autoload_t rlm_wimax_dict_attr[]; fr_dict_attr_autoload_t rlm_wimax_dict_attr[] = { - { .out = &attr_calling_station_id, .name = "Calling-Station-ID", .type = FR_TYPE_STRING, .dict = &dict_radius }, + { .out = &attr_eap_emsk, .name = "EAP-EMSK", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius }, + { .out = &attr_eap_msk, .name = "EAP-MSK", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius }, + { .out = &attr_wimax_mn_nai, .name = "WiMAX-MN-NAI", .type = FR_TYPE_STRING, .dict = &dict_freeradius }, - { .out = &attr_eap_msk, .name = "EAP-MSK", .type = FR_TYPE_OCTETS, .dict = &dict_radius }, - { .out = &attr_eap_emsk, .name = "EAP-EMSK", .type = FR_TYPE_OCTETS, .dict = &dict_radius }, + { .out = &attr_calling_station_id, .name = "Calling-Station-ID", .type = FR_TYPE_STRING, .dict = &dict_radius }, { .out = &attr_wimax_msk, .name = "WiMAX-MSK", .type = FR_TYPE_OCTETS, .dict = &dict_radius }, - { .out = &attr_wimax_mn_nai, .name = "WiMAX-MN-NAI", .type = FR_TYPE_STRING, .dict = &dict_freeradius }, { .out = &attr_wimax_ip_technology, .name = "WiMAX-IP-Technology", .type = FR_TYPE_UINT32, .dict = &dict_radius }, { .out = &attr_wimax_mn_hha_mip4_key, .name = "WiMAX-MN-hHA-MIP4-Key", .type = FR_TYPE_OCTETS, .dict = &dict_radius }, { .out = &attr_wimax_mn_hha_mip4_spi, .name = "WiMAX-MN-hHA-MIP4-SPI", .type = FR_TYPE_UINT32, .dict = &dict_radius },