[PATCH 36/44] FT: include identity and radius_cui in pull/resp frames

[Jouni Malinen]

On Wed, Feb 24, 2016 at 12:53:42PM +0100, michael-dev at fami-braun.de wrote:
> diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
> @@ -957,8 +957,12 @@ int handle_auth_cfg_sta(struct hostapd_data *hapd, struct sta_info *sta,
> +	if (sta->identity)
> +		os_free(sta->identity);

os_free(NULL) is fine. There should be no if (ptr) before it.

> diff --git a/src/ap/wpa_auth.h b/src/ap/wpa_auth.h
> @@ -93,13 +98,19 @@ struct ft_r0kh_r1kh_resp_frame {
>  	le16 pairwise;
>  	le16 expiresIn; /* 0xffff for no-entry */
>  	struct ft_vlan vlan;
> +	u8 identity_len;
> +	u8 identity[FT_IDENTITY_LEN];
> +	u8 radius_cui_len;
> +	u8 radius_cui[FT_RADIUS_CUI_LEN];
>  	u8 pad[FT_R0KH_R1KH_RESP_PAD_LEN]; /* 8-octet boundary for AES block */
>  	u8 key_wrap_extra[8];
>  } STRUCT_PACKED;

Wouldn't this break compatibility with older hostapd versions? This is
supposed to be a protocol definition and changes should be done in a
manner that maintains backwards compatibility. That said, I would not be
surprised if it is impossible to extend the current protocol design
here, so this may require changes that come up with a new AP-to-AP
protocol that is done in a way that can be extended without breaking
compatibility with older versions.


> diff --git a/tests/hwsim/test_ap_ft.py b/tests/hwsim/test_ap_ft.py

Please keep tests/* changes in separate commits. There are use cases
where hostap.git commits are merged into trees that do not include the
tests directory structure and even without that, it is more convenient
to git cherry-pick implementation changes without having to depend on
the tests/hwsim/* files being up-to-date.

-- 
Jouni Malinen                                            PGP id EFC895FA