Fix typo in rlm_eap_aka autoload symbol

diff --git a/scripts/autoload_defs.sh b/scripts/autoload_defs.sh
index f8202c680d4d9971b91777ba552dc6a6ce24aa20..424ed9da4c90cce981dd72e1e07ad4b42aee6819 100755 (executable)
--- a/scripts/autoload_defs.sh
+++ b/scripts/autoload_defs.sh
@@ -60,8 +60,8 @@ done
 
 echo
 
-printf "extern fr_dict_attr_autoload_t %s_attr[];\n" $FILE
-printf "fr_dict_attr_autoload_t %s_attr[] = {\n" $FILE
+printf "extern fr_dict_attr_autoload_t %s_dict_attr[];\n" $FILE
+printf "fr_dict_attr_autoload_t %s_dict_attr[] = {\n" $FILE
 
 for i in ${RESOLVED[*]}; do
        if echo $i | cut -f 5 | grep 'internal' > /dev/null; then

diff --git a/src/modules/rlm_eap/types/rlm_eap_aka/rlm_eap_aka.c b/src/modules/rlm_eap/types/rlm_eap_aka/rlm_eap_aka.c
index f6d2a2896feb0a2cde0ab26e20d739b5d2552f42..4366bc902a034ea16599817b7e9ed9d7f1b1aabb 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_aka/rlm_eap_aka.c
+++ b/src/modules/rlm_eap/types/rlm_eap_aka/rlm_eap_aka.c
@@ -87,8 +87,8 @@ static fr_dict_attr_t const *attr_eap_aka_rand;
 static fr_dict_attr_t const *attr_eap_aka_res;
 static fr_dict_attr_t const *attr_eap_aka_result_ind;
 
-extern fr_dict_attr_autoload_t rlm_eap_aka_attr[];
-fr_dict_attr_autoload_t rlm_eap_aka_attr[] = {
+extern fr_dict_attr_autoload_t rlm_eap_aka_dict_attr[];
+fr_dict_attr_autoload_t rlm_eap_aka_dict_attr[] = {
        { .out = &attr_eap_aka_root, .name = "EAP-AKA-Root", .type = FR_TYPE_TLV, .dict = &dict_freeradius},
        { .out = &attr_eap_aka_subtype, .name = "EAP-AKA-Subtype", .type = FR_TYPE_UINT32, .dict = &dict_freeradius},
        { .out = &attr_sim_amf, .name = "SIM-AMF", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius},
@@ -1134,8 +1134,8 @@ static rlm_rcode_t mod_session_init(void *instance, eap_session_t *eap_session)
                eap_aka_session->type = FR_EAP_AKA_PRIME;
                eap_aka_session->kdf = FR_EAP_AKA_KDF_VALUE_EAP_AKA_PRIME_WITH_CK_PRIME_IK_PRIME;
                eap_aka_session->checkcode_md = eap_aka_session->mac_md = EVP_sha256();
-               eap_aka_session->keys.network = (uint8_t *) talloc_bstrndup(eap_aka_session, inst->network_name,
-                                                                           talloc_array_length(inst->network_name) - 1);
+               eap_aka_session->keys.network = (uint8_t *)talloc_bstrndup(eap_aka_session, inst->network_name,
+                                                                          talloc_array_length(inst->network_name) - 1);
                eap_aka_session->keys.network_len = talloc_array_length(eap_aka_session->keys.network) - 1;
                switch (method) {
                default:

diff --git a/src/tests/eapol_test/config/servers.conf b/src/tests/eapol_test/config/servers.conf
index 552a5d503f75a90ef51341aa46a01cb335f4f3b8..84340b88689a7ffa0cbd13cfd45968dfa732dca8 100644 (file)
--- a/src/tests/eapol_test/config/servers.conf
+++ b/src/tests/eapol_test/config/servers.conf
@@ -120,9 +120,9 @@ server test {
 
                # Test credentials for EAP-SIM, EAP-AKA, EAP-AKA'
                 update control {
-                        Sim-Ki  := 0x465b5ce8b199b49faa5f0a2ee238a6bc
-                        Sim-Opc := 0xcd63cb71954a9f4e48a5994e37a02baf
-                        Sim-SQN := 3
+                        &Sim-Ki  := 0x465b5ce8b199b49faa5f0a2ee238a6bc
+                        &Sim-Opc := 0xcd63cb71954a9f4e48a5994e37a02baf
+                        &Sim-SQN := 3
                 }
                files
                eap