Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-25 09:39:25 +01:00
Code Releases Activity

main: Do not always return -ENOTSUP

Browse Source 
Fixes: 19b0d0f2e2 ("main: Rework kernel option detection logic")
This commit is contained in:
Denis Kenzior 2020-06-23 12:25:18 -05:00
parent 05ad0120a8
commit ec7044d615
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main.c
View File

@ -230,11 +230,12 @@ static void print_koption(const void *key, void *value, void *user_data)
static int check_crypto() static int check_crypto()
{ {
int r = -ENOTSUP; int r = 0;
struct l_hashmap *options = l_hashmap_string_new(); struct l_hashmap *options = l_hashmap_string_new();
struct l_hashmap *optional = l_hashmap_string_new(); struct l_hashmap *optional = l_hashmap_string_new();
if (!l_checksum_is_supported(L_CHECKSUM_SHA1, true)) { if (!l_checksum_is_supported(L_CHECKSUM_SHA1, true)) {
r = -ENOTSUP;
l_error("No HMAC(SHA1) support found"); l_error("No HMAC(SHA1) support found");
ADD_MISSING("CONFIG_CRYPTO_USER_API_HASH"); ADD_MISSING("CONFIG_CRYPTO_USER_API_HASH");
ADD_MISSING("CONFIG_CRYPTO_SHA1"); ADD_MISSING("CONFIG_CRYPTO_SHA1");
@ -243,6 +244,7 @@ static int check_crypto()
} }
if (!l_checksum_is_supported(L_CHECKSUM_MD5, true)) { if (!l_checksum_is_supported(L_CHECKSUM_MD5, true)) {
r = -ENOTSUP;
l_error("No HMAC(MD5) support found"); l_error("No HMAC(MD5) support found");
ADD_MISSING("CONFIG_CRYPTO_USER_API_HASH"); ADD_MISSING("CONFIG_CRYPTO_USER_API_HASH");
ADD_MISSING("CONFIG_CRYPTO_MD5"); ADD_MISSING("CONFIG_CRYPTO_MD5");
@ -250,6 +252,7 @@ static int check_crypto()
} }
if (!l_checksum_cmac_aes_supported()) { if (!l_checksum_cmac_aes_supported()) {
r = -ENOTSUP;
l_error("No CMAC(AES) support found"); l_error("No CMAC(AES) support found");
ADD_MISSING("CONFIG_CRYPTO_USER_API_HASH"); ADD_MISSING("CONFIG_CRYPTO_USER_API_HASH");
ADD_MISSING("CONFIG_CRYPTO_AES"); ADD_MISSING("CONFIG_CRYPTO_AES");
@ -259,6 +262,7 @@ static int check_crypto()
} }
if (!l_checksum_is_supported(L_CHECKSUM_SHA256, true)) { if (!l_checksum_is_supported(L_CHECKSUM_SHA256, true)) {
r = -ENOTSUP;
l_error("No HMAC(SHA256) support not found"); l_error("No HMAC(SHA256) support not found");
ADD_MISSING("CONFIG_CRYPTO_USER_API_HASH"); ADD_MISSING("CONFIG_CRYPTO_USER_API_HASH");
ADD_MISSING("CONFIG_CRYPTO_HMAC"); ADD_MISSING("CONFIG_CRYPTO_HMAC");
@ -274,6 +278,7 @@ static int check_crypto()
} }
if (!l_cipher_is_supported(L_CIPHER_ARC4)) { if (!l_cipher_is_supported(L_CIPHER_ARC4)) {
r = -ENOTSUP;
l_error("RC4 support not found"); l_error("RC4 support not found");
ADD_MISSING("CONFIG_CRYPTO_USER_API_SKCIPHER"); ADD_MISSING("CONFIG_CRYPTO_USER_API_SKCIPHER");
ADD_MISSING("CONFIG_CRYPTO_ARC4"); ADD_MISSING("CONFIG_CRYPTO_ARC4");
@ -282,6 +287,7 @@ static int check_crypto()
if (!l_cipher_is_supported(L_CIPHER_DES) || if (!l_cipher_is_supported(L_CIPHER_DES) ||
!l_cipher_is_supported(L_CIPHER_DES3_EDE_CBC)) { !l_cipher_is_supported(L_CIPHER_DES3_EDE_CBC)) {
r = -ENOTSUP;
l_error("DES support not found"); l_error("DES support not found");
ADD_MISSING("CONFIG_CRYPTO_USER_API_SKCIPHER"); ADD_MISSING("CONFIG_CRYPTO_USER_API_SKCIPHER");
ADD_MISSING("CONFIG_CRYPTO_DES"); ADD_MISSING("CONFIG_CRYPTO_DES");
@ -290,6 +296,7 @@ static int check_crypto()
} }
if (!l_cipher_is_supported(L_CIPHER_AES)) { if (!l_cipher_is_supported(L_CIPHER_AES)) {
r = -ENOTSUP;
l_error("AES support not found"); l_error("AES support not found");
ADD_MISSING("CONFIG_CRYPTO_USER_API_SKCIPHER"); ADD_MISSING("CONFIG_CRYPTO_USER_API_SKCIPHER");
ADD_MISSING("CONFIG_CRYPTO_AES"); ADD_MISSING("CONFIG_CRYPTO_AES");