Skip to content

Commit 7f4ebf1

Browse files
author
Mika Leppänen
committed
Corrected compiler warnings
1 parent 52e4c3f commit 7f4ebf1

17 files changed

+57
-20
lines changed

‎source/Security/kmp/kmp_addr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ const uint8_t *kmp_address_ip_get(const kmp_addr_t *addr)
114114
uint16_t kmp_address_port_get(const kmp_addr_t *addr)
115115
{
116116
if (!addr || (addr->type & KMP_ADDR_TYPE_MASK) != KMP_ADDR_EUI_64_AND_IP) {
117-
return -1;
117+
return 0;
118118
}
119119

120120
return ((kmp_eui_64_ip_addr_t *)addr)->port;

‎source/Security/kmp/kmp_api.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,20 @@ kmp_type_e kmp_api_type_get(kmp_api_t *kmp)
304304
return kmp->type;
305305
}
306306

307+
kmp_type_e kmp_api_type_from_id_get(uint8_t kmp_id)
308+
{
309+
switch (kmp_id) {
310+
case IEEE_802_1X_MKA:
311+
return IEEE_802_1X_MKA;
312+
case IEEE_802_11_4WH:
313+
return IEEE_802_11_4WH;
314+
case IEEE_802_11_GKH:
315+
return IEEE_802_1X_MKA;
316+
default:
317+
return INVALID_KMP_TYPE;
318+
}
319+
}
320+
307321
kmp_service_t *kmp_api_service_get(kmp_api_t *kmp)
308322
{
309323
return kmp->service;

‎source/Security/kmp/kmp_api.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
*/
3030

3131
typedef enum {
32+
INVALID_KMP_TYPE = 0,
33+
3234
IEEE_802_1X_MKA = 1,
3335
IEEE_802_11_4WH = 6,
3436
IEEE_802_11_GKH = 7,
@@ -150,6 +152,16 @@ void kmp_api_delete(kmp_api_t *kmp);
150152
*/
151153
kmp_type_e kmp_api_type_get(kmp_api_t *kmp);
152154

155+
/**
156+
* kmp_api_type_from_id_get get KMP type from KMP id
157+
*
158+
* \param kmp_id KMP identifier
159+
*
160+
* \return kmp_type_e KMP type
161+
*
162+
*/
163+
kmp_type_e kmp_api_type_from_id_get(uint8_t kmp_id);
164+
153165
/**
154166
* kmp_api_service_get get KMP service for KMP instance
155167
*

‎source/Security/kmp/kmp_eapol_pdu_if.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,12 @@ int8_t kmp_eapol_pdu_if_receive(protocol_interface_info_entry_t *interface_ptr,
150150
uint16_t data_pdu_size = size - sizeof(uint8_t);
151151
void *data_pdu = &eapol_kmp_pdu->kmp_data;
152152

153-
int8_t ret = kmp_service_msg_if_receive(service, eapol_kmp_pdu->kmp_id, &addr, data_pdu, data_pdu_size);
153+
kmp_type_e type = kmp_api_type_from_id_get(eapol_kmp_pdu->kmp_id);
154+
if (type == INVALID_KMP_TYPE) {
155+
return -1;
156+
}
157+
158+
int8_t ret = kmp_service_msg_if_receive(service, type, &addr, data_pdu, data_pdu_size);
154159

155160
return ret;
156161
}

‎source/Security/kmp/kmp_socket_if.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,11 @@ static void kmp_socket_if_socket_cb(void *ptr)
179179
euid64 = data_ptr;
180180
data_ptr += 8;
181181

182-
kmp_type_e kmp_id = *data_ptr++;
182+
kmp_type_e type = kmp_api_type_from_id_get(*data_ptr++);
183+
if (type == INVALID_KMP_TYPE) {
184+
ns_dyn_mem_free(pdu);
185+
return;
186+
}
183187

184188
kmp_addr_t *addr = kmp_address_create(KMP_ADDR_EUI_64_AND_IP, euid64);
185189
if (!addr) {
@@ -190,7 +194,7 @@ static void kmp_socket_if_socket_cb(void *ptr)
190194
kmp_address_ip_set(addr, relay_address);
191195
kmp_address_port_set(addr, relay_port);
192196

193-
kmp_service_msg_if_receive(socket_if->kmp_service, kmp_id, addr, data_ptr, cb_data->d_len - 27);
197+
kmp_service_msg_if_receive(socket_if->kmp_service, type, addr, data_ptr, cb_data->d_len - 27);
194198
kmp_address_delete(addr);
195199

196200
ns_dyn_mem_free(pdu);

‎source/Security/protocols/eap_tls_sec_prot/auth_eap_tls_sec_prot.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
#include "Security/eapol/eapol_helper.h"
3131
#include "Security/protocols/sec_prot_certs.h"
3232
#include "Security/protocols/sec_prot_keys.h"
33-
#include "Security/protocols/sec_prot_lib.h"
3433
#include "Security/protocols/sec_prot.h"
34+
#include "Security/protocols/sec_prot_lib.h"
3535
#include "Security/protocols/eap_tls_sec_prot/eap_tls_sec_prot_lib.h"
3636
#include "Security/protocols/eap_tls_sec_prot/auth_eap_tls_sec_prot.h"
3737

@@ -343,7 +343,7 @@ static void auth_eap_tls_sec_prot_delete_tls(sec_prot_t *prot)
343343
static void auth_eap_tls_sec_prot_state_machine(sec_prot_t *prot)
344344
{
345345
eap_tls_sec_prot_int_t *data = eap_tls_sec_prot_get(prot);
346-
int8_t result;
346+
int8_t result = EAP_TLS_MSG_CONTINUE;
347347

348348
// EAP-TLS authenticator state machine
349349
switch (sec_prot_state_get(&data->common)) {

‎source/Security/protocols/eap_tls_sec_prot/eap_tls_sec_prot_lib.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
#include "Security/eapol/eapol_helper.h"
3232
#include "Security/protocols/sec_prot_certs.h"
3333
#include "Security/protocols/sec_prot_keys.h"
34-
#include "Security/protocols/sec_prot_lib.h"
3534
#include "Security/protocols/sec_prot.h"
35+
#include "Security/protocols/sec_prot_lib.h"
3636
#include "Security/protocols/eap_tls_sec_prot/eap_tls_sec_prot_lib.h"
3737

3838
#ifdef HAVE_WS

‎source/Security/protocols/eap_tls_sec_prot/supp_eap_tls_sec_prot.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
#include "Security/eapol/eapol_helper.h"
3131
#include "Security/protocols/sec_prot_certs.h"
3232
#include "Security/protocols/sec_prot_keys.h"
33-
#include "Security/protocols/sec_prot_lib.h"
3433
#include "Security/protocols/sec_prot.h"
34+
#include "Security/protocols/sec_prot_lib.h"
3535
#include "Security/protocols/eap_tls_sec_prot/eap_tls_sec_prot_lib.h"
3636
#include "Security/protocols/eap_tls_sec_prot/supp_eap_tls_sec_prot.h"
3737

‎source/Security/protocols/fwh_sec_prot/auth_fwh_sec_prot.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
#include "Security/eapol/kde_helper.h"
3232
#include "Security/protocols/sec_prot_certs.h"
3333
#include "Security/protocols/sec_prot_keys.h"
34-
#include "Security/protocols/sec_prot_lib.h"
3534
#include "Security/protocols/sec_prot.h"
35+
#include "Security/protocols/sec_prot_lib.h"
3636
#include "Security/protocols/fwh_sec_prot/auth_fwh_sec_prot.h"
3737
#include "Service_Libs/hmac/hmac_sha1.h"
3838
#include "Service_Libs/nist_aes_kw/nist_aes_kw.h"

‎source/Security/protocols/fwh_sec_prot/supp_fwh_sec_prot.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
#include "Security/eapol/kde_helper.h"
3232
#include "Security/protocols/sec_prot_certs.h"
3333
#include "Security/protocols/sec_prot_keys.h"
34-
#include "Security/protocols/sec_prot_lib.h"
3534
#include "Security/protocols/sec_prot.h"
35+
#include "Security/protocols/sec_prot_lib.h"
3636
#include "Security/protocols/fwh_sec_prot/supp_fwh_sec_prot.h"
3737
#include "Service_Libs/hmac/hmac_sha1.h"
3838
#include "Service_Libs/nist_aes_kw/nist_aes_kw.h"

‎source/Security/protocols/gkh_sec_prot/auth_gkh_sec_prot.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
#include "Security/eapol/kde_helper.h"
3232
#include "Security/protocols/sec_prot_certs.h"
3333
#include "Security/protocols/sec_prot_keys.h"
34-
#include "Security/protocols/sec_prot_lib.h"
3534
#include "Security/protocols/sec_prot.h"
35+
#include "Security/protocols/sec_prot_lib.h"
3636
#include "Security/protocols/gkh_sec_prot/auth_gkh_sec_prot.h"
3737

3838
#ifdef HAVE_WS

‎source/Security/protocols/gkh_sec_prot/supp_gkh_sec_prot.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
#include "Security/eapol/eapol_helper.h"
3131
#include "Security/protocols/sec_prot_certs.h"
3232
#include "Security/protocols/sec_prot_keys.h"
33-
#include "Security/protocols/sec_prot_lib.h"
3433
#include "Security/protocols/sec_prot.h"
34+
#include "Security/protocols/sec_prot_lib.h"
3535
#include "Security/protocols/gkh_sec_prot/supp_gkh_sec_prot.h"
3636

3737
#ifdef HAVE_WS

‎source/Security/protocols/key_sec_prot/key_sec_prot.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
#include "Security/eapol/kde_helper.h"
3232
#include "Security/protocols/sec_prot_certs.h"
3333
#include "Security/protocols/sec_prot_keys.h"
34-
#include "Security/protocols/sec_prot_lib.h"
3534
#include "Security/protocols/sec_prot.h"
35+
#include "Security/protocols/sec_prot_lib.h"
3636
#include "Security/protocols/key_sec_prot/key_sec_prot.h"
3737

3838
#ifdef HAVE_WS

‎source/Security/protocols/sec_prot_lib.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
#include "Security/eapol/kde_helper.h"
3434
#include "Security/protocols/sec_prot_certs.h"
3535
#include "Security/protocols/sec_prot_keys.h"
36-
#include "Security/protocols/sec_prot_lib.h"
3736
#include "Security/protocols/sec_prot.h"
37+
#include "Security/protocols/sec_prot_lib.h"
3838
#include "Service_Libs/ieee_802_11/ieee_802_11.h"
3939
#include "Service_Libs/hmac/hmac_sha1.h"
4040
#include "Service_Libs/nist_aes_kw/nist_aes_kw.h"
@@ -132,12 +132,12 @@ uint8_t sec_prot_state_get(sec_prot_common_t *data)
132132
return data->state;
133133
}
134134

135-
void sec_prot_result_set(sec_prot_common_t *data, int8_t result)
135+
void sec_prot_result_set(sec_prot_common_t *data, sec_prot_result_e result)
136136
{
137137
data->result = result;
138138
}
139139

140-
int8_t sec_prot_result_get(sec_prot_common_t *data)
140+
sec_prot_result_e sec_prot_result_get(sec_prot_common_t *data)
141141
{
142142
return data->result;
143143
}

‎source/Security/protocols/sec_prot_lib.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ typedef struct {
4444
trickle_t trickle_timer; /**< Trickle timer for re-sending */
4545
uint16_t ticks; /**< Timer ticks */
4646
int8_t state; /**< Protocol state machine state */
47-
int8_t result; /**< Result for ongoing negotiation */
47+
sec_prot_result_e result; /**< Result for ongoing negotiation */
4848
bool trickle_running; /**< Trickle running */
4949
} sec_prot_common_t;
5050

@@ -254,7 +254,7 @@ uint8_t sec_prot_state_get(sec_prot_common_t *data);
254254
* \param result result
255255
*
256256
*/
257-
void sec_prot_result_set(sec_prot_common_t *data, int8_t result);
257+
void sec_prot_result_set(sec_prot_common_t *data, sec_prot_result_e result);
258258

259259
/**
260260
* sec_prot_result_get gets result for operation
@@ -264,7 +264,7 @@ void sec_prot_result_set(sec_prot_common_t *data, int8_t result);
264264
* \return result
265265
*
266266
*/
267-
int8_t sec_prot_result_get(sec_prot_common_t *data);
267+
sec_prot_result_e sec_prot_result_get(sec_prot_common_t *data);
268268

269269
/**
270270
* sec_prot_result_timeout_check checks if result is timeout

‎source/Security/protocols/tls_sec_prot/tls_sec_prot.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
#include "Security/eapol/eapol_helper.h"
3131
#include "Security/protocols/sec_prot_certs.h"
3232
#include "Security/protocols/sec_prot_keys.h"
33-
#include "Security/protocols/sec_prot_lib.h"
3433
#include "Security/protocols/sec_prot.h"
34+
#include "Security/protocols/sec_prot_lib.h"
3535
#include "Security/protocols/eap_tls_sec_prot/eap_tls_sec_prot_lib.h"
3636
#include "Security/protocols/tls_sec_prot/tls_sec_prot.h"
3737
#include "Security/protocols/tls_sec_prot/tls_sec_prot_lib.h"

‎source/Security/protocols/tls_sec_prot/tls_sec_prot_lib.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,9 +297,11 @@ int8_t tls_sec_prot_lib_process(tls_security_t *sec)
297297
while (ret != MBEDTLS_ERR_SSL_WANT_READ) {
298298
ret = mbedtls_ssl_handshake_step(&sec->ssl);
299299

300+
#ifdef MBEDTLS_ECP_RESTARTABLE
300301
if (ret == MBEDTLS_ERR_SSL_CRYPTO_IN_PROGRESS /* || ret == MBEDTLS_ERR_SSL_ASYNC_IN_PROGRESS */) {
301302
return TLS_SEC_PROT_LIB_CALCULATING;
302303
}
304+
#endif
303305

304306
if (ret && (ret != MBEDTLS_ERR_SSL_WANT_READ && ret != MBEDTLS_ERR_SSL_WANT_WRITE)) {
305307
return TLS_SEC_PROT_LIB_ERROR;

0 commit comments

Comments
 (0)