diff options
| author | Joshua Oreman | 2009-08-08 08:07:11 +0200 |
|---|---|---|
| committer | Marty Connor | 2010-01-05 16:11:42 +0100 |
| commit | 5240fee38f1f5d594fb3430627802445502828e1 (patch) | |
| tree | 689a97c10fb2305380cad1d41bafc94be257dad6 /src/config | |
| parent | [wpa] Add TKIP backend (legacy RC4-based cryptosystem) (diff) | |
| download | ipxe-5240fee38f1f5d594fb3430627802445502828e1.tar.gz ipxe-5240fee38f1f5d594fb3430627802445502828e1.tar.xz ipxe-5240fee38f1f5d594fb3430627802445502828e1.zip | |
[wpa] Add CCMP backend (new AES-based cryptosystem)
Signed-off-by: Marty Connor <mdc@etherboot.org>
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/config_net80211.c | 5 | ||||
| -rw-r--r-- | src/config/general.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/config/config_net80211.c b/src/config/config_net80211.c index b1b640d7c..b33c363b1 100644 --- a/src/config/config_net80211.c +++ b/src/config/config_net80211.c @@ -39,6 +39,11 @@ REQUIRE_OBJECT ( wireless_errors ); REQUIRE_OBJECT ( wep ); #endif +#ifdef CRYPTO_80211_WPA2 +#define CRYPTO_80211_WPA +REQUIRE_OBJECT ( wpa_ccmp ); +#endif + #ifdef CRYPTO_80211_WPA REQUIRE_OBJECT ( wpa_psk ); REQUIRE_OBJECT ( wpa_tkip ); diff --git a/src/config/general.h b/src/config/general.h index 72fda10d8..99724813e 100644 --- a/src/config/general.h +++ b/src/config/general.h @@ -70,6 +70,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); */ #define CRYPTO_80211_WEP /* WEP encryption (deprecated and insecure!) */ #define CRYPTO_80211_WPA /* WPA Personal, authenticating with passphrase */ +#undef CRYPTO_80211_WPA2 /* Add support for stronger WPA cryptography */ /* * Name resolution modules |