Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-6]: src/external/bsd/wpa/dist/src/drivers Pull up following revis...



details:   https://anonhg.NetBSD.org/src/rev/99ae4a18a1a6
branches:  netbsd-6
changeset: 774133:99ae4a18a1a6
user:      riz <riz%NetBSD.org@localhost>
date:      Sat May 19 15:32:37 2012 +0000

description:
Pull up following revision(s) (requested by nakayama in ticket #269):
        external/bsd/wpa/dist/src/drivers/driver_bsd.c: revision 1.5
Make WPA works on big-endian machines.
Need byte swapping to copy seq to member ik_keyrsc.  The code is
borrowed from driver_madwifi.c.

diffstat:

 external/bsd/wpa/dist/src/drivers/driver_bsd.c |  12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diffs (23 lines):

diff -r b8ab078e7eec -r 99ae4a18a1a6 external/bsd/wpa/dist/src/drivers/driver_bsd.c
--- a/external/bsd/wpa/dist/src/drivers/driver_bsd.c    Sat May 19 15:31:21 2012 +0000
+++ b/external/bsd/wpa/dist/src/drivers/driver_bsd.c    Sat May 19 15:32:37 2012 +0000
@@ -347,7 +347,19 @@
        if (wk.ik_keyix != IEEE80211_KEYIX_NONE && set_tx)
                wk.ik_flags |= IEEE80211_KEY_DEFAULT;
        wk.ik_keylen = key_len;
+#ifdef WORDS_BIGENDIAN
+#define WPA_KEY_RSC_LEN 8
+       {
+               size_t i;
+               u8 tmp[WPA_KEY_RSC_LEN];
+               os_memset(tmp, 0, sizeof(tmp));
+               for (i = 0; i < seq_len; i++)
+                       tmp[WPA_KEY_RSC_LEN - i - 1] = seq[i];
+               os_memcpy(&wk.ik_keyrsc, tmp, WPA_KEY_RSC_LEN);
+       }
+#else /* WORDS_BIGENDIAN */
        os_memcpy(&wk.ik_keyrsc, seq, seq_len);
+#endif /* WORDS_BIGENDIAN */
        os_memcpy(wk.ik_keydata, key, key_len);
 
        return set80211var(priv, IEEE80211_IOC_WPAKEY, &wk, sizeof(wk));



Home | Main Index | Thread Index | Old Index