Don't include unused calls to SHA256 functions if EAP-AKA' is not enabled

This commit is contained in:
Jouni Malinen 2008-12-11 00:49:39 +02:00
parent 1edb9533f1
commit 3ee81d489a

View file

@ -340,9 +340,11 @@ static void eap_aka_add_checkcode(struct eap_aka_data *data,
addr = wpabuf_head(data->id_msgs); addr = wpabuf_head(data->id_msgs);
len = wpabuf_len(data->id_msgs); len = wpabuf_len(data->id_msgs);
wpa_hexdump(MSG_MSGDUMP, "EAP-AKA: AT_CHECKCODE data", addr, len); wpa_hexdump(MSG_MSGDUMP, "EAP-AKA: AT_CHECKCODE data", addr, len);
#ifdef EAP_AKA_PRIME
if (data->eap_method == EAP_TYPE_AKA_PRIME) if (data->eap_method == EAP_TYPE_AKA_PRIME)
sha256_vector(1, &addr, &len, hash); sha256_vector(1, &addr, &len, hash);
else else
#endif /* EAP_AKA_PRIME */
sha1_vector(1, &addr, &len, hash); sha1_vector(1, &addr, &len, hash);
eap_sim_msg_add(msg, EAP_SIM_AT_CHECKCODE, 0, hash, eap_sim_msg_add(msg, EAP_SIM_AT_CHECKCODE, 0, hash,
@ -385,9 +387,11 @@ static int eap_aka_verify_checkcode(struct eap_aka_data *data,
/* Checkcode is SHA1/SHA256 hash over all EAP-AKA/Identity packets. */ /* Checkcode is SHA1/SHA256 hash over all EAP-AKA/Identity packets. */
addr = wpabuf_head(data->id_msgs); addr = wpabuf_head(data->id_msgs);
len = wpabuf_len(data->id_msgs); len = wpabuf_len(data->id_msgs);
#ifdef EAP_AKA_PRIME
if (data->eap_method == EAP_TYPE_AKA_PRIME) if (data->eap_method == EAP_TYPE_AKA_PRIME)
sha256_vector(1, &addr, &len, hash); sha256_vector(1, &addr, &len, hash);
else else
#endif /* EAP_AKA_PRIME */
sha1_vector(1, &addr, &len, hash); sha1_vector(1, &addr, &len, hash);
if (os_memcmp(hash, checkcode, hash_len) != 0) { if (os_memcmp(hash, checkcode, hash_len) != 0) {