From 91be7e0d288f068814a3e42642a5c98df3f795fb Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Mon, 21 Nov 2022 09:59:09 +0100 Subject: cli: use IWINFO_CIPHER_NAMES There's no need to duplicate the strings or even miss new ones. Signed-off-by: Andre Heider --- iwinfo_cli.c | 36 ++++-------------------------------- 1 file 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; -- cgit v1.2.1