net80211: add the 802.11-2016 cipher list to the crypto array set.

[adrian]

Summary

These are the bitmap / cipher module number fields used for net80211
ciphers.

This requires a kernel recompile, but nothing (currently) in userland
is using these.

[adrian]

oops, url update again

[bz]

sys/net80211/ieee80211_crypto.h

147

I love enums.

[cc]

sys/net80211/ieee80211_crypto.h

147

I love enums.

+1

167–171

In C printf, this is what I get. Also the output in Eclipse IDE console is a little different than in a Mac terminal. Is the result what we expected?

printf("%s\n", IEEE80211_CRYPTO_BITS);

quoted result:

WEPTKIPAESAES_CCMTKIPMICCKIPNONEAES_CCM_256 BIP_CMAC_128
BIP_CMAC_256BIP_GMAC_128BIP_CMAC_256
AES_GCM_128AES_GCM_256

[emaste]

sys/net80211/ieee80211_crypto.h

167–171

For use with printf(9)'s %b:

The %b identifier expects two arguments: an int and a char *.  These are
used as a register value and a print mask for decoding bitmasks.  The
print mask is made up of two parts: the base and the arguments.  The base
value is the output base (radix) expressed as an octal value; for
example, \10 gives octal and \20 gives hexadecimal.  The arguments are
made up of a sequence of bit identifiers.  Each bit identifier begins
with an octal value which is the number of the bit (starting from 1) this
identifier describes.  The rest of the identifier is a string of
characters containing the name of the bit.  The string is terminated by
either the bit number at the start of the next bit identifier or NUL for
the last bit identifier.

[cc]

sys/net80211/ieee80211_crypto.h

167–171

For use with printf(9)'s %b:

The %b identifier expects two arguments: an int and a char *.  These are

Thanks for letting me know what I am missing. But after applying this patch in main, the ifconfig does not show the "cryptocaps". In verbose mode, it is empty. Any idea if there is a bug?

before the patch:
root@n2fbsd:/usr/src # ifconfig wlan0 list caps
drivercaps=581c001<STA,SHSLOT,SHPREAMBLE,MONITOR,WPA1,WPA2,WME>
cryptocaps=b<WEP,TKIP,AES_CCM>

after the patch:
root@n2fbsd:~ # ifconfig wlan0 list caps
drivercaps=581c001<STA,SHSLOT,SHPREAMBLE,MONITOR,WPA1,WPA2,WME>
root@n2fbsd:~ #

root@n2fbsd:~ # ifconfig -v wlan0 list caps
drivercaps=581c001<STA,SHSLOT,SHPREAMBLE,MONITOR,WPA1,WPA2,WME>
cryptocaps=0<>
htcaps=0<>
vhtcaps=0<>
...

[cc]

sys/net80211/ieee80211_crypto.h

167–171

Hold on a second. I think I forgot to compile the kernel with the HW CRYPTO defined. Let me test again.

[cc]

sys/net80211/ieee80211_crypto.h

167–171

No surprise. To list it, HW CRYPTO must be defined for my driver.

After the patch:

root@n2fbsd:~ # ifconfig wlan0 list caps
drivercaps=581c001<STA,SHSLOT,SHPREAMBLE,MONITOR,WPA1,WPA2,WME>
cryptocaps=b<WEP,TKIP,AES_CCM>
root@n2fbsd:~ #

[bz]

sys/net80211/ieee80211_crypto.h

168–170

In reality there is no "\7NONE" as we do not define the IEEE80211_CRYPTO_NONE? Where do we want to be consistent: in the defines or the printf?

[adrian]

remove NONE, from bz@

[adrian]

sys/net80211/ieee80211_crypto.h

147

I do too, but they're already defines. I'm happy to add it to a follow-up enum cleanup task?

We just need to be sure there's nothing in the codebase and wpa/hostapd driver_bsd.c code that's using these things as compile time flags?