Merge pull request #3930 from ARMmbed/release-candidate

Release candidate for mbed-os-5.4.1

Author: adbridge

drivers/FileSystemLike.h

@@ -114,7 +114,7 @@ class FileSystemLike : public FileBase {
      *    0 on success or un-needed,
      *   -1 on error
      */
-    virtual int stat(const char *name, struct stat *st) = 0;
+    virtual int stat(const char *name, struct stat *st) { return -1; };
 };
 
 } // namespace mbed

features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/hal_patch/sleep.c

@@ -66,6 +66,6 @@ void hal_sleep(void)
 
 void hal_deepsleep(void)
 {
-    sleep();
+    hal_sleep();
     //   NRF_POWER->SYSTEMOFF=1;
 }

features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/sdk/source/drivers_nrf/pstorage/config/pstorage_platform.h

@@ -66,7 +66,10 @@ static __INLINE uint32_t pstorage_flash_page_end()
 
 #define PSTORAGE_FLASH_PAGE_END     pstorage_flash_page_end()
 
+#ifndef PSTORAGE_NUM_OF_PAGES
 #define PSTORAGE_NUM_OF_PAGES       1                                                           /**< Number of flash pages allocated for the pstorage module excluding the swap page, configurable based on system requirements. */
+#endif
+
 #define PSTORAGE_MIN_BLOCK_SIZE     0x0010                                                      /**< Minimum size of block that can be registered with the module. Should be configured based on system requirements, recommendation is not have this value to be at least size of word. */
 
 #define PSTORAGE_DATA_START_ADDR    ((PSTORAGE_FLASH_PAGE_END - PSTORAGE_NUM_OF_PAGES - 1) \

features/FEATURE_LWIP/TESTS/mbedmicro-net/gethostbyname/main.cpp

