On Saturday 21 June 2008, Johannes Berg wrote: > On Sat, 2008-06-21 at 14:23 +0200, Ivo van Doorn wrote: > > On Saturday 21 June 2008, Johannes Berg wrote: > > > On Sat, 2008-06-21 at 07:51 -0400, Luis R. Rodriguez wrote: > > > > Some drivers may want to to use the TKIP key offsets for TX and RX > > > > MIC so lets move this out. > > > > > > > > Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx> > > > > --- > > > > include/net/cfg80211.h | 5 +++++ > > > > net/mac80211/key.h | 37 ++++++++++++------------------------- > > > > 2 files changed, 17 insertions(+), 25 deletions(-) > > > > > > > > diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h > > > > index e007508..6cb8b02 100644 > > > > --- a/include/net/cfg80211.h > > > > +++ b/include/net/cfg80211.h > > > > @@ -12,6 +12,11 @@ > > > > * Copyright 2006, 2007 Johannes Berg <johannes@xxxxxxxxxxxxxxxx> > > > > */ > > > > > > > > +/* Starting offsets for each key for TKIP */ > > > > +#define ALG_TKIP_TEMP_ENCR_KEY 0 > > > > +#define ALG_TKIP_TEMP_AUTH_TX_MIC_KEY 16 > > > > +#define ALG_TKIP_TEMP_AUTH_RX_MIC_KEY 24 > > > > > > put it into nl80211 and give it proper namespace prefixes, please. > > > > Don't we need something similar for AES keys as well? > > I don't think there is a separate MIC key for AES, is there? Hmm, I'm off reading some specs about TKIP and AES encryption. ;) PS, above defines are very useful for rt2x00 since apparently I swapped the 2 fields in the rt2x00crypto implementation. This was caused the legacy driver code which did: WPANONE: txmic = 16 rxmic = 16 authenticator: txmic = 16 rxmic = 24 normal: txmic = 24 rxmic = 16 Ivo -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
