Revert "[nrf noup] modules: mbedtls: Disable configurations in Kconfig.tls-generic"

This reverts commit fe0996c.

Signed-off-by: Dominik Ermel <[email protected]>

Author: de-nordic

modules/mbedtls/Kconfig.tls-generic

@@ -7,8 +7,6 @@
 menu "Mbed TLS configuration"
 	depends on MBEDTLS_BUILTIN && MBEDTLS_CFG_FILE = "config-tls-generic.h"
 
-if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
-
 menu "TLS"
 
 config MBEDTLS_TLS_VERSION_1_2
@@ -42,14 +40,10 @@ endif # MBEDTLS_TLS_VERSION_1_2 || MBEDTLS_TLS_VERSION_1_3
 
 endmenu # TLS
 
-endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
-
 menu "Ciphersuite configuration"
 
 comment "Supported key exchange modes"
 
-if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
-
 config MBEDTLS_KEY_EXCHANGE_ALL_ENABLED
 	bool "All available ciphersuite modes"
 	select MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
@@ -77,17 +71,13 @@ config MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
 config MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED
 	bool "RSA-PSK based ciphersuite modes"
 
-endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
-
 config MBEDTLS_PSK_MAX_LEN
 	int "Max size of TLS pre-shared keys"
 	default 32
 	help
 	  Max size of TLS pre-shared keys, in bytes. It has no effect if no
 	  PSK key exchange is used.
 
-if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
-
 config MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
 	bool "RSA-only based ciphersuite modes"
 	default y if UOSCORE || UEDHOC
@@ -225,12 +215,8 @@ config MBEDTLS_ECP_NIST_OPTIM
 
 endif
 
-endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
-
 comment "Supported ciphers and cipher modes"
 
-if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
-
 config MBEDTLS_CIPHER_ALL_ENABLED
 	bool "All available ciphers and modes"
 	select MBEDTLS_CIPHER_AES_ENABLED
@@ -321,12 +307,8 @@ config MBEDTLS_CMAC
 	bool "CMAC (Cipher-based Message Authentication Code) mode for block ciphers."
 	depends on MBEDTLS_CIPHER_AES_ENABLED || MBEDTLS_CIPHER_DES_ENABLED
 
-endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
-
 comment "Supported hash algorithms"
 
-if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
-
 config MBEDTLS_HASH_ALL_ENABLED
 	bool "All available MAC methods"
 	select MBEDTLS_MD5
@@ -367,14 +349,10 @@ config MBEDTLS_SHA512
 config MBEDTLS_POLY1305
 	bool "Poly1305 hash family"
 
-endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
-
 endmenu
 
 comment "Random number generators"
 
-if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
-
 config MBEDTLS_CTR_DRBG_ENABLED
 	bool "CTR_DRBG AES-256-based random generator"
 	depends on MBEDTLS_CIPHER_AES_ENABLED
@@ -384,21 +362,15 @@ config MBEDTLS_HMAC_DRBG_ENABLED
 	bool "HMAC_DRBG random generator"
 	select MBEDTLS_MD
 
-endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
-
 comment "Other configurations"
 
 config MBEDTLS_CIPHER
 	bool "generic cipher layer."
 	default y if PSA_WANT_ALG_CMAC
 
-if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
-
 config MBEDTLS_MD
 	bool "generic message digest layer."
 
-endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
-
 config MBEDTLS_GENPRIME_ENABLED
 	bool "prime-number generation code."
 
@@ -416,8 +388,6 @@ config MBEDTLS_HAVE_ASM
 	  of asymmetric cryptography, however this might have an impact on the
 	  code size.
 
-if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
-
 config MBEDTLS_ENTROPY_C
 	bool "Mbed TLS entropy accumulator"
 	depends on MBEDTLS_SHA256 || MBEDTLS_SHA384 || MBEDTLS_SHA512
@@ -426,8 +396,6 @@ config MBEDTLS_ENTROPY_C
 	  mostly used in conjunction with CTR_DRBG or HMAC_DRBG to create
 	  a deterministic random number generator.
 
-endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
-
 config MBEDTLS_ENTROPY_POLL_ZEPHYR
 	bool "Provide entropy data to Mbed TLS through entropy driver or random generator"
 	default y