summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstsp <stsp@openbsd.org>2020-05-31 09:11:12 +0000
committerstsp <stsp@openbsd.org>2020-05-31 09:11:12 +0000
commitfbf3f982a542f8250e3dc06ba428c97b9d46bbe2 (patch)
tree3c6f10a7d77c6d1341dcc5d9c1c7573101bf9290
parentRemove a dead assignment to ni_rsn_state in ieee80211_node_leave_rsn(). (diff)
downloadwireguard-openbsd-fbf3f982a542f8250e3dc06ba428c97b9d46bbe2.tar.xz
wireguard-openbsd-fbf3f982a542f8250e3dc06ba428c97b9d46bbe2.zip
Typo in WPA supplicant state machine: RNSA_SUPP_PTKDONE -> RSNA_SUPP_PTKDONE
-rw-r--r--sys/net80211/ieee80211_node.h4
-rw-r--r--sys/net80211/ieee80211_pae_input.c8
-rw-r--r--sys/net80211/ieee80211_pae_output.c4
3 files changed, 8 insertions, 8 deletions
diff --git a/sys/net80211/ieee80211_node.h b/sys/net80211/ieee80211_node.h
index 3399e1cd575..4256a8add05 100644
--- a/sys/net80211/ieee80211_node.h
+++ b/sys/net80211/ieee80211_node.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_node.h,v 1.85 2020/01/15 09:34:27 phessler Exp $ */
+/* $OpenBSD: ieee80211_node.h,v 1.86 2020/05/31 09:11:12 stsp Exp $ */
/* $NetBSD: ieee80211_node.h,v 1.9 2004/04/30 22:57:32 dyoung Exp $ */
/*-
@@ -172,7 +172,7 @@ enum {
RSNA_SUPP_INITIALIZE, /* not expecting any messages */
RSNA_SUPP_PTKSTART, /* awaiting handshake message 1 */
RSNA_SUPP_PTKNEGOTIATING, /* got message 1 and derived PTK */
- RNSA_SUPP_PTKDONE /* got message 3 and authenticated AP */
+ RSNA_SUPP_PTKDONE /* got message 3 and authenticated AP */
};
struct ieee80211_rxinfo {
diff --git a/sys/net80211/ieee80211_pae_input.c b/sys/net80211/ieee80211_pae_input.c
index 73d028e9995..333f6c1b22a 100644
--- a/sys/net80211/ieee80211_pae_input.c
+++ b/sys/net80211/ieee80211_pae_input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_pae_input.c,v 1.33 2019/09/02 12:54:21 stsp Exp $ */
+/* $OpenBSD: ieee80211_pae_input.c,v 1.34 2020/05/31 09:11:12 stsp Exp $ */
/*-
* Copyright (c) 2007,2008 Damien Bergamini <damien.bergamini@free.fr>
@@ -375,7 +375,7 @@ ieee80211_recv_4way_msg3(struct ieee80211com *ic,
#endif
/* discard if we're not expecting this message */
if (ni->ni_rsn_supp_state != RSNA_SUPP_PTKNEGOTIATING &&
- ni->ni_rsn_supp_state != RNSA_SUPP_PTKDONE) {
+ ni->ni_rsn_supp_state != RSNA_SUPP_PTKDONE) {
DPRINTF(("unexpected in state: %d\n", ni->ni_rsn_supp_state));
return;
}
@@ -796,7 +796,7 @@ ieee80211_recv_rsn_group_msg1(struct ieee80211com *ic,
return;
#endif
/* discard if we're not expecting this message */
- if (ni->ni_rsn_supp_state != RNSA_SUPP_PTKDONE) {
+ if (ni->ni_rsn_supp_state != RSNA_SUPP_PTKDONE) {
DPRINTF(("unexpected in state: %d\n", ni->ni_rsn_supp_state));
return;
}
@@ -954,7 +954,7 @@ ieee80211_recv_wpa_group_msg1(struct ieee80211com *ic,
return;
#endif
/* discard if we're not expecting this message */
- if (ni->ni_rsn_supp_state != RNSA_SUPP_PTKDONE) {
+ if (ni->ni_rsn_supp_state != RSNA_SUPP_PTKDONE) {
DPRINTF(("unexpected in state: %d\n", ni->ni_rsn_supp_state));
return;
}
diff --git a/sys/net80211/ieee80211_pae_output.c b/sys/net80211/ieee80211_pae_output.c
index 51d0fa44e6d..052fa25357e 100644
--- a/sys/net80211/ieee80211_pae_output.c
+++ b/sys/net80211/ieee80211_pae_output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_pae_output.c,v 1.30 2017/12/21 12:09:38 mpi Exp $ */
+/* $OpenBSD: ieee80211_pae_output.c,v 1.31 2020/05/31 09:11:12 stsp Exp $ */
/*-
* Copyright (c) 2007,2008 Damien Bergamini <damien.bergamini@free.fr>
@@ -444,7 +444,7 @@ ieee80211_send_4way_msg4(struct ieee80211com *ic, struct ieee80211_node *ni)
struct mbuf *m;
u_int16_t info;
- ni->ni_rsn_supp_state = RNSA_SUPP_PTKDONE;
+ ni->ni_rsn_supp_state = RSNA_SUPP_PTKDONE;
m = ieee80211_get_eapol_key(M_DONTWAIT, MT_DATA, 0);
if (m == NULL)
return ENOMEM;