Skip to content

Commit bc132a6

Browse files
authored
Merge pull request #9719 from ARMmbed/release-candidate
Release candidate for mbed-os-5.11.5-alpha
2 parents ecb3c8c + 36734f4 commit bc132a6

File tree

14 files changed

+3
-2
lines changed

14 files changed

+3
-2
lines changed

features/device_key/source/DeviceKey.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ int DeviceKey::generate_key_by_random(uint32_t *output, size_t size)
260260
return DEVICEKEY_INVALID_PARAM;
261261
}
262262

263-
#if DEVICE_TRNG
263+
#if defined(DEVICE_TRNG) || defined(MBEDTLS_ENTROPY_NV_SEED)
264264
uint32_t test_buff[DEVICE_KEY_32BYTE / sizeof(int)];
265265
mbedtls_entropy_context *entropy = new mbedtls_entropy_context;
266266
mbedtls_entropy_init(entropy);
@@ -276,6 +276,7 @@ int DeviceKey::generate_key_by_random(uint32_t *output, size_t size)
276276

277277
mbedtls_entropy_free(entropy);
278278
delete entropy;
279+
279280
#endif
280281

281282
return ret;

platform/mbed_version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
*
4545
* @note 99 is default value for development version (master branch)
4646
*/
47-
#define MBED_PATCH_VERSION 4
47+
#define MBED_PATCH_VERSION 5
4848

4949
#define MBED_ENCODE_VERSION(major, minor, patch) ((major)*10000 + (minor)*100 + (patch))
5050

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)