diff options
author | Andre Heider <a.heider@gmail.com> | 2022-11-21 09:59:09 +0100 |
---|---|---|
committer | Jo-Philipp Wich <jo@mein.io> | 2022-12-16 00:09:07 +0100 |
commit | 91be7e0d288f068814a3e42642a5c98df3f795fb (patch) | |
tree | b5c077aa31a9350028c2af1dbb1710d2248326b5 | |
parent | 49b6ec91e90df652b52eba2a0bfb37aa9414dfc5 (diff) | |
download | iwinfo-91be7e0d288f068814a3e42642a5c98df3f795fb.tar.gz |
cli: use IWINFO_CIPHER_NAMES
There's no need to duplicate the strings or even miss new ones.
Signed-off-by: Andre Heider <a.heider@gmail.com>
-rw-r--r-- | iwinfo_cli.c | 36 |
1 files changed, 4 insertions, 32 deletions
diff --git a/iwinfo_cli.c b/iwinfo_cli.c index c8436a4..944c6c8 100644 --- a/iwinfo_cli.c +++ b/iwinfo_cli.c @@ -145,39 +145,11 @@ static char * format_enc_ciphers(int ciphers) { static char str[128] = { 0 }; char *pos = str; + int i; - if (ciphers & IWINFO_CIPHER_WEP40) - pos += sprintf(pos, "WEP-40, "); - - if (ciphers & IWINFO_CIPHER_WEP104) - pos += sprintf(pos, "WEP-104, "); - - if (ciphers & IWINFO_CIPHER_TKIP) - pos += sprintf(pos, "TKIP, "); - - if (ciphers & IWINFO_CIPHER_CCMP) - pos += sprintf(pos, "CCMP, "); - - if (ciphers & IWINFO_CIPHER_CCMP256) - pos += sprintf(pos, "CCMP-256, "); - - if (ciphers & IWINFO_CIPHER_GCMP) - pos += sprintf(pos, "GCMP, "); - - if (ciphers & IWINFO_CIPHER_GCMP256) - pos += sprintf(pos, "GCMP-256, "); - - if (ciphers & IWINFO_CIPHER_WRAP) - pos += sprintf(pos, "WRAP, "); - - if (ciphers & IWINFO_CIPHER_AESOCB) - pos += sprintf(pos, "AES-OCB, "); - - if (ciphers & IWINFO_CIPHER_CKIP) - pos += sprintf(pos, "CKIP, "); - - if (!ciphers || (ciphers & IWINFO_CIPHER_NONE)) - pos += sprintf(pos, "NONE, "); + for (i = 0; i < IWINFO_CIPHER_COUNT; i++) + if (ciphers & (1 << i)) + pos += sprintf(pos, "%s, ", IWINFO_CIPHER_NAMES[i]); *(pos - 2) = 0; |