]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
EAP-FAST: Check sha1_t_prf() result in eap_fast_get_cmk()
authorJouni Malinen <jouni@qca.qualcomm.com>
Mon, 16 May 2016 19:24:01 +0000 (22:24 +0300)
committerJouni Malinen <j@w1.fi>
Mon, 16 May 2016 19:24:01 +0000 (22:24 +0300)
This gets rid of a valgrind warning on uninitialized memory read in the
eap_proto_fast_errors test case where the result was used after the
failed sha1_t_prf() call.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
src/eap_peer/eap_fast.c

index f03cd4af5c98cce1532ac73675ab42efe764cea2..7d954182ca009bd0ac9b878d9abdd72f8f103a75 100644 (file)
@@ -710,9 +710,10 @@ static int eap_fast_get_cmk(struct eap_sm *sm, struct eap_fast_data *data,
        if (eap_fast_get_phase2_key(sm, data, isk, sizeof(isk)) < 0)
                return -1;
        wpa_hexdump_key(MSG_MSGDUMP, "EAP-FAST: ISK[j]", isk, sizeof(isk));
-       sha1_t_prf(data->simck, EAP_FAST_SIMCK_LEN,
-                  "Inner Methods Compound Keys",
-                  isk, sizeof(isk), imck, sizeof(imck));
+       if (sha1_t_prf(data->simck, EAP_FAST_SIMCK_LEN,
+                      "Inner Methods Compound Keys",
+                      isk, sizeof(isk), imck, sizeof(imck)) < 0)
+               return -1;
        data->simck_idx++;
        os_memcpy(data->simck, imck, EAP_FAST_SIMCK_LEN);
        wpa_hexdump_key(MSG_MSGDUMP, "EAP-FAST: S-IMCK[j]",