Merge commit '780e9afb8f3b8f09e66573e7d4ba096dd9a87dd7'

  Nanostack v10.1.0 for Mbed OS 5.12

* commit '780e9afb8f3b8f09e66573e7d4ba096dd9a87dd7':
  Squashed 'features/nanostack/sal-stack-nanostack/' changes from 513a38e..c5ee9e4

Author: Arto Kinnunen

features/nanostack/sal-stack-nanostack/.gitignore

@@ -1,5 +1,4 @@
 .settings/
-.yotta.json
 *.dep
 *.htm
 *.crf
@@ -66,8 +65,7 @@ cscope.files
 !debugger.ini
 *Log.txt
 *.mpw
-yotta_modules
-yotta_targets
 build
 html
 site
+

features/nanostack/sal-stack-nanostack/Makefile

@@ -109,7 +109,7 @@ clean-extra: $(CLEANTESTDIRS)
 # 3. TBD: importing to mbed OS
 
 TARGET_DIR:=release
-CONFIGURATIONS_TO_BUILD:=lowpan_border_router lowpan_host lowpan_router nanostack_full thread_border_router thread_router thread_end_device ethernet_host
+CONFIGURATIONS_TO_BUILD:=lowpan_border_router lowpan_host lowpan_router nanostack_full thread_border_router thread_router thread_end_device ethernet_host ws_border_router ws_router
 TOOLCHAINS_TO_BUILD:=GCC ARM ARMC6 IAR
 CORES_TO_BUILD:=Cortex-M0 Cortex-M3
 

features/nanostack/sal-stack-nanostack/nanostack/dhcp_service_api.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017, Arm Limited and affiliates.
+ * Copyright (c) 2013-2018, Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

features/nanostack/sal-stack-nanostack/nanostack/ethernet_mac_api.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2018, Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

features/nanostack/sal-stack-nanostack/nanostack/mlme.h

@@ -264,6 +264,7 @@ typedef enum {
     macAutoRequestKeyIndex = 0x7b,  /*<The index of the key used for automatic data*/
     macDefaultKeySource = 0x7c,      /*<Default key source*/
     //NON standard extension
+    macRfConfiguration = 0xfb,      /*<RF channel configuration parameters*/
     macAcceptByPassUnknowDevice = 0xfc,  /*< Accept data trough MAC if packet is data can be authenticated by group key nad MIC. Security enforsment point must be handled carefully these packets */
     macLoadBalancingBeaconTx = 0xfd,  /*< Trig Beacon from load balance module periodic */
     macLoadBalancingAcceptAnyBeacon = 0xfe, /*<Beacon accept state control from other network. Value size bool, data true=Enable, false=disable .*/

features/nanostack/sal-stack-nanostack/nanostack/multicast_api.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2017, Arm Limited and affiliates.
+ * Copyright (c) 2012-2018, Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

features/nanostack/sal-stack-nanostack/nanostack/net_address_extension.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017, Arm Limited and affiliates.
+ * Copyright (c) 2013-2018, Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

features/nanostack/sal-stack-nanostack/nanostack/net_interface.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -235,6 +235,18 @@ typedef struct {
     const uint8_t *key_chain[4];    /**< Certificate private key. */
 } arm_certificate_chain_entry_s;
 
+/** Certificate structure. */
+typedef struct {
+    const uint8_t *cert;           /**< Certificate pointer. */
+    uint16_t cert_len;             /**< Certificate length. */
+} arm_certificate_entry_s;
+
+/** Certificate Revocation List structure. */
+typedef struct {
+    const uint8_t *crl;            /**< Certificate Revocation List pointer. */
+    uint16_t crl_len;              /**< Certificate Revocation List length. */
+} arm_cert_revocation_list_entry_s;
+
 /** Structure for the network keys used by net_network_key_get */
 typedef struct ns_keys_t
 
@@ -880,12 +892,56 @@ extern int8_t arm_net_route_delete(const uint8_t *prefix, uint8_t prefix_len, co
 extern int8_t arm_nwk_6lowpan_border_router_nd_context_load(int8_t interface_id, uint8_t *contex_data);  //NVM
 
 /**
- * Set certificate chain for PANA
+ * Set certificate chain
+ *
  * \param chain_info Certificate chain.
  * \return 0 on success, negative on failure.
  */
 extern int8_t arm_network_certificate_chain_set(const arm_certificate_chain_entry_s *chain_info);
 
+/**
+ * Add trusted certificate
+ *
+ * This is used to add trusted root or intermediate certificate in addition to those
+ * added using certificate chain set call. Function can be called several times to add
+ * more than one certificate.
+ *
+ * \param cert Certificate.
+ * \return 0 on success, negative on failure.
+ */
+extern int8_t arm_network_trusted_certificate_add(const arm_certificate_entry_s *cert);
+
+/**
+ * Remove trusted certificate
+ *
+ * This is used to remove trusted root or intermediate certificate.
+ *
+ * \param cert Certificate.
+ * \return 0 on success, negative on failure.
+ */
+extern int8_t arm_network_trusted_certificate_remove(const arm_certificate_entry_s *cert);
+
+/**
+ * Add Certificate Revocation List
+ *
+ * This is used to add Certificate Revocation List (CRL). Function can be called several
+ * times to add more than one Certificate Revocation List.
+ *
+ * \param crl Certificate revocation list
+ * \return 0 on success, negative on failure.
+ */
+extern int8_t arm_network_certificate_revocation_list_add(const arm_cert_revocation_list_entry_s *crl);
+
+/**
+ * Remove Certificate Revocation List
+ *
+ * This is used to remove Certificate Revocation List.
+ *
+ * \param crl Certificate revocation list
+ * \return 0 on success, negative on failure.
+ */
+extern int8_t arm_network_certificate_revocation_list_remove(const arm_cert_revocation_list_entry_s *crl);
+
 /**
  * \brief Add PSK key to TLS library.
  *

features/nanostack/sal-stack-nanostack/nanostack/net_load_balance_api.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2018, Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

features/nanostack/sal-stack-nanostack/nanostack/net_nvm_api.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017, Arm Limited and affiliates.
+ * Copyright (c) 2013-2018, Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");