Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nrf_security: Remove secp521r1 Kconfig #12123

Merged
merged 2 commits into from
Aug 25, 2023
Merged

nrf_security: Remove secp521r1 Kconfig #12123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1224b44
nrf_security: Remove secp521r1 Kconfig
mswarowsky Aug 23, 2023
d950b86
oberon: Fix re-define of PSA_VENDOR_ECC_MAX_CURVE_BITS
mswarowsky Aug 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ext/oberon/psa/core/include/psa/crypto_sizes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@

/* The maximum size of an ECC key on this implementation, in bits.
* This is a vendor-specific macro. */
#ifndef PSA_VENDOR_ECC_MAX_CURVE_BITS
#if defined(PSA_WANT_ECC_SECP_R1_521) /*!!OM*/
#define PSA_VENDOR_ECC_MAX_CURVE_BITS 521
#elif defined(PSA_WANT_ECC_BRAINPOOL_P_R1_512)
Expand Down Expand Up @@ -229,6 +230,7 @@
#else
#define PSA_VENDOR_ECC_MAX_CURVE_BITS 0
#endif
#endif

/** This macro returns the maximum supported length of the PSK for the
* TLS-1.2 PSK-to-MS key derivation
Expand Down
5 changes: 1 addition & 4 deletions subsys/nrf_security/cmake/psa_crypto_config.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ kconfig_check_and_set_base_to_one(PSA_CRYPTO_DRIVER_ECC_SECP_R1_192_CC3XX)
kconfig_check_and_set_base_to_one(PSA_CRYPTO_DRIVER_ECC_SECP_R1_224_CC3XX)
kconfig_check_and_set_base_to_one(PSA_CRYPTO_DRIVER_ECC_SECP_R1_256_CC3XX)
kconfig_check_and_set_base_to_one(PSA_CRYPTO_DRIVER_ECC_SECP_R1_384_CC3XX)
kconfig_check_and_set_base_to_one(PSA_CRYPTO_DRIVER_ECC_SECP_R1_521_CC3XX)

# Convert nrf_oberon driver configurations
kconfig_check_and_set_base_to_one(PSA_CRYPTO_DRIVER_OBERON)
Expand Down Expand Up @@ -262,9 +261,7 @@ kconfig_check_and_set_base_to_one(MBEDTLS_THREADING_C)
kconfig_check_and_set_base_to_one(MBEDTLS_THREADING_ALT)

# Set the max curve bits for the PSA APIs without using MBEDTLS defines
if (CONFIG_PSA_CRYPTO_DRIVER_ECC_SECP_R1_521_CC3XX)
set(PSA_VENDOR_ECC_MAX_CURVE_BITS 521)
elseif(CONFIG_PSA_CRYPTO_DRIVER_ECC_SECP_R1_384_CC3XX)
if(CONFIG_PSA_CRYPTO_DRIVER_ECC_SECP_R1_384_CC3XX)
set(PSA_VENDOR_ECC_MAX_CURVE_BITS 384)
elseif(CONFIG_PSA_CRYPTO_DRIVER_ECC_SECP_R1_256_CC3XX
OR CONFIG_PSA_CRYPTO_DRIVER_ECC_SECP_R1_256
Expand Down
5 changes: 0 additions & 5 deletions subsys/nrf_security/src/drivers/nrf_cc3xx/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,11 +252,6 @@ config PSA_CRYPTO_DRIVER_ECC_SECP_R1_384_CC3XX
prompt "PSA ECC secp384r1 - cc3xx" if !PSA_PROMPTLESS
default y if !PSA_DEFAULT_OFF && PSA_WANT_ECC_SECP_R1_384

config PSA_CRYPTO_DRIVER_ECC_SECP_R1_521_CC3XX
bool
prompt "PSA ECC secp521r1 - cc3xx" if !PSA_PROMPTLESS
default y if !PSA_DEFAULT_OFF && PSA_WANT_ECC_SECP_R1_521

# PSA_CRYPTO_DRIVER_ALG_XTS_CC3XX - Currently not supported

endif # PSA_CRYPTO_DRIVER_CC3XX
Loading