diff options
| -rw-r--r-- | sys/net80211/ieee80211_input.c | 4 | ||||
| -rw-r--r-- | sys/net80211/ieee80211_output.c | 7 | ||||
| -rw-r--r-- | sys/net80211/ieee80211_proto.h | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c index e617cb26645..391c207db52 100644 --- a/sys/net80211/ieee80211_input.c +++ b/sys/net80211/ieee80211_input.c @@ -1,5 +1,5 @@ /* $NetBSD: ieee80211_input.c,v 1.24 2004/05/31 11:12:24 dyoung Exp $ */ -/* $OpenBSD: ieee80211_input.c,v 1.51 2007/08/01 12:43:58 damien Exp $ */ +/* $OpenBSD: ieee80211_input.c,v 1.52 2007/08/01 12:47:55 damien Exp $ */ /*- * Copyright (c) 2001 Atsushi Onoe * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting @@ -1957,7 +1957,7 @@ ieee80211_recv_4way_msg1(struct ieee80211com *ic, ether_sprintf(ni->ni_macaddr)); /* send message 2 to authenticator */ - ieee80211_send_4way_msg2(ic, ni); + ieee80211_send_4way_msg2(ic, ni, snonce); } /* diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c index 0392ad17a55..f9dfb07db33 100644 --- a/sys/net80211/ieee80211_output.c +++ b/sys/net80211/ieee80211_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_output.c,v 1.51 2007/08/01 12:26:16 damien Exp $ */ +/* $OpenBSD: ieee80211_output.c,v 1.52 2007/08/01 12:47:55 damien Exp $ */ /* $NetBSD: ieee80211_output.c,v 1.13 2004/05/31 11:02:55 dyoung Exp $ */ /*- @@ -1663,7 +1663,8 @@ ieee80211_send_4way_msg1(struct ieee80211com *ic, struct ieee80211_node *ni) * (see 8.5.3.2). */ int -ieee80211_send_4way_msg2(struct ieee80211com *ic, struct ieee80211_node *ni) +ieee80211_send_4way_msg2(struct ieee80211com *ic, struct ieee80211_node *ni, + const u_int8_t *snonce) { struct ieee80211_eapol_key *key; struct mbuf *m; @@ -1683,7 +1684,7 @@ ieee80211_send_4way_msg2(struct ieee80211com *ic, struct ieee80211_node *ni) /* copy key replay counter from authenticator */ BE_WRITE_8(key->replaycnt, ni->ni_replaycnt); - /* XXX memcpy(key->nonce, snonce, EAPOL_KEY_NONCE_LEN); */ + memcpy(key->nonce, snonce, EAPOL_KEY_NONCE_LEN); frm = (u_int8_t *)&key[1]; /* add the RSN IE used in the (Re)Association Request */ diff --git a/sys/net80211/ieee80211_proto.h b/sys/net80211/ieee80211_proto.h index 9042976fadb..e71667be7ef 100644 --- a/sys/net80211/ieee80211_proto.h +++ b/sys/net80211/ieee80211_proto.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_proto.h,v 1.24 2007/07/28 11:24:06 damien Exp $ */ +/* $OpenBSD: ieee80211_proto.h,v 1.25 2007/08/01 12:47:55 damien Exp $ */ /* $NetBSD: ieee80211_proto.h,v 1.3 2003/10/13 04:23:56 dyoung Exp $ */ /*- @@ -78,7 +78,7 @@ extern struct mbuf *ieee80211_beacon_alloc(struct ieee80211com *, extern int ieee80211_send_4way_msg1(struct ieee80211com *, struct ieee80211_node *); extern int ieee80211_send_4way_msg2(struct ieee80211com *, - struct ieee80211_node *); + struct ieee80211_node *, const u_int8_t *); extern int ieee80211_send_4way_msg3(struct ieee80211com *, struct ieee80211_node *); extern int ieee80211_send_4way_msg4(struct ieee80211com *, |