Skip to content

Commit 7d223e2

Browse files
tomi-fontrlubos
authored andcommitted
[nrf fromlist] lib: uuid: fix prerequisites for CONFIG_UUID_V5
It should not depend on CONFIG_MBEDTLS nor CONFIG_MBEDTLS_PSA_CRYPTO_C as a PSA Crypto provider other than Mbed TLS may be enabled. In fact, it doesn't even need to depend on CONFIG_PSA_CRYPTO because CONFIG_PSA_WANT_ALG_SHA_1 is already guarded behind CONFIG_PSA_CRYPTO_CLIENT. At the same time, replace all the `depends on UUID` by a single if which is the standard way to do. Also turn CONFIG_UUID into a menuconfig instead of creating a menu manually. Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no> Upstream PR #: 108469
1 parent 0ff6e84 commit 7d223e2

1 file changed

Lines changed: 5 additions & 10 deletions

File tree

lib/uuid/Kconfig

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,21 @@
22
#
33
# SPDX-License-Identifier: Apache-2.0
44

5-
menu "Universally Unique Identifier (UUID)"
6-
7-
config UUID
8-
bool "UUID support"
5+
menuconfig UUID
6+
bool "Universally Unique Identifier (UUID) library"
97
help
108
Enable use of the UUID library.
119

10+
if UUID
11+
1212
config UUID_V4
1313
bool "UUID version 4 generation support"
14-
depends on UUID
1514
depends on ENTROPY_GENERATOR
1615
help
1716
Enable generation of UUID v4.
1817

1918
config UUID_V5
2019
bool "UUID version 5 generation support"
21-
depends on UUID
22-
depends on MBEDTLS
23-
depends on MBEDTLS_PSA_CRYPTO_C
2420
depends on PSA_WANT_ALG_SHA_1
2521
# When TF-M is enabled, Mbed TLS's MD module (which is used to generate
2622
# v5 UUIDs) will dispacth hash operations to TF-M. Unfortunately TF-M
@@ -32,10 +28,9 @@ config UUID_V5
3228

3329
config UUID_BASE64
3430
bool "UUID Base64 support"
35-
depends on UUID
3631
depends on BASE64
3732
help
3833
Enable conversion functions to write UUIDs in base 64
3934
formats.
4035

41-
endmenu
36+
endif

0 commit comments

Comments
 (0)