Merge pull request ARMmbed#2095 from ARMmbed/IOTTHD-3474

Error: -variable length array folded to constant array as an extension Warnings: -null passed to a callee that requires a non-null -equality comparison with extraneous parentheses * Review corrections -Fix GCC warning "missing braces around initializer" -Fix GCC warning "defined but not used " functions
artokin · May 28, 2019 · c1a89e5 · c1a89e5
2 parents cce3fc7 + f6d81b5
commit c1a89e5
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 11 deletions.
diff --git a/source/6LoWPAN/Thread/thread_extension_bbr.c b/source/6LoWPAN/Thread/thread_extension_bbr.c
@@ -1000,7 +1000,7 @@ static int thread_extension_bbr_dua_cb(int8_t service_id, uint8_t source_address
 typedef struct {
  uint8_t addr[16];
 } multicast_addr_t;
-static multicast_addr_t multicast_store[MULTICAST_ADDRESS_STORE_AMOUNT] = {0};
+static multicast_addr_t multicast_store[MULTICAST_ADDRESS_STORE_AMOUNT] = {{{0}}};
 
 static void thread_border_router_multicast_store_add(thread_pbbr_t *this, uint8_t *destination_addr_ptr)
 {

diff --git a/source/DHCPv6_client/dhcpv6_client_api.h b/source/DHCPv6_client/dhcpv6_client_api.h
@@ -100,7 +100,7 @@ void dhcp_client_global_address_delete(int8_t interface, uint8_t *dhcp_addr, uin
 
 void dhcp_relay_agent_enable(int8_t interface, uint8_t border_router_address[static 16]);
 
-int dhcp_client_server_address_update(int8_t interface, uint8_t prefix[static 16], uint8_t server_address[static 16]);
+int dhcp_client_server_address_update(int8_t interface, uint8_t *prefix, uint8_t server_address[static 16]);
 
 
 

diff --git a/source/DHCPv6_client/dhcpv6_client_service.c b/source/DHCPv6_client/dhcpv6_client_service.c
@@ -302,7 +302,7 @@ int dhcp_client_get_global_address(int8_t interface, uint8_t dhcp_addr[static 16
  return 0;
 }
 
-int dhcp_client_server_address_update(int8_t interface, uint8_t prefix[static 16], uint8_t server_address[static 16])
+int dhcp_client_server_address_update(int8_t interface, uint8_t *prefix, uint8_t server_address[static 16])
 {
  dhcpv6_client_server_data_t *srv_data_ptr = NULL;
 

diff --git a/source/Security/protocols/sec_prot_lib.c b/source/Security/protocols/sec_prot_lib.c
@@ -272,7 +272,7 @@ int8_t sec_prot_lib_pmkid_calc(const uint8_t *pmk, const uint8_t *auth_eui64, co
  const uint8_t pmk_string_val[] = {"PMK Name"};
  const uint8_t pmk_string_val_len = sizeof(pmk_string_val) - 1;
 
- const uint8_t data_len = pmk_string_val_len + EUI64_LEN + EUI64_LEN;
+ uint8_t data_len = pmk_string_val_len + EUI64_LEN + EUI64_LEN;
  uint8_t data[data_len];
  uint8_t *ptr = data;
  memcpy(ptr, pmk_string_val, pmk_string_val_len);
@@ -294,7 +294,7 @@ int8_t sec_prot_lib_ptkid_calc(const uint8_t *ptk, const uint8_t *auth_eui64, co
  const uint8_t ptk_string_val[] = {"PTK Name"};
  const uint8_t ptk_string_val_len = sizeof(ptk_string_val) - 1;
 
- const uint8_t data_len = ptk_string_val_len + EUI64_LEN + EUI64_LEN;
+ uint8_t data_len = ptk_string_val_len + EUI64_LEN + EUI64_LEN;
  uint8_t data[data_len];
  uint8_t *ptr = data;
  memcpy(ptr, ptk_string_val, ptk_string_val_len);

diff --git a/source/Security/protocols/tls_sec_prot/tls_sec_prot_lib.c b/source/Security/protocols/tls_sec_prot/tls_sec_prot_lib.c
@@ -97,6 +97,11 @@ static void tls_sec_prot_lib_debug(void *ctx, int level, const char *file, int l
 #endif
 
 #ifdef MBEDTLS_PLATFORM_MEMORY
+// Disable for now
+//#define TLS_SEC_PROT_LIB_USE_MBEDTLS_PLATFORM_MEMORY
+#endif
+
+#ifdef TLS_SEC_PROT_LIB_USE_MBEDTLS_PLATFORM_MEMORY
 static void *tls_sec_prot_lib_mem_calloc(size_t count, size_t size);
 static void tls_sec_prot_lib_mem_free(void *ptr);
 #endif
@@ -105,9 +110,8 @@ int8_t tls_sec_prot_lib_init(tls_security_t *sec)
 {
  const char *pers = "ws_tls";
 
-#ifdef MBEDTLS_PLATFORM_MEMORY
- // Disable for now
- //mbedtls_platform_set_calloc_free(tls_sec_prot_lib_mem_calloc, tls_sec_prot_lib_mem_free);
+#ifdef TLS_SEC_PROT_LIB_USE_MBEDTLS_PLATFORM_MEMORY
+ mbedtls_platform_set_calloc_free(tls_sec_prot_lib_mem_calloc, tls_sec_prot_lib_mem_free);
 #endif
 
 
@@ -497,7 +501,7 @@ static int tls_sec_lib_entropy_poll(void *ctx, unsigned char *output, size_t len
  return (0);
 }
 
-#ifdef MBEDTLS_PLATFORM_MEMORY
+#ifdef TLS_SEC_PROT_LIB_USE_MBEDTLS_PLATFORM_MEMORY
 static void *tls_sec_prot_lib_mem_calloc(size_t count, size_t size)
 {
  void *mem_ptr = ns_dyn_mem_temporary_alloc(count * size);

diff --git a/source/libDHCPv6/libDHCPv6.c b/source/libDHCPv6/libDHCPv6.c
@@ -208,7 +208,7 @@ dhcpv6_client_server_data_t *libdhcpv6_nonTemporal_entry_get_by_transactionId(ui
 dhcpv6_client_server_data_t *libdhcpv6_nonTemporal_entry_get_by_prefix(int8_t interfaceId, uint8_t *prefix)
 {
  ns_list_foreach(dhcpv6_client_server_data_t, cur, &dhcpv6_client_nonTemporal_list) {
- if ((cur->interfaceId == interfaceId)) {
+ if (cur->interfaceId == interfaceId) {
  if (memcmp(cur->iaNontemporalAddress.addressPrefix, prefix, 8) == 0) {
  return cur;
  }

diff --git a/test/nanostack/unittest/stub/dhcpv6_client_stub.c b/test/nanostack/unittest/stub/dhcpv6_client_stub.c
@@ -89,7 +89,7 @@ void dhcp_client_configure(int8_t interface, bool renew_uses_solicit, bool one_c
 
 }
 
-int dhcp_client_server_address_update(int8_t interface, uint8_t prefix[static 16], uint8_t server_address[static 16])
+int dhcp_client_server_address_update(int8_t interface, uint8_t *prefix, uint8_t server_address[static 16])
 {
  return 0;
 }