Skip to content

Commit 2c5c91b

Browse files
rado17krish2718
authored andcommitted
[nrf noup] net: l2: wifi: Move cert inclusions to header file
Cert inclusion should be placed in a common location wrt Wi-Fi subsystem. Many applications don't include wifi_shell. Hence moving the cert inclusion to wifi_mgmt.h instead. Signed-off-by: Ravi Dondaputi <[email protected]>
1 parent 369acc4 commit 2c5c91b

File tree

2 files changed

+17
-28
lines changed

2 files changed

+17
-28
lines changed

include/zephyr/net/wifi_mgmt.h

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,23 @@ extern "C" {
3131

3232
/** @cond INTERNAL_HIDDEN */
3333

34+
#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
35+
static const char ca_cert_test[] = {
36+
#include <wifi_enterprise_test_certs/ca.pem.inc>
37+
'\0'
38+
};
39+
40+
static const char client_cert_test[] = {
41+
#include <wifi_enterprise_test_certs/client.pem.inc>
42+
'\0'
43+
};
44+
45+
static const char client_key_test[] = {
46+
#include <wifi_enterprise_test_certs/client-key.pem.inc>
47+
'\0'
48+
};
49+
#endif
50+
3451
#define _NET_WIFI_LAYER NET_MGMT_LAYER_L2
3552
#define _NET_WIFI_CODE 0x156
3653
#define _NET_WIFI_BASE (NET_MGMT_IFACE_BIT | \

subsys/net/l2/wifi/wifi_shell.c

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -29,34 +29,6 @@ LOG_MODULE_REGISTER(net_wifi_shell, LOG_LEVEL_INF);
2929
#include <zephyr/sys/slist.h>
3030

3131
#include "net_shell_private.h"
32-
#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
33-
static const char ca_cert_test[] = {
34-
#include <wifi_enterprise_test_certs/ca.pem.inc>
35-
'\0'
36-
};
37-
38-
static const char client_cert_test[] = {
39-
#include <wifi_enterprise_test_certs/client.pem.inc>
40-
'\0'
41-
};
42-
43-
static const char client_key_test[] = {
44-
#include <wifi_enterprise_test_certs/client-key.pem.inc>
45-
'\0'
46-
};
47-
48-
static const char ca_cert2_test[] = {
49-
#include <wifi_enterprise_test_certs/ca2.pem.inc>
50-
'\0'};
51-
52-
static const char client_cert2_test[] = {
53-
#include <wifi_enterprise_test_certs/client2.pem.inc>
54-
'\0'};
55-
56-
static const char client_key2_test[] = {
57-
#include <wifi_enterprise_test_certs/client-key2.pem.inc>
58-
'\0'};
59-
#endif
6032

6133
#define WIFI_SHELL_MODULE "wifi"
6234

0 commit comments

Comments
 (0)