aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Cunningham <joel.cunningham@me.com>2016-12-19 22:34:24 (GMT)
committerJouni Malinen <j@w1.fi>2016-12-21 10:48:16 (GMT)
commit04f02faac4eef09ab5cf27f5379530e3dd497ce4 (patch)
tree544f8dee4a0567597a5eb29a0b5ec35fcfbb1927
parent0c8d7b085c4db792a6b175023aac58b797bea341 (diff)
downloadhostap-04f02faac4eef09ab5cf27f5379530e3dd497ce4.zip
hostap-04f02faac4eef09ab5cf27f5379530e3dd497ce4.tar.gz
hostap-04f02faac4eef09ab5cf27f5379530e3dd497ce4.tar.bz2
Fix wpa_cipher_to_alg() return type
wpa_cipher_to_alg() returns enumerated values from enum wpa_alg and all uses of the return value treat it as enum wpa_alg (by either assigning it to a variable of type enum wpa_alg or passing to a function that expects enum wpa_alg). This commit updates the return value to match the expected usage (enum wpa_alg) rather than int. This ensures the return value is of the proper type and eliminates the following compiler warnings: ARM RVCT (2.2): 'Warning: #188-D: enumerated type mixed with another type' Signed-off-by: Joel Cunningham <joel.cunningham@me.com>
-rw-r--r--src/common/wpa_common.c2
-rw-r--r--src/common/wpa_common.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/common/wpa_common.c b/src/common/wpa_common.c
index efc8a45..6eb1e66 100644
--- a/src/common/wpa_common.c
+++ b/src/common/wpa_common.c
@@ -1620,7 +1620,7 @@ int wpa_cipher_rsc_len(int cipher)
}
-int wpa_cipher_to_alg(int cipher)
+enum wpa_alg wpa_cipher_to_alg(int cipher)
{
switch (cipher) {
case WPA_CIPHER_CCMP_256:
diff --git a/src/common/wpa_common.h b/src/common/wpa_common.h
index ce74791..4e952c1 100644
--- a/src/common/wpa_common.h
+++ b/src/common/wpa_common.h
@@ -437,7 +437,7 @@ int wpa_ft_parse_ies(const u8 *ies, size_t ies_len, struct wpa_ft_ies *parse);
int wpa_cipher_key_len(int cipher);
int wpa_cipher_rsc_len(int cipher);
-int wpa_cipher_to_alg(int cipher);
+enum wpa_alg wpa_cipher_to_alg(int cipher);
int wpa_cipher_valid_group(int cipher);
int wpa_cipher_valid_pairwise(int cipher);
int wpa_cipher_valid_mgmt_group(int cipher);