@@ -91,7 +91,7 @@ void test_dns_literal_pref() {
 
 // Test setup
 utest::v1::status_t test_setup(const size_t number_of_cases) {
-    GREENTEA_SETUP(20, "default_auto");
+    GREENTEA_SETUP(60, "default_auto");
     net_bringup();
     return verbose_test_setup_handler(number_of_cases);
 }

features/FEATURE_LWIP/TESTS/mbedmicro-net/tcp_echo/main.cpp

@@ -29,7 +29,7 @@ void prep_buffer(char *tx_buffer, size_t tx_size) {
 }
 
 int main() {
-    GREENTEA_SETUP(20, "tcp_echo");
+    GREENTEA_SETUP(60, "tcp_echo");
 
     EthernetInterface eth;
     eth.connect();

features/FEATURE_LWIP/TESTS/mbedmicro-net/tcp_echo_parallel/main.cpp

@@ -88,7 +88,7 @@ Echo echoers[MBED_CFG_TCP_CLIENT_ECHO_THREADS];
 
 
 int main() {
-    GREENTEA_SETUP(20, "tcp_echo");
+    GREENTEA_SETUP(60, "tcp_echo");
 
     int err = net.connect();
     TEST_ASSERT_EQUAL(0, err);

features/FEATURE_LWIP/TESTS/mbedmicro-net/tcp_hello_world/main.cpp

@@ -36,7 +36,7 @@ bool find_substring(const char *first, const char *last, const char *s_first, co
 }
 
 int main() {
-    GREENTEA_SETUP(20, "default_auto");
+    GREENTEA_SETUP(60, "default_auto");
 
     bool result = false;
     EthernetInterface eth;

features/FEATURE_LWIP/TESTS/mbedmicro-net/udp_dtls_handshake/main.cpp

@@ -28,7 +28,7 @@ int udp_dtls_handshake_pattern[] = {MBED_CFG_UDP_DTLS_HANDSHAKE_PATTERN};
 const int udp_dtls_handshake_count = sizeof(udp_dtls_handshake_pattern) / sizeof(int);
 
 int main() {
-    GREENTEA_SETUP(20, "udp_shotgun");
+    GREENTEA_SETUP(60, "udp_shotgun");
 
     EthernetInterface eth;
     int err = eth.connect();

features/FEATURE_LWIP/TESTS/mbedmicro-net/udp_echo/main.cpp

@@ -34,7 +34,7 @@ void prep_buffer(char *tx_buffer, size_t tx_size) {
 }
 
 int main() {
-    GREENTEA_SETUP(20, "udp_echo");
+    GREENTEA_SETUP(60, "udp_echo");
 
     EthernetInterface eth;
     eth.connect();

features/FEATURE_LWIP/TESTS/mbedmicro-net/udp_echo_parallel/main.cpp

@@ -99,7 +99,7 @@ Echo echoers[MBED_CFG_UDP_CLIENT_ECHO_THREADS];
 
 
 int main() {
-    GREENTEA_SETUP(20, "udp_echo");
+    GREENTEA_SETUP(60, "udp_echo");
 
     int err = net.connect();
     TEST_ASSERT_EQUAL(0, err);

features/filesystem/bd/BlockDevice.h

@@ -117,15 +117,15 @@ class BlockDevice
      *
      *  @return         Size of the underlying device in bytes
      */
-    virtual bd_size_t size() = 0;
+    virtual bd_size_t size() const = 0;
 
     /** Convenience function for checking block read validity
      *
      *  @param addr     Address of block to begin reading from
      *  @param size     Size to read in bytes
      *  @return         True if read is valid for underlying block device
      */
-    bool is_valid_read(bd_addr_t addr, bd_size_t size)
+    bool is_valid_read(bd_addr_t addr, bd_size_t size) const
     {
         return (
             addr % get_read_size() == 0 &&
@@ -139,7 +139,7 @@ class BlockDevice
      *  @param size     Size to write in bytes
      *  @return         True if program is valid for underlying block device
      */
-    bool is_valid_program(bd_addr_t addr, bd_size_t size)
+    bool is_valid_program(bd_addr_t addr, bd_size_t size) const
     {
         return (
             addr % get_program_size() == 0 &&
@@ -153,7 +153,7 @@ class BlockDevice
      *  @param size     Size to erase in bytes
      *  @return         True if erase is valid for underlying block device
      */
-    bool is_valid_erase(bd_addr_t addr, bd_size_t size)
+    bool is_valid_erase(bd_addr_t addr, bd_size_t size) const
     {
         return (
             addr % get_erase_size() == 0 &&

features/filesystem/bd/ChainingBlockDevice.cpp

@@ -190,7 +190,7 @@ bd_size_t ChainingBlockDevice::get_erase_size() const
     return _erase_size;
 }
 
-bd_size_t ChainingBlockDevice::size()
+bd_size_t ChainingBlockDevice::size() const
 {
     return _size;
 }

features/filesystem/bd/ChainingBlockDevice.h

@@ -140,7 +140,7 @@ class ChainingBlockDevice : public BlockDevice
      *
      *  @return         Size of the underlying device in bytes
      */
-    virtual bd_size_t size();
+    virtual bd_size_t size() const;
 
 protected:
     BlockDevice **_bds;

features/filesystem/bd/HeapBlockDevice.cpp

@@ -77,7 +77,7 @@ bd_size_t HeapBlockDevice::get_erase_size() const
     return _erase_size;
 }
 
-bd_size_t HeapBlockDevice::size()
+bd_size_t HeapBlockDevice::size() const
 {
     return _count * _erase_size;
 }

features/filesystem/bd/HeapBlockDevice.h

@@ -119,7 +119,7 @@ class HeapBlockDevice : public BlockDevice
      *
      *  @return         Size of the underlying device in bytes
      */
-    virtual bd_size_t size();
+    virtual bd_size_t size() const;
 
 private:
     bd_size_t _read_size;

features/filesystem/bd/SlicingBlockDevice.cpp

@@ -108,7 +108,7 @@ bd_size_t SlicingBlockDevice::get_erase_size() const
     return _bd->get_erase_size();
 }
 
-bd_size_t SlicingBlockDevice::size()
+bd_size_t SlicingBlockDevice::size() const
 {
     return _stop - _start;
 }

features/filesystem/bd/SlicingBlockDevice.h

@@ -138,7 +138,7 @@ class SlicingBlockDevice : public BlockDevice
      *
      *  @return         Size of the underlying device in bytes
      */
-    virtual bd_size_t size();
+    virtual bd_size_t size() const;
 
 protected:
     BlockDevice *_bd;

features/mbedtls/VERSION.txt

@@ -1 +1 @@
-mbedtls-2.4.0
+mbedtls-2.4.2

features/mbedtls/importer/Makefile

@@ -27,7 +27,7 @@
 #
 
 # Set the mbed TLS release to import (this can/should be edited before import)
-MBED_TLS_RELEASE ?= mbedtls-2.4.0
+MBED_TLS_RELEASE ?= mbedtls-2.4.2
 
 # Translate between mbed TLS namespace and mbed namespace
 TARGET_PREFIX:=../

features/mbedtls/inc/mbedtls/cmac.h

@@ -58,9 +58,13 @@ struct mbedtls_cmac_context_t
 /**
  * \brief               Set the CMAC key and prepare to authenticate the input
  *                      data.
- *                      Should be called with an initialised cipher context.
+ *                      Should be called with an initialized cipher context.
  *
- * \param ctx           Cipher context
+ * \param ctx           Cipher context. This should be a cipher context,
+ *                      initialized to be one of the following types:
+ *                      MBEDTLS_CIPHER_AES_128_ECB, MBEDTLS_CIPHER_AES_192_ECB,
+ *                      MBEDTLS_CIPHER_AES_256_ECB or
+ *                      MBEDTLS_CIPHER_DES_EDE3_ECB.
  * \param key           CMAC key
  * \param keybits       length of the CMAC key in bits
  *                      (must be acceptable by the cipher)
@@ -115,7 +119,7 @@ int mbedtls_cipher_cmac_finish( mbedtls_cipher_context_t *ctx,
 int mbedtls_cipher_cmac_reset( mbedtls_cipher_context_t *ctx );
 
 /**
- * \brief               Output = Generic_CMAC( hmac key, input buffer )
+ * \brief               Output = Generic_CMAC( cmac key, input buffer )
  *
  * \param cipher_info   message digest info
  * \param key           CMAC key

features/mbedtls/inc/mbedtls/compat-1.3.h

@@ -2453,7 +2453,6 @@
 #define ssl_set_arc4_support mbedtls_ssl_conf_arc4_support
 #define ssl_set_authmode mbedtls_ssl_conf_authmode
 #define ssl_set_bio mbedtls_ssl_set_bio
-#define ssl_set_bio mbedtls_ssl_set_bio_timeout
 #define ssl_set_ca_chain mbedtls_ssl_conf_ca_chain
 #define ssl_set_cbc_record_splitting mbedtls_ssl_conf_cbc_record_splitting
 #define ssl_set_ciphersuites mbedtls_ssl_conf_ciphersuites