EAP-GPSK: Pass EAP identifier instead of full request

This simplifies analysis of areas that get access to unverified message
payload.

Signed-off-by: Jouni Malinen <j@w1.fi>

diff --git a/src/eap_peer/eap_gpsk.c b/src/eap_peer/eap_gpsk.c
index c54bf116477c8a76f058b33c34f2edb5b72f2256..902b4ba26d6e46b6a10019bd8c958e4deb7fc985 100644 (file)
--- a/src/eap_peer/eap_gpsk.c
+++ b/src/eap_peer/eap_gpsk.c
@@ -274,7 +274,7 @@ static const u8 * eap_gpsk_process_csuite_list(struct eap_sm *sm,
 static struct wpabuf * eap_gpsk_process_gpsk_1(struct eap_sm *sm,
                                               struct eap_gpsk_data *data,
                                               struct eap_method_ret *ret,
-                                              const struct wpabuf *reqData,
+                                              u8 identifier,
                                               const u8 *payload,
                                               size_t payload_len)
 {
@@ -301,7 +301,7 @@ static struct wpabuf * eap_gpsk_process_gpsk_1(struct eap_sm *sm,
                return NULL;
        }
 
-       resp = eap_gpsk_send_gpsk_2(data, eap_get_id(reqData),
+       resp = eap_gpsk_send_gpsk_2(data, identifier,
                                    csuite_list, csuite_list_len);
        if (resp == NULL)
                return NULL;
@@ -583,7 +583,7 @@ static const u8 * eap_gpsk_validate_gpsk_3_mic(struct eap_gpsk_data *data,
 static struct wpabuf * eap_gpsk_process_gpsk_3(struct eap_sm *sm,
                                               struct eap_gpsk_data *data,
                                               struct eap_method_ret *ret,
-                                              const struct wpabuf *reqData,
+                                              u8 identifier,
                                               const u8 *payload,
                                               size_t payload_len)
 {
@@ -615,7 +615,7 @@ static struct wpabuf * eap_gpsk_process_gpsk_3(struct eap_sm *sm,
                           (unsigned long) (end - pos));
        }
 
-       resp = eap_gpsk_send_gpsk_4(data, eap_get_id(reqData));
+       resp = eap_gpsk_send_gpsk_4(data, identifier);
        if (resp == NULL)
                return NULL;
 
@@ -670,6 +670,7 @@ static struct wpabuf * eap_gpsk_process(struct eap_sm *sm, void *priv,
        struct wpabuf *resp;
        const u8 *pos;
        size_t len;
+       u8 opcode, id;
 
        pos = eap_hdr_validate(EAP_VENDOR_IETF, EAP_TYPE_GPSK, reqData, &len);
        if (pos == NULL || len < 1) {
@@ -677,25 +678,27 @@ static struct wpabuf * eap_gpsk_process(struct eap_sm *sm, void *priv,
                return NULL;
        }
 
-       wpa_printf(MSG_DEBUG, "EAP-GPSK: Received frame: opcode %d", *pos);
+       id = eap_get_id(reqData);
+       opcode = *pos++;
+       len--;
+       wpa_printf(MSG_DEBUG, "EAP-GPSK: Received frame: opcode %d", opcode);
 
        ret->ignore = FALSE;
        ret->methodState = METHOD_MAY_CONT;
        ret->decision = DECISION_FAIL;
        ret->allowNotifications = FALSE;
 
-       switch (*pos) {
+       switch (opcode) {
        case EAP_GPSK_OPCODE_GPSK_1:
-               resp = eap_gpsk_process_gpsk_1(sm, data, ret, reqData,
-                                              pos + 1, len - 1);
+               resp = eap_gpsk_process_gpsk_1(sm, data, ret, id, pos, len);
                break;
        case EAP_GPSK_OPCODE_GPSK_3:
-               resp = eap_gpsk_process_gpsk_3(sm, data, ret, reqData,
-                                              pos + 1, len - 1);
+               resp = eap_gpsk_process_gpsk_3(sm, data, ret, id, pos, len);
                break;
        default:
-               wpa_printf(MSG_DEBUG, "EAP-GPSK: Ignoring message with "
-                          "unknown opcode %d", *pos);
+               wpa_printf(MSG_DEBUG,
+                          "EAP-GPSK: Ignoring message with unknown opcode %d",
+                          opcode);
                ret->ignore = TRUE;
                return NULL;
        }