Merge pull request #9719 from ARMmbed/release-candidate

Release  candidate for mbed-os-5.11.5-alpha

Author: adbridge

features/device_key/source/DeviceKey.cpp

@@ -260,7 +260,7 @@ int DeviceKey::generate_key_by_random(uint32_t *output, size_t size)
         return DEVICEKEY_INVALID_PARAM;
     }
 
-#if DEVICE_TRNG
+#if defined(DEVICE_TRNG) || defined(MBEDTLS_ENTROPY_NV_SEED)
     uint32_t test_buff[DEVICE_KEY_32BYTE / sizeof(int)];
     mbedtls_entropy_context *entropy = new mbedtls_entropy_context;
     mbedtls_entropy_init(entropy);
@@ -276,6 +276,7 @@ int DeviceKey::generate_key_by_random(uint32_t *output, size_t size)
 
     mbedtls_entropy_free(entropy);
     delete entropy;
+
 #endif
 
     return ret;

platform/mbed_version.h

@@ -44,7 +44,7 @@
   *
   * @note 99 is default value for development version (master branch)
   */
-#define MBED_PATCH_VERSION 4
+#define MBED_PATCH_VERSION 5
 
 #define MBED_ENCODE_VERSION(major, minor, patch) ((major)*10000 + (minor)*100 + (patch))