diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2021-01-05 14:21:14 +0000 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2021-01-05 22:19:43 +0000 |
| commit | 8bfd8d88001e0d239d741c954c2421052b858fc1 (patch) | |
| tree | 02dee1e9f9ddfc625e8e6b57c7cf8c73118371b6 /include | |
| parent | 74d13fb98730a7a8af6e6662d0f4281b6655ddd0 (diff) | |
| download | iwinfo-8bfd8d88001e0d239d741c954c2421052b858fc1.tar.gz | |
iwinfo: add support for GCMP cipher
Extend support for WPA ciphers by GCMP which is required for 802.11ad.
Breaks ABI as ciphers now needs to be a field of 16 bits instead of 8.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/iwinfo.h | 7 | ||||
| -rw-r--r-- | include/iwinfo/utils.h | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/include/iwinfo.h b/include/iwinfo.h index 680f384..5799c02 100644 --- a/include/iwinfo.h +++ b/include/iwinfo.h @@ -38,7 +38,8 @@ #define IWINFO_CIPHER_WEP104 (1 << 5) #define IWINFO_CIPHER_AESOCB (1 << 6) #define IWINFO_CIPHER_CKIP (1 << 7) -#define IWINFO_CIPHER_COUNT 8 +#define IWINFO_CIPHER_GCMP (1 << 8) +#define IWINFO_CIPHER_COUNT 9 #define IWINFO_KMGMT_NONE (1 << 0) #define IWINFO_KMGMT_8021x (1 << 1) @@ -164,8 +165,8 @@ struct iwinfo_freqlist_entry { struct iwinfo_crypto_entry { uint8_t enabled; uint8_t wpa_version; - uint8_t group_ciphers; - uint8_t pair_ciphers; + uint16_t group_ciphers; + uint16_t pair_ciphers; uint8_t auth_suites; uint8_t auth_algs; }; diff --git a/include/iwinfo/utils.h b/include/iwinfo/utils.h index 98b9c89..1fa4f52 100644 --- a/include/iwinfo/utils.h +++ b/include/iwinfo/utils.h @@ -54,7 +54,7 @@ struct iwinfo_hardware_entry * iwinfo_hardware(struct iwinfo_hardware_id *id); int iwinfo_hardware_id_from_mtd(struct iwinfo_hardware_id *id); void iwinfo_parse_rsn(struct iwinfo_crypto_entry *c, uint8_t *data, uint8_t len, - uint8_t defcipher, uint8_t defauth); + uint16_t defcipher, uint8_t defauth); struct uci_section *iwinfo_uci_get_radio(const char *name, const char *type); void iwinfo_uci_free(void); |