svn commit: r204215 - stable/8/sys/net80211

Bernhard Schmidt bschmidt at FreeBSD.org
Mon Feb 22 17:10:47 UTC 2010


Author: bschmidt
Date: Mon Feb 22 17:10:47 2010
New Revision: 204215
URL: http://svn.freebsd.org/changeset/base/204215

Log:
  MFC r203673:
  Ensure that tkip_mixing_phase1() is called after a rekeying event when
  using plain s/w crypto.
  
  PR:		bin/142547
  Approved by:	rpaulo (mentor)

Modified:
  stable/8/sys/net80211/ieee80211_crypto_tkip.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/netinet/   (props changed)

Modified: stable/8/sys/net80211/ieee80211_crypto_tkip.c
==============================================================================
--- stable/8/sys/net80211/ieee80211_crypto_tkip.c	Mon Feb 22 17:03:45 2010	(r204214)
+++ stable/8/sys/net80211/ieee80211_crypto_tkip.c	Mon Feb 22 17:10:47 2010	(r204215)
@@ -144,6 +144,7 @@ tkip_setkey(struct ieee80211_key *k)
 		return 0;
 	}
 	k->wk_keytsc = 1;		/* TSC starts at 1 */
+	ctx->rx_phase1_done = 0;
 	return 1;
 }
 


More information about the svn-src-all mailing list