yuzu-mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-mirror/mbedtls.git synced 2025-12-06 07:12:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
mbedtls/include/mbedtls/config_psa.h

368 lines
11 KiB
C
Raw Normal View History

Created infrastructure for MBEDTLS_PSA_CRYPTO_CONFIG In order to prepare for PSA cryptographic mechanism for conditional inclusion of various modules, there needs to be some updates to the mbedtls configuration to enable that feature to work. This initial set of changes just lays the ground work and future changes will implement the functional features. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-09-18 06:15:13 +02:00
/**
* \file mbedtls/config_psa.h
* \brief PSA crypto configuration options (set of defines)
*
Correct inclusion of MBEDTLS_XXX based on PSA_WANT_XXX Provied a more detailed description for the config_psa.h header file. This new description makes it clear that the file should not be edited by users or integrators. Relevant changes should be made to psa/crypto_config.h instead. Fixed the logic for the inclusion of MBEDTLS_PSA_BUILTIN_XXX to be set when PSA_WANT_ALG_XXX and MBEDTLS_PSA_ACCEL_ALG_XXX is not defined, otherwise the MBEDTLS_XXX should be set. Ensure that MBEDTLS_PSA_BUILTIN_XXX is set to 1 and not simply defined per specification. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-10-13 06:36:22 +02:00
* This set of compile-time options takes settings defined in
* include/mbedtls/config.h and include/psa/crypto_config.h and uses
* those definitions to define symbols used in the library code.
*
* Users and integrators should not edit this file, please edit
* include/mbedtls/config.h for MBETLS_XXX settings or
* include/psa/crypto_config.h for PSA_WANT_XXX settings.
Created infrastructure for MBEDTLS_PSA_CRYPTO_CONFIG In order to prepare for PSA cryptographic mechanism for conditional inclusion of various modules, there needs to be some updates to the mbedtls configuration to enable that feature to work. This initial set of changes just lays the ground work and future changes will implement the functional features. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-09-18 06:15:13 +02:00
*/
/*
* Copyright The Mbed TLS Contributors
* SPDX-License-Identifier: Apache-2.0
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may
* not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef MBEDTLS_CONFIG_PSA_H
#define MBEDTLS_CONFIG_PSA_H
Minor cleanup to fix errors with some unit tests With the new feature MBEDTLS_PSA_CRYPTO_CONFIG, needed to add support that when the feature is disabled, if there are defines like MBEDTLS_ECDSA_C defined, then the PSA_WANT_ equivalent define is also enabled. This ensures the guards in the library psa_crypto will work properly. Also fixed an error return code in the driver wrapper for cipher encrypt setup so it will properly pass unit tests. Ensured config.py full works properly with the new MBEDTLS_PSA_CRYPTO_CONFIG, it should not be set when the full option is used. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-09-30 07:07:04 +02:00
#if defined(MBEDTLS_PSA_CRYPTO_CONFIG)
Created infrastructure for MBEDTLS_PSA_CRYPTO_CONFIG In order to prepare for PSA cryptographic mechanism for conditional inclusion of various modules, there needs to be some updates to the mbedtls configuration to enable that feature to work. This initial set of changes just lays the ground work and future changes will implement the functional features. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-09-18 06:15:13 +02:00
#include "psa/crypto_config.h"
Fix typo in define in comment This fixes error in check-names.sh test. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-09-30 07:33:49 +02:00
#endif /* defined(MBEDTLS_PSA_CRYPTO_CONFIG) */
Created infrastructure for MBEDTLS_PSA_CRYPTO_CONFIG In order to prepare for PSA cryptographic mechanism for conditional inclusion of various modules, there needs to be some updates to the mbedtls configuration to enable that feature to work. This initial set of changes just lays the ground work and future changes will implement the functional features. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-09-18 06:15:13 +02:00
#ifdef __cplusplus
extern "C" {
#endif
Update how MBEDTLS_PSA_CRYPTO_CONFIG is handled Originally, MBEDTLS_PSA_CRYPTO_CONFIG was being used to allow inclusion of mbedlts/config_psa.h, but that needed to be updated so that mbedtls/config_psa.h is always included and the definitions specific to PSA configuration are now guarded by MBEDTLS_PSA_CRYPTO_CONFIG. This will allow for the standard setup to continue working while new PSA configuration items to also work. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-09-24 13:30:10 +02:00
#if defined(MBEDTLS_PSA_CRYPTO_CONFIG)
Add ECDSA support to PSA crypto configuration Initial changes to PSA crypto core to support configuration of ECDSA algorithm using PSA crypto configuration mechanism. Guards using MBEDTLS_ECDSA_C and MBEDTLS_ECDSA_DETERMINISTIC have been changed to be based off PSA_WANT_ALG_ECDSA and PSA_WANT_ALG_ECDSA_DETERMINISTIC. Added new tests to all.sh to confirm new settings are working properly. Current code does not pass the tests since built in signature verification is not in place. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-09-21 08:09:17 +02:00
Correct use of MBEDTLS_PSA_BUILTIN_ALG_xxx in crypto library The psa crypto library was generically using PSA_WANT_ALG_xxx, but should have been using the correct MBEDTLS_PSA_BUILTIN_ALG_xxx definition since that code is the builtin version. There were also a couple of spots that needed to ensure the code block was enabled for either ECDSA or DETERMINISTIC_ECDSA, not just one of them. Fixed all the new ALG_ECDSA_DETERMINISTIC names to be ALG_DETERMINISTIC_ECDSA instead. Fixed test to use correct definitions. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-10-14 04:58:20 +02:00
#if defined(PSA_WANT_ALG_DETERMINISTIC_ECDSA)
#if !defined(MBEDTLS_PSA_ACCEL_ALG_DETERMINISTIC_ECDSA)
Minor updates to address review comments Removed unecessary checks on the ALG_SHA_224 and ALG_SHA_384 since those are handled in config_psa.h by ensuring the correct _C is included. Reformatted config_psa.h to be alphabetical and made the assignments line up correctly for consistency. Fixed the guards for ALG_SHA_224 and ALG_SHA_384 to be correct in the crypto library source. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-12-01 06:06:05 +01:00
#define MBEDTLS_PSA_BUILTIN_ALG_DETERMINISTIC_ECDSA 1
Add ECDSA support to PSA crypto configuration Initial changes to PSA crypto core to support configuration of ECDSA algorithm using PSA crypto configuration mechanism. Guards using MBEDTLS_ECDSA_C and MBEDTLS_ECDSA_DETERMINISTIC have been changed to be based off PSA_WANT_ALG_ECDSA and PSA_WANT_ALG_ECDSA_DETERMINISTIC. Added new tests to all.sh to confirm new settings are working properly. Current code does not pass the tests since built in signature verification is not in place. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-09-21 08:09:17 +02:00
#define MBEDTLS_ECDSA_DETERMINISTIC
Ensure MBEDTLS_ECDSA_C is set when DETERMINISTIC_ECDSA is used Ensure that MBEDTLS_ECDSA_C is set when PSA_WANT_ALG_DETERMINISTIC_ECDSA is requested. Also added MBEDTLS_ECDSA_C to the requirements comment in config.h for MBEDTLS_ECDSA_DETERMINISTIC. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-10-26 17:39:05 +01:00
#define MBEDTLS_ECDSA_C
Ensure dependent features also included by config_psa.h When the PSA crypto features need to be setup based on the PSA_WANT_xxx macros, the dependent features also need to be enabled. This change corrects that for the MBEDTLS_ECDSA_DETERMINISTIC. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-10-23 10:22:58 +02:00
#define MBEDTLS_HMAC_DRBG_C
#define MBEDTLS_MD_C
Phase 2 support for MBEDTLS_PSA_CRYPTO_CONFIG This phase adds in support for the following features being added to the list of features that can be configured in the include/psa/crypto_config.h header file using the PSA_WANT_ALG_xxx macros: ECDH, HMAC, HKDF, and RSA. These changes include changes to the PSA crypto library to use the appropriate new guards that will allow the feature to be compiled in or out either using new PSA_WANT_ALG_xxx or the previous MBEDTLS_xxx macros. For HKDF and HMAC, most of the PSA library code did not have a specific matching MBEDTLS_xxx macro for that feature, but was instead using the generic dependent MBEDTLS_MD_C macro. The ECDH and RSA features more closely aligned with a direct replacement with a similar macro. The new tests for RSA, HMAC, and HKDF would normally unset additional dependent macros, but when attempting to implement that level of testing it required removal of too many core features like MD_C, PK_C, ECP_C and other low level features. This may point to additional phases of work to complete the transition of these features to the new model. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-10-30 05:37:36 +01:00
#endif /* !MBEDTLS_PSA_ACCEL_ALG_DETERMINISTIC_ECDSA */
Correct inclusion of MBEDTLS_XXX based on PSA_WANT_XXX Provied a more detailed description for the config_psa.h header file. This new description makes it clear that the file should not be edited by users or integrators. Relevant changes should be made to psa/crypto_config.h instead. Fixed the logic for the inclusion of MBEDTLS_PSA_BUILTIN_XXX to be set when PSA_WANT_ALG_XXX and MBEDTLS_PSA_ACCEL_ALG_XXX is not defined, otherwise the MBEDTLS_XXX should be set. Ensure that MBEDTLS_PSA_BUILTIN_XXX is set to 1 and not simply defined per specification. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-10-13 06:36:22 +02:00
#endif /* PSA_WANT_ALG_DETERMINISTIC_ECDSA */
Update how MBEDTLS_PSA_CRYPTO_CONFIG is handled Originally, MBEDTLS_PSA_CRYPTO_CONFIG was being used to allow inclusion of mbedlts/config_psa.h, but that needed to be updated so that mbedtls/config_psa.h is always included and the definitions specific to PSA configuration are now guarded by MBEDTLS_PSA_CRYPTO_CONFIG. This will allow for the standard setup to continue working while new PSA configuration items to also work. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-09-24 13:30:10 +02:00
Phase 2 support for MBEDTLS_PSA_CRYPTO_CONFIG This phase adds in support for the following features being added to the list of features that can be configured in the include/psa/crypto_config.h header file using the PSA_WANT_ALG_xxx macros: ECDH, HMAC, HKDF, and RSA. These changes include changes to the PSA crypto library to use the appropriate new guards that will allow the feature to be compiled in or out either using new PSA_WANT_ALG_xxx or the previous MBEDTLS_xxx macros. For HKDF and HMAC, most of the PSA library code did not have a specific matching MBEDTLS_xxx macro for that feature, but was instead using the generic dependent MBEDTLS_MD_C macro. The ECDH and RSA features more closely aligned with a direct replacement with a similar macro. The new tests for RSA, HMAC, and HKDF would normally unset additional dependent macros, but when attempting to implement that level of testing it required removal of too many core features like MD_C, PK_C, ECP_C and other low level features. This may point to additional phases of work to complete the transition of these features to the new model. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-10-30 05:37:36 +01:00
#if defined(PSA_WANT_ALG_ECDH)
#if !defined(MBEDTLS_PSA_ACCEL_ALG_ECDH)
Minor updates to address review comments Removed unecessary checks on the ALG_SHA_224 and ALG_SHA_384 since those are handled in config_psa.h by ensuring the correct _C is included. Reformatted config_psa.h to be alphabetical and made the assignments line up correctly for consistency. Fixed the guards for ALG_SHA_224 and ALG_SHA_384 to be correct in the crypto library source. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-12-01 06:06:05 +01:00
#define MBEDTLS_PSA_BUILTIN_ALG_ECDH 1
Phase 2 support for MBEDTLS_PSA_CRYPTO_CONFIG This phase adds in support for the following features being added to the list of features that can be configured in the include/psa/crypto_config.h header file using the PSA_WANT_ALG_xxx macros: ECDH, HMAC, HKDF, and RSA. These changes include changes to the PSA crypto library to use the appropriate new guards that will allow the feature to be compiled in or out either using new PSA_WANT_ALG_xxx or the previous MBEDTLS_xxx macros. For HKDF and HMAC, most of the PSA library code did not have a specific matching MBEDTLS_xxx macro for that feature, but was instead using the generic dependent MBEDTLS_MD_C macro. The ECDH and RSA features more closely aligned with a direct replacement with a similar macro. The new tests for RSA, HMAC, and HKDF would normally unset additional dependent macros, but when attempting to implement that level of testing it required removal of too many core features like MD_C, PK_C, ECP_C and other low level features. This may point to additional phases of work to complete the transition of these features to the new model. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-10-30 05:37:36 +01:00
#define MBEDTLS_ECDH_C
#define MBEDTLS_ECP_C
#define MBEDTLS_BIGNUM_C
Added additional support for ECP for PSA_CRYPTO_CONFIG The KEY_TYPE_ECC_KEY_PAIR and KEY_TYPE_ECC_PUBLIC_KEY were previously being guarded by MBEDTLS_ECP_C in the PSA crypto library code. This change moves it to the new MBEDTLS_PSA_BUILTIN_xxx and separates KEY_PAIR and PUBLIC_KEY as needed. Tests have also been added to validate the new settings. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-10-29 04:09:55 +01:00
#endif /* !MBEDTLS_PSA_ACCEL_ALG_ECDH */
#endif /* PSA_WANT_ALG_ECDH */
Updates to PSA crypto library based on review comments Moved new check_crypto_config.h file from include/psa to library directory and the file is now included from *.c instead of the crypto_config.h file. Fixed guards in PSA crypto library based on review comments for new PSA crypto config features. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-17 07:08:34 +01:00
#if defined(PSA_WANT_ALG_ECDSA)
#if !defined(MBEDTLS_PSA_ACCEL_ALG_ECDSA)
Minor updates to address review comments Removed unecessary checks on the ALG_SHA_224 and ALG_SHA_384 since those are handled in config_psa.h by ensuring the correct _C is included. Reformatted config_psa.h to be alphabetical and made the assignments line up correctly for consistency. Fixed the guards for ALG_SHA_224 and ALG_SHA_384 to be correct in the crypto library source. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-12-01 06:06:05 +01:00
#define MBEDTLS_PSA_BUILTIN_ALG_ECDSA 1
Updates to PSA crypto library based on review comments Moved new check_crypto_config.h file from include/psa to library directory and the file is now included from *.c instead of the crypto_config.h file. Fixed guards in PSA crypto library based on review comments for new PSA crypto config features. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-17 07:08:34 +01:00
#define MBEDTLS_ECDSA_C
#endif /* !MBEDTLS_PSA_ACCEL_ALG_ECDSA */
#endif /* PSA_WANT_ALG_ECDSA */
Phase 2 support for MBEDTLS_PSA_CRYPTO_CONFIG This phase adds in support for the following features being added to the list of features that can be configured in the include/psa/crypto_config.h header file using the PSA_WANT_ALG_xxx macros: ECDH, HMAC, HKDF, and RSA. These changes include changes to the PSA crypto library to use the appropriate new guards that will allow the feature to be compiled in or out either using new PSA_WANT_ALG_xxx or the previous MBEDTLS_xxx macros. For HKDF and HMAC, most of the PSA library code did not have a specific matching MBEDTLS_xxx macro for that feature, but was instead using the generic dependent MBEDTLS_MD_C macro. The ECDH and RSA features more closely aligned with a direct replacement with a similar macro. The new tests for RSA, HMAC, and HKDF would normally unset additional dependent macros, but when attempting to implement that level of testing it required removal of too many core features like MD_C, PK_C, ECP_C and other low level features. This may point to additional phases of work to complete the transition of these features to the new model. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-10-30 05:37:36 +01:00
#if defined(PSA_WANT_ALG_HKDF)
#if !defined(MBEDTLS_PSA_ACCEL_ALG_HKDF)
Minor updates to address review comments Removed unecessary checks on the ALG_SHA_224 and ALG_SHA_384 since those are handled in config_psa.h by ensuring the correct _C is included. Reformatted config_psa.h to be alphabetical and made the assignments line up correctly for consistency. Fixed the guards for ALG_SHA_224 and ALG_SHA_384 to be correct in the crypto library source. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-12-01 06:06:05 +01:00
#define MBEDTLS_PSA_BUILTIN_ALG_HMAC 1
#define MBEDTLS_PSA_BUILTIN_ALG_HKDF 1
Added additional support for ECP for PSA_CRYPTO_CONFIG The KEY_TYPE_ECC_KEY_PAIR and KEY_TYPE_ECC_PUBLIC_KEY were previously being guarded by MBEDTLS_ECP_C in the PSA crypto library code. This change moves it to the new MBEDTLS_PSA_BUILTIN_xxx and separates KEY_PAIR and PUBLIC_KEY as needed. Tests have also been added to validate the new settings. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-10-29 04:09:55 +01:00
#endif /* !MBEDTLS_PSA_ACCEL_ALG_HKDF */
#endif /* PSA_WANT_ALG_HKDF */
Phase 2 support for MBEDTLS_PSA_CRYPTO_CONFIG This phase adds in support for the following features being added to the list of features that can be configured in the include/psa/crypto_config.h header file using the PSA_WANT_ALG_xxx macros: ECDH, HMAC, HKDF, and RSA. These changes include changes to the PSA crypto library to use the appropriate new guards that will allow the feature to be compiled in or out either using new PSA_WANT_ALG_xxx or the previous MBEDTLS_xxx macros. For HKDF and HMAC, most of the PSA library code did not have a specific matching MBEDTLS_xxx macro for that feature, but was instead using the generic dependent MBEDTLS_MD_C macro. The ECDH and RSA features more closely aligned with a direct replacement with a similar macro. The new tests for RSA, HMAC, and HKDF would normally unset additional dependent macros, but when attempting to implement that level of testing it required removal of too many core features like MD_C, PK_C, ECP_C and other low level features. This may point to additional phases of work to complete the transition of these features to the new model. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-10-30 05:37:36 +01:00
Updates to PSA crypto library based on review comments Moved new check_crypto_config.h file from include/psa to library directory and the file is now included from *.c instead of the crypto_config.h file. Fixed guards in PSA crypto library based on review comments for new PSA crypto config features. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-17 07:08:34 +01:00
#if defined(PSA_WANT_ALG_HMAC)
#if !defined(MBEDTLS_PSA_ACCEL_ALG_HMAC)
Minor updates to address review comments Removed unecessary checks on the ALG_SHA_224 and ALG_SHA_384 since those are handled in config_psa.h by ensuring the correct _C is included. Reformatted config_psa.h to be alphabetical and made the assignments line up correctly for consistency. Fixed the guards for ALG_SHA_224 and ALG_SHA_384 to be correct in the crypto library source. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-12-01 06:06:05 +01:00
#define MBEDTLS_PSA_BUILTIN_ALG_HMAC 1
Updates to PSA crypto library based on review comments Moved new check_crypto_config.h file from include/psa to library directory and the file is now included from *.c instead of the crypto_config.h file. Fixed guards in PSA crypto library based on review comments for new PSA crypto config features. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-17 07:08:34 +01:00
#endif /* !MBEDTLS_PSA_ACCEL_ALG_HMAC */
#endif /* PSA_WANT_ALG_HMAC */
Minor updates to address review comments Removed unecessary checks on the ALG_SHA_224 and ALG_SHA_384 since those are handled in config_psa.h by ensuring the correct _C is included. Reformatted config_psa.h to be alphabetical and made the assignments line up correctly for consistency. Fixed the guards for ALG_SHA_224 and ALG_SHA_384 to be correct in the crypto library source. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-12-01 06:06:05 +01:00
#if defined(PSA_WANT_ALG_MD2) && !defined(MBEDTLS_PSA_ACCEL_ALG_MD2)
#define MBEDTLS_PSA_BUILTIN_ALG_MD2 1
#define MBEDTLS_MD2_C
#endif
#if defined(PSA_WANT_ALG_MD4) && !defined(MBEDTLS_PSA_ACCEL_ALG_MD4)
#define MBEDTLS_PSA_BUILTIN_ALG_MD4 1
#define MBEDTLS_MD4_C
#endif
#if defined(PSA_WANT_ALG_MD5) && !defined(MBEDTLS_PSA_ACCEL_ALG_MD5)
#define MBEDTLS_PSA_BUILTIN_ALG_MD5 1
#define MBEDTLS_MD5_C
#endif
#if defined(PSA_WANT_ALG_RIPEMD160) && !defined(MBEDTLS_PSA_ACCEL_ALG_RIPEMD160)
#define MBEDTLS_PSA_BUILTIN_ALG_RIPEMD160 1
#define MBEDTLS_RIPEMD160_C
#endif
Minor updates from review comments Updated macros in config_psa.h that used ECC_xxx to use KEY_TYPE_ECC_xxx per comments from review. Implemented a check_config_psa.h to help with dependency checking of features enabled in config_psa.h. Added check_config_psa.h to visual studio project. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-04 21:28:15 +01:00
#if defined(PSA_WANT_ALG_RSA_OAEP)
Add feature support for RSA for PSA crypto config In the original attempt to add RSA support to PSA crypto config was too generic. This set of changes adds support for the following RSA features: PSA_WANT_ALG_RSA_PKCS1V15_CRYPT, PSA_WANT_ALG_RSA_PKCS1V15_SIGN, PSA_WANT_ALG_RSA_OAEP, PSA_WANT_ALG_RSA_PSS, PSA_WANT_KEY_TYPE_RSA_KEY_PAIR, and PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY. There were also some updates to ensure the proper inclusion of PSA crypto library code when certain features are enabled. These updates were made to address warnings and errors in builds from the new tests for these features being added for PSA crypto configuration. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-01 06:06:54 +01:00
#if !defined(MBEDTLS_PSA_ACCEL_ALG_RSA_OAEP)
Minor updates to address review comments Removed unecessary checks on the ALG_SHA_224 and ALG_SHA_384 since those are handled in config_psa.h by ensuring the correct _C is included. Reformatted config_psa.h to be alphabetical and made the assignments line up correctly for consistency. Fixed the guards for ALG_SHA_224 and ALG_SHA_384 to be correct in the crypto library source. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-12-01 06:06:05 +01:00
#define MBEDTLS_PSA_BUILTIN_ALG_RSA_OAEP 1
Add feature support for RSA for PSA crypto config In the original attempt to add RSA support to PSA crypto config was too generic. This set of changes adds support for the following RSA features: PSA_WANT_ALG_RSA_PKCS1V15_CRYPT, PSA_WANT_ALG_RSA_PKCS1V15_SIGN, PSA_WANT_ALG_RSA_OAEP, PSA_WANT_ALG_RSA_PSS, PSA_WANT_KEY_TYPE_RSA_KEY_PAIR, and PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY. There were also some updates to ensure the proper inclusion of PSA crypto library code when certain features are enabled. These updates were made to address warnings and errors in builds from the new tests for these features being added for PSA crypto configuration. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-01 06:06:54 +01:00
#define MBEDTLS_RSA_C
#define MBEDTLS_BIGNUM_C
#define MBEDTLS_OID_C
Minor updates from review comments Updated macros in config_psa.h that used ECC_xxx to use KEY_TYPE_ECC_xxx per comments from review. Implemented a check_config_psa.h to help with dependency checking of features enabled in config_psa.h. Added check_config_psa.h to visual studio project. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-04 21:28:15 +01:00
#define MBEDTLS_PKCS1_V21
Updates to PSA crypto library based on review comments Moved new check_crypto_config.h file from include/psa to library directory and the file is now included from *.c instead of the crypto_config.h file. Fixed guards in PSA crypto library based on review comments for new PSA crypto config features. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-17 07:08:34 +01:00
#define MBEDTLS_MD_C
Add feature support for RSA for PSA crypto config In the original attempt to add RSA support to PSA crypto config was too generic. This set of changes adds support for the following RSA features: PSA_WANT_ALG_RSA_PKCS1V15_CRYPT, PSA_WANT_ALG_RSA_PKCS1V15_SIGN, PSA_WANT_ALG_RSA_OAEP, PSA_WANT_ALG_RSA_PSS, PSA_WANT_KEY_TYPE_RSA_KEY_PAIR, and PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY. There were also some updates to ensure the proper inclusion of PSA crypto library code when certain features are enabled. These updates were made to address warnings and errors in builds from the new tests for these features being added for PSA crypto configuration. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-01 06:06:54 +01:00
#endif /* !MBEDTLS_PSA_ACCEL_ALG_RSA_OAEP */
Minor updates from review comments Updated macros in config_psa.h that used ECC_xxx to use KEY_TYPE_ECC_xxx per comments from review. Implemented a check_config_psa.h to help with dependency checking of features enabled in config_psa.h. Added check_config_psa.h to visual studio project. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-04 21:28:15 +01:00
#endif /* PSA_WANT_ALG_RSA_OAEP */
#if defined(PSA_WANT_ALG_RSA_PKCS1V15_CRYPT)
Add feature support for RSA for PSA crypto config In the original attempt to add RSA support to PSA crypto config was too generic. This set of changes adds support for the following RSA features: PSA_WANT_ALG_RSA_PKCS1V15_CRYPT, PSA_WANT_ALG_RSA_PKCS1V15_SIGN, PSA_WANT_ALG_RSA_OAEP, PSA_WANT_ALG_RSA_PSS, PSA_WANT_KEY_TYPE_RSA_KEY_PAIR, and PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY. There were also some updates to ensure the proper inclusion of PSA crypto library code when certain features are enabled. These updates were made to address warnings and errors in builds from the new tests for these features being added for PSA crypto configuration. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-01 06:06:54 +01:00
#if !defined(MBEDTLS_PSA_ACCEL_ALG_RSA_PKCS1V15_CRYPT)
Minor updates to address review comments Removed unecessary checks on the ALG_SHA_224 and ALG_SHA_384 since those are handled in config_psa.h by ensuring the correct _C is included. Reformatted config_psa.h to be alphabetical and made the assignments line up correctly for consistency. Fixed the guards for ALG_SHA_224 and ALG_SHA_384 to be correct in the crypto library source. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-12-01 06:06:05 +01:00
#define MBEDTLS_PSA_BUILTIN_ALG_RSA_PKCS1V15_CRYPT 1
Add feature support for RSA for PSA crypto config In the original attempt to add RSA support to PSA crypto config was too generic. This set of changes adds support for the following RSA features: PSA_WANT_ALG_RSA_PKCS1V15_CRYPT, PSA_WANT_ALG_RSA_PKCS1V15_SIGN, PSA_WANT_ALG_RSA_OAEP, PSA_WANT_ALG_RSA_PSS, PSA_WANT_KEY_TYPE_RSA_KEY_PAIR, and PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY. There were also some updates to ensure the proper inclusion of PSA crypto library code when certain features are enabled. These updates were made to address warnings and errors in builds from the new tests for these features being added for PSA crypto configuration. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-01 06:06:54 +01:00
#define MBEDTLS_RSA_C
#define MBEDTLS_BIGNUM_C
#define MBEDTLS_OID_C
#define MBEDTLS_PKCS1_V15
#endif /* !MBEDTLS_PSA_ACCEL_ALG_RSA_PKCS1V15_CRYPT */
Minor updates from review comments Updated macros in config_psa.h that used ECC_xxx to use KEY_TYPE_ECC_xxx per comments from review. Implemented a check_config_psa.h to help with dependency checking of features enabled in config_psa.h. Added check_config_psa.h to visual studio project. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-04 21:28:15 +01:00
#endif /* PSA_WANT_ALG_RSA_PKCS1V15_CRYPT */
#if defined(PSA_WANT_ALG_RSA_PKCS1V15_SIGN)
Add feature support for RSA for PSA crypto config In the original attempt to add RSA support to PSA crypto config was too generic. This set of changes adds support for the following RSA features: PSA_WANT_ALG_RSA_PKCS1V15_CRYPT, PSA_WANT_ALG_RSA_PKCS1V15_SIGN, PSA_WANT_ALG_RSA_OAEP, PSA_WANT_ALG_RSA_PSS, PSA_WANT_KEY_TYPE_RSA_KEY_PAIR, and PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY. There were also some updates to ensure the proper inclusion of PSA crypto library code when certain features are enabled. These updates were made to address warnings and errors in builds from the new tests for these features being added for PSA crypto configuration. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-01 06:06:54 +01:00
#if !defined(MBEDTLS_PSA_ACCEL_ALG_RSA_PKCS1V15_SIGN)
Minor updates to address review comments Removed unecessary checks on the ALG_SHA_224 and ALG_SHA_384 since those are handled in config_psa.h by ensuring the correct _C is included. Reformatted config_psa.h to be alphabetical and made the assignments line up correctly for consistency. Fixed the guards for ALG_SHA_224 and ALG_SHA_384 to be correct in the crypto library source. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-12-01 06:06:05 +01:00
#define MBEDTLS_PSA_BUILTIN_ALG_RSA_PKCS1V15_SIGN 1
Add feature support for RSA for PSA crypto config In the original attempt to add RSA support to PSA crypto config was too generic. This set of changes adds support for the following RSA features: PSA_WANT_ALG_RSA_PKCS1V15_CRYPT, PSA_WANT_ALG_RSA_PKCS1V15_SIGN, PSA_WANT_ALG_RSA_OAEP, PSA_WANT_ALG_RSA_PSS, PSA_WANT_KEY_TYPE_RSA_KEY_PAIR, and PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY. There were also some updates to ensure the proper inclusion of PSA crypto library code when certain features are enabled. These updates were made to address warnings and errors in builds from the new tests for these features being added for PSA crypto configuration. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-01 06:06:54 +01:00
#define MBEDTLS_RSA_C
#define MBEDTLS_BIGNUM_C
#define MBEDTLS_OID_C
#define MBEDTLS_PKCS1_V15
Updates to PSA crypto library based on review comments Moved new check_crypto_config.h file from include/psa to library directory and the file is now included from *.c instead of the crypto_config.h file. Fixed guards in PSA crypto library based on review comments for new PSA crypto config features. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-17 07:08:34 +01:00
#define MBEDTLS_MD_C
Add feature support for RSA for PSA crypto config In the original attempt to add RSA support to PSA crypto config was too generic. This set of changes adds support for the following RSA features: PSA_WANT_ALG_RSA_PKCS1V15_CRYPT, PSA_WANT_ALG_RSA_PKCS1V15_SIGN, PSA_WANT_ALG_RSA_OAEP, PSA_WANT_ALG_RSA_PSS, PSA_WANT_KEY_TYPE_RSA_KEY_PAIR, and PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY. There were also some updates to ensure the proper inclusion of PSA crypto library code when certain features are enabled. These updates were made to address warnings and errors in builds from the new tests for these features being added for PSA crypto configuration. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-01 06:06:54 +01:00
#endif /* !MBEDTLS_PSA_ACCEL_ALG_RSA_PKCS1V15_SIGN */
Minor updates from review comments Updated macros in config_psa.h that used ECC_xxx to use KEY_TYPE_ECC_xxx per comments from review. Implemented a check_config_psa.h to help with dependency checking of features enabled in config_psa.h. Added check_config_psa.h to visual studio project. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-04 21:28:15 +01:00
#endif /* PSA_WANT_ALG_RSA_PKCS1V15_SIGN */
Add feature support for RSA for PSA crypto config In the original attempt to add RSA support to PSA crypto config was too generic. This set of changes adds support for the following RSA features: PSA_WANT_ALG_RSA_PKCS1V15_CRYPT, PSA_WANT_ALG_RSA_PKCS1V15_SIGN, PSA_WANT_ALG_RSA_OAEP, PSA_WANT_ALG_RSA_PSS, PSA_WANT_KEY_TYPE_RSA_KEY_PAIR, and PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY. There were also some updates to ensure the proper inclusion of PSA crypto library code when certain features are enabled. These updates were made to address warnings and errors in builds from the new tests for these features being added for PSA crypto configuration. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-01 06:06:54 +01:00
Updates to PSA crypto library based on review comments Moved new check_crypto_config.h file from include/psa to library directory and the file is now included from *.c instead of the crypto_config.h file. Fixed guards in PSA crypto library based on review comments for new PSA crypto config features. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-17 07:08:34 +01:00
#if defined(PSA_WANT_ALG_RSA_PSS)
#if !defined(MBEDTLS_PSA_ACCEL_ALG_RSA_PSS)
Minor updates to address review comments Removed unecessary checks on the ALG_SHA_224 and ALG_SHA_384 since those are handled in config_psa.h by ensuring the correct _C is included. Reformatted config_psa.h to be alphabetical and made the assignments line up correctly for consistency. Fixed the guards for ALG_SHA_224 and ALG_SHA_384 to be correct in the crypto library source. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-12-01 06:06:05 +01:00
#define MBEDTLS_PSA_BUILTIN_ALG_RSA_PSS 1
Updates to PSA crypto library based on review comments Moved new check_crypto_config.h file from include/psa to library directory and the file is now included from *.c instead of the crypto_config.h file. Fixed guards in PSA crypto library based on review comments for new PSA crypto config features. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-17 07:08:34 +01:00
#define MBEDTLS_RSA_C
#define MBEDTLS_BIGNUM_C
#define MBEDTLS_OID_C
#define MBEDTLS_PKCS1_V21
#define MBEDTLS_MD_C
#endif /* !MBEDTLS_PSA_ACCEL_ALG_RSA_PSS */
#endif /* PSA_WANT_ALG_RSA_PSS */
Minor updates to address review comments Removed unecessary checks on the ALG_SHA_224 and ALG_SHA_384 since those are handled in config_psa.h by ensuring the correct _C is included. Reformatted config_psa.h to be alphabetical and made the assignments line up correctly for consistency. Fixed the guards for ALG_SHA_224 and ALG_SHA_384 to be correct in the crypto library source. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-12-01 06:06:05 +01:00
#if defined(PSA_WANT_ALG_SHA_1) && !defined(MBEDTLS_PSA_ACCEL_ALG_SHA_1)
#define MBEDTLS_PSA_BUILTIN_ALG_SHA_1 1
#define MBEDTLS_SHA1_C
#endif
#if defined(PSA_WANT_ALG_SHA_224) && !defined(MBEDTLS_PSA_ACCEL_ALG_SHA_224)
#define MBEDTLS_PSA_BUILTIN_ALG_SHA_224 1
#define MBEDTLS_SHA256_C
#endif
#if defined(PSA_WANT_ALG_SHA_256) && !defined(MBEDTLS_PSA_ACCEL_ALG_SHA_256)
#define MBEDTLS_PSA_BUILTIN_ALG_SHA_256 1
#define MBEDTLS_SHA256_C
#endif
#if defined(PSA_WANT_ALG_SHA_384) && !defined(MBEDTLS_PSA_ACCEL_ALG_SHA_384)
#define MBEDTLS_PSA_BUILTIN_ALG_SHA_384 1
#define MBEDTLS_SHA512_C
#endif
#if defined(PSA_WANT_ALG_SHA_512) && !defined(MBEDTLS_PSA_ACCEL_ALG_SHA_512)
#define MBEDTLS_PSA_BUILTIN_ALG_SHA_512 1
#define MBEDTLS_SHA512_C
#endif
Updates to PSA crypto library based on review comments Moved new check_crypto_config.h file from include/psa to library directory and the file is now included from *.c instead of the crypto_config.h file. Fixed guards in PSA crypto library based on review comments for new PSA crypto config features. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-17 07:08:34 +01:00
#if defined(PSA_WANT_ALG_TLS12_PRF)
#if !defined(MBEDTLS_PSA_ACCEL_ALG_TLS12_PRF)
Minor updates to address review comments Removed unecessary checks on the ALG_SHA_224 and ALG_SHA_384 since those are handled in config_psa.h by ensuring the correct _C is included. Reformatted config_psa.h to be alphabetical and made the assignments line up correctly for consistency. Fixed the guards for ALG_SHA_224 and ALG_SHA_384 to be correct in the crypto library source. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-12-01 06:06:05 +01:00
#define MBEDTLS_PSA_BUILTIN_ALG_TLS12_PRF 1
Updates to PSA crypto library based on review comments Moved new check_crypto_config.h file from include/psa to library directory and the file is now included from *.c instead of the crypto_config.h file. Fixed guards in PSA crypto library based on review comments for new PSA crypto config features. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-17 07:08:34 +01:00
#endif /* !MBEDTLS_PSA_ACCEL_ALG_TLS12_PRF */
#endif /* PSA_WANT_ALG_TLS12_PRF */
#if defined(PSA_WANT_ALG_TLS12_PSK_TO_MS)
#if !defined(MBEDTLS_PSA_ACCEL_ALG_TLS12_PSK_TO_MS)
Minor updates to address review comments Removed unecessary checks on the ALG_SHA_224 and ALG_SHA_384 since those are handled in config_psa.h by ensuring the correct _C is included. Reformatted config_psa.h to be alphabetical and made the assignments line up correctly for consistency. Fixed the guards for ALG_SHA_224 and ALG_SHA_384 to be correct in the crypto library source. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-12-01 06:06:05 +01:00
#define MBEDTLS_PSA_BUILTIN_ALG_TLS12_PSK_TO_MS 1
Updates to PSA crypto library based on review comments Moved new check_crypto_config.h file from include/psa to library directory and the file is now included from *.c instead of the crypto_config.h file. Fixed guards in PSA crypto library based on review comments for new PSA crypto config features. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-17 07:08:34 +01:00
#endif /* !MBEDTLS_PSA_ACCEL_ALG_TLS12_PSK_TO_MS */
#endif /* PSA_WANT_ALG_TLS12_PSK_TO_MS */
#if defined(PSA_WANT_KEY_TYPE_ECC_KEY_PAIR)
#if !defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_ECC_KEY_PAIR)
Minor updates to address review comments Removed unecessary checks on the ALG_SHA_224 and ALG_SHA_384 since those are handled in config_psa.h by ensuring the correct _C is included. Reformatted config_psa.h to be alphabetical and made the assignments line up correctly for consistency. Fixed the guards for ALG_SHA_224 and ALG_SHA_384 to be correct in the crypto library source. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-12-01 06:06:05 +01:00
#define MBEDTLS_PSA_BUILTIN_KEY_TYPE_ECC_KEY_PAIR 1
Updates to PSA crypto library based on review comments Moved new check_crypto_config.h file from include/psa to library directory and the file is now included from *.c instead of the crypto_config.h file. Fixed guards in PSA crypto library based on review comments for new PSA crypto config features. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-17 07:08:34 +01:00
#define MBEDTLS_ECP_C
#define MBEDTLS_BIGNUM_C
#endif /* !MBEDTLS_PSA_ACCEL_KEY_TYPE_ECC_KEY_PAIR */
#endif /* PSA_WANT_KEY_TYPE_ECC_KEY_PAIR */
#if defined(PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY)
#if !defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_ECC_PUBLIC_KEY)
Minor updates to address review comments Removed unecessary checks on the ALG_SHA_224 and ALG_SHA_384 since those are handled in config_psa.h by ensuring the correct _C is included. Reformatted config_psa.h to be alphabetical and made the assignments line up correctly for consistency. Fixed the guards for ALG_SHA_224 and ALG_SHA_384 to be correct in the crypto library source. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-12-01 06:06:05 +01:00
#define MBEDTLS_PSA_BUILTIN_KEY_TYPE_ECC_PUBLIC_KEY 1
Updates to PSA crypto library based on review comments Moved new check_crypto_config.h file from include/psa to library directory and the file is now included from *.c instead of the crypto_config.h file. Fixed guards in PSA crypto library based on review comments for new PSA crypto config features. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-17 07:08:34 +01:00
#define MBEDTLS_ECP_C
#define MBEDTLS_BIGNUM_C
#endif /* !MBEDTLS_PSA_ACCEL_KEY_TYPE_ECC_PUBLIC_KEY */
#endif /* PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY */
Minor updates from review comments Updated macros in config_psa.h that used ECC_xxx to use KEY_TYPE_ECC_xxx per comments from review. Implemented a check_config_psa.h to help with dependency checking of features enabled in config_psa.h. Added check_config_psa.h to visual studio project. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-04 21:28:15 +01:00
#if defined(PSA_WANT_KEY_TYPE_RSA_KEY_PAIR)
Add feature support for RSA for PSA crypto config In the original attempt to add RSA support to PSA crypto config was too generic. This set of changes adds support for the following RSA features: PSA_WANT_ALG_RSA_PKCS1V15_CRYPT, PSA_WANT_ALG_RSA_PKCS1V15_SIGN, PSA_WANT_ALG_RSA_OAEP, PSA_WANT_ALG_RSA_PSS, PSA_WANT_KEY_TYPE_RSA_KEY_PAIR, and PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY. There were also some updates to ensure the proper inclusion of PSA crypto library code when certain features are enabled. These updates were made to address warnings and errors in builds from the new tests for these features being added for PSA crypto configuration. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-01 06:06:54 +01:00
#if !defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_RSA_KEY_PAIR)
Minor updates to address review comments Removed unecessary checks on the ALG_SHA_224 and ALG_SHA_384 since those are handled in config_psa.h by ensuring the correct _C is included. Reformatted config_psa.h to be alphabetical and made the assignments line up correctly for consistency. Fixed the guards for ALG_SHA_224 and ALG_SHA_384 to be correct in the crypto library source. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-12-01 06:06:05 +01:00
#define MBEDTLS_PSA_BUILTIN_KEY_TYPE_RSA_KEY_PAIR 1
Add feature support for RSA for PSA crypto config In the original attempt to add RSA support to PSA crypto config was too generic. This set of changes adds support for the following RSA features: PSA_WANT_ALG_RSA_PKCS1V15_CRYPT, PSA_WANT_ALG_RSA_PKCS1V15_SIGN, PSA_WANT_ALG_RSA_OAEP, PSA_WANT_ALG_RSA_PSS, PSA_WANT_KEY_TYPE_RSA_KEY_PAIR, and PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY. There were also some updates to ensure the proper inclusion of PSA crypto library code when certain features are enabled. These updates were made to address warnings and errors in builds from the new tests for these features being added for PSA crypto configuration. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-01 06:06:54 +01:00
#define MBEDTLS_RSA_C
#define MBEDTLS_BIGNUM_C
#define MBEDTLS_OID_C
#define MBEDTLS_GENPRIME
Updates to PSA crypto library based on review comments Moved new check_crypto_config.h file from include/psa to library directory and the file is now included from *.c instead of the crypto_config.h file. Fixed guards in PSA crypto library based on review comments for new PSA crypto config features. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-17 07:08:34 +01:00
#define MBEDTLS_PK_PARSE_C
#define MBEDTLS_PK_WRITE_C
#define MBEDTLS_PK_C
Add feature support for RSA for PSA crypto config In the original attempt to add RSA support to PSA crypto config was too generic. This set of changes adds support for the following RSA features: PSA_WANT_ALG_RSA_PKCS1V15_CRYPT, PSA_WANT_ALG_RSA_PKCS1V15_SIGN, PSA_WANT_ALG_RSA_OAEP, PSA_WANT_ALG_RSA_PSS, PSA_WANT_KEY_TYPE_RSA_KEY_PAIR, and PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY. There were also some updates to ensure the proper inclusion of PSA crypto library code when certain features are enabled. These updates were made to address warnings and errors in builds from the new tests for these features being added for PSA crypto configuration. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-01 06:06:54 +01:00
#endif /* !MBEDTLS_PSA_ACCEL_KEY_TYPE_RSA_KEY_PAIR */
Minor updates from review comments Updated macros in config_psa.h that used ECC_xxx to use KEY_TYPE_ECC_xxx per comments from review. Implemented a check_config_psa.h to help with dependency checking of features enabled in config_psa.h. Added check_config_psa.h to visual studio project. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-04 21:28:15 +01:00
#endif /* PSA_WANT_KEY_TYPE_RSA_KEY_PAIR */
#if defined(PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY)
Add feature support for RSA for PSA crypto config In the original attempt to add RSA support to PSA crypto config was too generic. This set of changes adds support for the following RSA features: PSA_WANT_ALG_RSA_PKCS1V15_CRYPT, PSA_WANT_ALG_RSA_PKCS1V15_SIGN, PSA_WANT_ALG_RSA_OAEP, PSA_WANT_ALG_RSA_PSS, PSA_WANT_KEY_TYPE_RSA_KEY_PAIR, and PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY. There were also some updates to ensure the proper inclusion of PSA crypto library code when certain features are enabled. These updates were made to address warnings and errors in builds from the new tests for these features being added for PSA crypto configuration. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-01 06:06:54 +01:00
#if !defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_RSA_PUBLIC_KEY)
Minor updates to address review comments Removed unecessary checks on the ALG_SHA_224 and ALG_SHA_384 since those are handled in config_psa.h by ensuring the correct _C is included. Reformatted config_psa.h to be alphabetical and made the assignments line up correctly for consistency. Fixed the guards for ALG_SHA_224 and ALG_SHA_384 to be correct in the crypto library source. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-12-01 06:06:05 +01:00
#define MBEDTLS_PSA_BUILTIN_KEY_TYPE_RSA_PUBLIC_KEY 1
Phase 2 support for MBEDTLS_PSA_CRYPTO_CONFIG This phase adds in support for the following features being added to the list of features that can be configured in the include/psa/crypto_config.h header file using the PSA_WANT_ALG_xxx macros: ECDH, HMAC, HKDF, and RSA. These changes include changes to the PSA crypto library to use the appropriate new guards that will allow the feature to be compiled in or out either using new PSA_WANT_ALG_xxx or the previous MBEDTLS_xxx macros. For HKDF and HMAC, most of the PSA library code did not have a specific matching MBEDTLS_xxx macro for that feature, but was instead using the generic dependent MBEDTLS_MD_C macro. The ECDH and RSA features more closely aligned with a direct replacement with a similar macro. The new tests for RSA, HMAC, and HKDF would normally unset additional dependent macros, but when attempting to implement that level of testing it required removal of too many core features like MD_C, PK_C, ECP_C and other low level features. This may point to additional phases of work to complete the transition of these features to the new model. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-10-30 05:37:36 +01:00
#define MBEDTLS_RSA_C
#define MBEDTLS_BIGNUM_C
#define MBEDTLS_OID_C
Updates to PSA crypto library based on review comments Moved new check_crypto_config.h file from include/psa to library directory and the file is now included from *.c instead of the crypto_config.h file. Fixed guards in PSA crypto library based on review comments for new PSA crypto config features. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-17 07:08:34 +01:00
#define MBEDTLS_PK_PARSE_C
#define MBEDTLS_PK_WRITE_C
#define MBEDTLS_PK_C
Add feature support for RSA for PSA crypto config In the original attempt to add RSA support to PSA crypto config was too generic. This set of changes adds support for the following RSA features: PSA_WANT_ALG_RSA_PKCS1V15_CRYPT, PSA_WANT_ALG_RSA_PKCS1V15_SIGN, PSA_WANT_ALG_RSA_OAEP, PSA_WANT_ALG_RSA_PSS, PSA_WANT_KEY_TYPE_RSA_KEY_PAIR, and PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY. There were also some updates to ensure the proper inclusion of PSA crypto library code when certain features are enabled. These updates were made to address warnings and errors in builds from the new tests for these features being added for PSA crypto configuration. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-01 06:06:54 +01:00
#endif /* !MBEDTLS_PSA_ACCEL_KEY_TYPE_RSA_PUBLIC_KEY */
Minor updates from review comments Updated macros in config_psa.h that used ECC_xxx to use KEY_TYPE_ECC_xxx per comments from review. Implemented a check_config_psa.h to help with dependency checking of features enabled in config_psa.h. Added check_config_psa.h to visual studio project. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-04 21:28:15 +01:00
#endif /* PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY */
Phase 2 support for MBEDTLS_PSA_CRYPTO_CONFIG This phase adds in support for the following features being added to the list of features that can be configured in the include/psa/crypto_config.h header file using the PSA_WANT_ALG_xxx macros: ECDH, HMAC, HKDF, and RSA. These changes include changes to the PSA crypto library to use the appropriate new guards that will allow the feature to be compiled in or out either using new PSA_WANT_ALG_xxx or the previous MBEDTLS_xxx macros. For HKDF and HMAC, most of the PSA library code did not have a specific matching MBEDTLS_xxx macro for that feature, but was instead using the generic dependent MBEDTLS_MD_C macro. The ECDH and RSA features more closely aligned with a direct replacement with a similar macro. The new tests for RSA, HMAC, and HKDF would normally unset additional dependent macros, but when attempting to implement that level of testing it required removal of too many core features like MD_C, PK_C, ECP_C and other low level features. This may point to additional phases of work to complete the transition of these features to the new model. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-10-30 05:37:36 +01:00
Add feature support for AES for PSA crypto config Basic support for enabling AES through PSA_WANT_KEY_TYPE_AES. Signed-off-by: David Brown <david.brown@linaro.org>
2021-01-05 20:03:25 +01:00
#if defined(PSA_WANT_KEY_TYPE_AES)
#if !defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_AES)
#define MBEDTLS_AES_C
#endif /* !MBEDTLS_PSA_ACCEL_KEY_TYPE_AES */
#endif /* PSA_WANT_KEY_TYPE_AES */
Add feature support for ARC4 for PSA crypto config Basic support for enabling ARC4 through PSA_WANT_KEY_TYPE_ARC4. Signed-off-by: David Brown <david.brown@linaro.org>
2021-01-05 20:03:25 +01:00
#if defined(PSA_WANT_KEY_TYPE_ARC4)
#if !defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_ARC4)
#define MBEDTLS_ARC4_C
#endif /*!MBEDTLS_PSA_ACCEL_KEY_TYPE_ARC4 */
#endif /* PSA_WANT_KEY_TYPE_ARC4 */
Add feature support for Camelia for PSA crypto config Basic support for enabling Camelia through PSA_WANT_KEY_TYPE_CAMELIA. Signed-off-by: David Brown <david.brown@linaro.org>
2021-01-05 20:03:25 +01:00
#if defined(PSA_WANT_KEY_TYPE_CAMELLIA)
#if !defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_CAMELLIA)
#define MBEDTLS_CAMELLIA_C
#endif /*!MBEDTLS_PSA_ACCEL_KEY_TYPE_CAMELLIA */
#endif /* PSA_WANT_KEY_TYPE_CAMELLIA */
Minor cleanup to fix errors with some unit tests With the new feature MBEDTLS_PSA_CRYPTO_CONFIG, needed to add support that when the feature is disabled, if there are defines like MBEDTLS_ECDSA_C defined, then the PSA_WANT_ equivalent define is also enabled. This ensures the guards in the library psa_crypto will work properly. Also fixed an error return code in the driver wrapper for cipher encrypt setup so it will properly pass unit tests. Ensured config.py full works properly with the new MBEDTLS_PSA_CRYPTO_CONFIG, it should not be set when the full option is used. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-09-30 07:07:04 +02:00
#else /* MBEDTLS_PSA_CRYPTO_CONFIG */
/*
* Ensure PSA_WANT_* defines are setup properly if MBEDTLS_PSA_CRYPTO_CONFIG
* is not defined
*/
Support PSA_WANT_xxx and MBEDTLS_PSA_BUILTIN_xxx for hashes Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
2020-11-25 00:07:04 +01:00
Updates to PSA crypto library based on review comments Moved new check_crypto_config.h file from include/psa to library directory and the file is now included from *.c instead of the crypto_config.h file. Fixed guards in PSA crypto library based on review comments for new PSA crypto config features. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-17 07:08:34 +01:00
#if defined(MBEDTLS_ECDH_C)
Minor updates to address review comments Removed unecessary checks on the ALG_SHA_224 and ALG_SHA_384 since those are handled in config_psa.h by ensuring the correct _C is included. Reformatted config_psa.h to be alphabetical and made the assignments line up correctly for consistency. Fixed the guards for ALG_SHA_224 and ALG_SHA_384 to be correct in the crypto library source. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-12-01 06:06:05 +01:00
#define MBEDTLS_PSA_BUILTIN_ALG_ECDH 1
In old-style PSA configuration, define PSA_WANT_xxx When MBEDTLS_PSA_CRYPTO_CONFIG is disabled, if an Mbed TLS crypto feature is enabled, declare the corresponding PSA feature as enabled, in addition to enabling its software implementation. This is necessary for code that uses PSA APIs and relies on PSA_WANT_xxx symbols to know which features are enabled (application code, our library code using MBEDTLS_USE_PSA_CRYPTO, our test dependencies, etc.). Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
2020-11-25 00:07:18 +01:00
#define PSA_WANT_ALG_ECDH 1
Updates to PSA crypto library based on review comments Moved new check_crypto_config.h file from include/psa to library directory and the file is now included from *.c instead of the crypto_config.h file. Fixed guards in PSA crypto library based on review comments for new PSA crypto config features. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-17 07:08:34 +01:00
#endif /* MBEDTLS_ECDH_C */
Correct inclusion of MBEDTLS_XXX based on PSA_WANT_XXX Provied a more detailed description for the config_psa.h header file. This new description makes it clear that the file should not be edited by users or integrators. Relevant changes should be made to psa/crypto_config.h instead. Fixed the logic for the inclusion of MBEDTLS_PSA_BUILTIN_XXX to be set when PSA_WANT_ALG_XXX and MBEDTLS_PSA_ACCEL_ALG_XXX is not defined, otherwise the MBEDTLS_XXX should be set. Ensure that MBEDTLS_PSA_BUILTIN_XXX is set to 1 and not simply defined per specification. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-10-13 06:36:22 +02:00
#if defined(MBEDTLS_ECDSA_C)
Minor updates to address review comments Removed unecessary checks on the ALG_SHA_224 and ALG_SHA_384 since those are handled in config_psa.h by ensuring the correct _C is included. Reformatted config_psa.h to be alphabetical and made the assignments line up correctly for consistency. Fixed the guards for ALG_SHA_224 and ALG_SHA_384 to be correct in the crypto library source. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-12-01 06:06:05 +01:00
#define MBEDTLS_PSA_BUILTIN_ALG_ECDSA 1
In old-style PSA configuration, define PSA_WANT_xxx When MBEDTLS_PSA_CRYPTO_CONFIG is disabled, if an Mbed TLS crypto feature is enabled, declare the corresponding PSA feature as enabled, in addition to enabling its software implementation. This is necessary for code that uses PSA APIs and relies on PSA_WANT_xxx symbols to know which features are enabled (application code, our library code using MBEDTLS_USE_PSA_CRYPTO, our test dependencies, etc.). Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
2020-11-25 00:07:18 +01:00
#define PSA_WANT_ALG_ECDSA 1
Minor cleanup to fix errors with some unit tests With the new feature MBEDTLS_PSA_CRYPTO_CONFIG, needed to add support that when the feature is disabled, if there are defines like MBEDTLS_ECDSA_C defined, then the PSA_WANT_ equivalent define is also enabled. This ensures the guards in the library psa_crypto will work properly. Also fixed an error return code in the driver wrapper for cipher encrypt setup so it will properly pass unit tests. Ensured config.py full works properly with the new MBEDTLS_PSA_CRYPTO_CONFIG, it should not be set when the full option is used. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-09-30 07:07:04 +02:00
Update guards in PSA crypto library for ECDSA and DETERMINISTIC support In the PSA crypto library, the code for verification of ECDSA is the same for both MBEDTLS_PSA_BUILTIN_ALG_ECDSA and MBEDTLS_PSA_BUILTIN_ALG_DETERMINISTIC_ECDSA. So, the guards should allow for either one to enable the code blocks. The original implementation only had the check for ECDSA. In order to make this work, config_psa.h was updated to ensure when MBEDTLS_CRYPTO_CONFIG is disabled, the setting for DETERMINISTIC is only updated if MBEDTLS_ECDSA_C is also enabled. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-10-26 23:25:23 +01:00
// Only add in DETERMINISTIC support if ECDSA is also enabled
Correct inclusion of MBEDTLS_XXX based on PSA_WANT_XXX Provied a more detailed description for the config_psa.h header file. This new description makes it clear that the file should not be edited by users or integrators. Relevant changes should be made to psa/crypto_config.h instead. Fixed the logic for the inclusion of MBEDTLS_PSA_BUILTIN_XXX to be set when PSA_WANT_ALG_XXX and MBEDTLS_PSA_ACCEL_ALG_XXX is not defined, otherwise the MBEDTLS_XXX should be set. Ensure that MBEDTLS_PSA_BUILTIN_XXX is set to 1 and not simply defined per specification. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-10-13 06:36:22 +02:00
#if defined(MBEDTLS_ECDSA_DETERMINISTIC)
Minor updates to address review comments Removed unecessary checks on the ALG_SHA_224 and ALG_SHA_384 since those are handled in config_psa.h by ensuring the correct _C is included. Reformatted config_psa.h to be alphabetical and made the assignments line up correctly for consistency. Fixed the guards for ALG_SHA_224 and ALG_SHA_384 to be correct in the crypto library source. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-12-01 06:06:05 +01:00
#define MBEDTLS_PSA_BUILTIN_ALG_DETERMINISTIC_ECDSA 1
In old-style PSA configuration, define PSA_WANT_xxx When MBEDTLS_PSA_CRYPTO_CONFIG is disabled, if an Mbed TLS crypto feature is enabled, declare the corresponding PSA feature as enabled, in addition to enabling its software implementation. This is necessary for code that uses PSA APIs and relies on PSA_WANT_xxx symbols to know which features are enabled (application code, our library code using MBEDTLS_USE_PSA_CRYPTO, our test dependencies, etc.). Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
2020-11-25 00:07:18 +01:00
#define PSA_WANT_ALG_DETERMINISTIC_ECDSA 1
Minor cleanup to fix errors with some unit tests With the new feature MBEDTLS_PSA_CRYPTO_CONFIG, needed to add support that when the feature is disabled, if there are defines like MBEDTLS_ECDSA_C defined, then the PSA_WANT_ equivalent define is also enabled. This ensures the guards in the library psa_crypto will work properly. Also fixed an error return code in the driver wrapper for cipher encrypt setup so it will properly pass unit tests. Ensured config.py full works properly with the new MBEDTLS_PSA_CRYPTO_CONFIG, it should not be set when the full option is used. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-09-30 07:07:04 +02:00
#endif /* MBEDTLS_ECDSA_DETERMINISTIC */
Update guards in PSA crypto library for ECDSA and DETERMINISTIC support In the PSA crypto library, the code for verification of ECDSA is the same for both MBEDTLS_PSA_BUILTIN_ALG_ECDSA and MBEDTLS_PSA_BUILTIN_ALG_DETERMINISTIC_ECDSA. So, the guards should allow for either one to enable the code blocks. The original implementation only had the check for ECDSA. In order to make this work, config_psa.h was updated to ensure when MBEDTLS_CRYPTO_CONFIG is disabled, the setting for DETERMINISTIC is only updated if MBEDTLS_ECDSA_C is also enabled. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-10-26 23:25:23 +01:00
#endif /* MBEDTLS_ECDSA_C */
Added additional support for ECP for PSA_CRYPTO_CONFIG The KEY_TYPE_ECC_KEY_PAIR and KEY_TYPE_ECC_PUBLIC_KEY were previously being guarded by MBEDTLS_ECP_C in the PSA crypto library code. This change moves it to the new MBEDTLS_PSA_BUILTIN_xxx and separates KEY_PAIR and PUBLIC_KEY as needed. Tests have also been added to validate the new settings. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-10-29 04:09:55 +01:00
#if defined(MBEDTLS_ECP_C)
Minor updates to address review comments Removed unecessary checks on the ALG_SHA_224 and ALG_SHA_384 since those are handled in config_psa.h by ensuring the correct _C is included. Reformatted config_psa.h to be alphabetical and made the assignments line up correctly for consistency. Fixed the guards for ALG_SHA_224 and ALG_SHA_384 to be correct in the crypto library source. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-12-01 06:06:05 +01:00
#define MBEDTLS_PSA_BUILTIN_KEY_TYPE_ECC_KEY_PAIR 1
In old-style PSA configuration, define PSA_WANT_xxx When MBEDTLS_PSA_CRYPTO_CONFIG is disabled, if an Mbed TLS crypto feature is enabled, declare the corresponding PSA feature as enabled, in addition to enabling its software implementation. This is necessary for code that uses PSA APIs and relies on PSA_WANT_xxx symbols to know which features are enabled (application code, our library code using MBEDTLS_USE_PSA_CRYPTO, our test dependencies, etc.). Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
2020-11-25 00:07:18 +01:00
#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR 1
Minor updates to address review comments Removed unecessary checks on the ALG_SHA_224 and ALG_SHA_384 since those are handled in config_psa.h by ensuring the correct _C is included. Reformatted config_psa.h to be alphabetical and made the assignments line up correctly for consistency. Fixed the guards for ALG_SHA_224 and ALG_SHA_384 to be correct in the crypto library source. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-12-01 06:06:05 +01:00
#define MBEDTLS_PSA_BUILTIN_KEY_TYPE_ECC_PUBLIC_KEY 1
In old-style PSA configuration, define PSA_WANT_xxx When MBEDTLS_PSA_CRYPTO_CONFIG is disabled, if an Mbed TLS crypto feature is enabled, declare the corresponding PSA feature as enabled, in addition to enabling its software implementation. This is necessary for code that uses PSA APIs and relies on PSA_WANT_xxx symbols to know which features are enabled (application code, our library code using MBEDTLS_USE_PSA_CRYPTO, our test dependencies, etc.). Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
2020-11-25 00:07:18 +01:00
#define PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY 1
Added additional support for ECP for PSA_CRYPTO_CONFIG The KEY_TYPE_ECC_KEY_PAIR and KEY_TYPE_ECC_PUBLIC_KEY were previously being guarded by MBEDTLS_ECP_C in the PSA crypto library code. This change moves it to the new MBEDTLS_PSA_BUILTIN_xxx and separates KEY_PAIR and PUBLIC_KEY as needed. Tests have also been added to validate the new settings. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-10-29 04:09:55 +01:00
#endif /* MBEDTLS_ECP_C */
Phase 2 support for MBEDTLS_PSA_CRYPTO_CONFIG This phase adds in support for the following features being added to the list of features that can be configured in the include/psa/crypto_config.h header file using the PSA_WANT_ALG_xxx macros: ECDH, HMAC, HKDF, and RSA. These changes include changes to the PSA crypto library to use the appropriate new guards that will allow the feature to be compiled in or out either using new PSA_WANT_ALG_xxx or the previous MBEDTLS_xxx macros. For HKDF and HMAC, most of the PSA library code did not have a specific matching MBEDTLS_xxx macro for that feature, but was instead using the generic dependent MBEDTLS_MD_C macro. The ECDH and RSA features more closely aligned with a direct replacement with a similar macro. The new tests for RSA, HMAC, and HKDF would normally unset additional dependent macros, but when attempting to implement that level of testing it required removal of too many core features like MD_C, PK_C, ECP_C and other low level features. This may point to additional phases of work to complete the transition of these features to the new model. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-10-30 05:37:36 +01:00
#if defined(MBEDTLS_HKDF_C)
Minor updates to address review comments Removed unecessary checks on the ALG_SHA_224 and ALG_SHA_384 since those are handled in config_psa.h by ensuring the correct _C is included. Reformatted config_psa.h to be alphabetical and made the assignments line up correctly for consistency. Fixed the guards for ALG_SHA_224 and ALG_SHA_384 to be correct in the crypto library source. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-12-01 06:06:05 +01:00
#define MBEDTLS_PSA_BUILTIN_ALG_HMAC 1
In old-style PSA configuration, define PSA_WANT_xxx When MBEDTLS_PSA_CRYPTO_CONFIG is disabled, if an Mbed TLS crypto feature is enabled, declare the corresponding PSA feature as enabled, in addition to enabling its software implementation. This is necessary for code that uses PSA APIs and relies on PSA_WANT_xxx symbols to know which features are enabled (application code, our library code using MBEDTLS_USE_PSA_CRYPTO, our test dependencies, etc.). Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
2020-11-25 00:07:18 +01:00
#define PSA_WANT_ALG_HMAC 1
Minor updates to address review comments Removed unecessary checks on the ALG_SHA_224 and ALG_SHA_384 since those are handled in config_psa.h by ensuring the correct _C is included. Reformatted config_psa.h to be alphabetical and made the assignments line up correctly for consistency. Fixed the guards for ALG_SHA_224 and ALG_SHA_384 to be correct in the crypto library source. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-12-01 06:06:05 +01:00
#define MBEDTLS_PSA_BUILTIN_ALG_HKDF 1
In old-style PSA configuration, define PSA_WANT_xxx When MBEDTLS_PSA_CRYPTO_CONFIG is disabled, if an Mbed TLS crypto feature is enabled, declare the corresponding PSA feature as enabled, in addition to enabling its software implementation. This is necessary for code that uses PSA APIs and relies on PSA_WANT_xxx symbols to know which features are enabled (application code, our library code using MBEDTLS_USE_PSA_CRYPTO, our test dependencies, etc.). Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
2020-11-25 00:07:18 +01:00
#define PSA_WANT_ALG_HKDF 1
Phase 2 support for MBEDTLS_PSA_CRYPTO_CONFIG This phase adds in support for the following features being added to the list of features that can be configured in the include/psa/crypto_config.h header file using the PSA_WANT_ALG_xxx macros: ECDH, HMAC, HKDF, and RSA. These changes include changes to the PSA crypto library to use the appropriate new guards that will allow the feature to be compiled in or out either using new PSA_WANT_ALG_xxx or the previous MBEDTLS_xxx macros. For HKDF and HMAC, most of the PSA library code did not have a specific matching MBEDTLS_xxx macro for that feature, but was instead using the generic dependent MBEDTLS_MD_C macro. The ECDH and RSA features more closely aligned with a direct replacement with a similar macro. The new tests for RSA, HMAC, and HKDF would normally unset additional dependent macros, but when attempting to implement that level of testing it required removal of too many core features like MD_C, PK_C, ECP_C and other low level features. This may point to additional phases of work to complete the transition of these features to the new model. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-10-30 05:37:36 +01:00
#endif /* MBEDTLS_HKDF_C */
Updates to PSA crypto library based on review comments Moved new check_crypto_config.h file from include/psa to library directory and the file is now included from *.c instead of the crypto_config.h file. Fixed guards in PSA crypto library based on review comments for new PSA crypto config features. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-17 07:08:34 +01:00
#if defined(MBEDTLS_MD_C)
Minor updates to address review comments Removed unecessary checks on the ALG_SHA_224 and ALG_SHA_384 since those are handled in config_psa.h by ensuring the correct _C is included. Reformatted config_psa.h to be alphabetical and made the assignments line up correctly for consistency. Fixed the guards for ALG_SHA_224 and ALG_SHA_384 to be correct in the crypto library source. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-12-01 06:06:05 +01:00
#define MBEDTLS_PSA_BUILTIN_ALG_HMAC 1
In old-style PSA configuration, define PSA_WANT_xxx When MBEDTLS_PSA_CRYPTO_CONFIG is disabled, if an Mbed TLS crypto feature is enabled, declare the corresponding PSA feature as enabled, in addition to enabling its software implementation. This is necessary for code that uses PSA APIs and relies on PSA_WANT_xxx symbols to know which features are enabled (application code, our library code using MBEDTLS_USE_PSA_CRYPTO, our test dependencies, etc.). Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
2020-11-25 00:07:18 +01:00
#define PSA_WANT_ALG_HMAC 1
Declare PSA_KEY_TYPE_HMAC as well HMAC requires both the algorithm and the key type to be effective. Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
2021-01-12 00:00:15 +01:00
#define PSA_WANT_KEY_TYPE_HMAC
Minor updates to address review comments Removed unecessary checks on the ALG_SHA_224 and ALG_SHA_384 since those are handled in config_psa.h by ensuring the correct _C is included. Reformatted config_psa.h to be alphabetical and made the assignments line up correctly for consistency. Fixed the guards for ALG_SHA_224 and ALG_SHA_384 to be correct in the crypto library source. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-12-01 06:06:05 +01:00
#define MBEDTLS_PSA_BUILTIN_ALG_TLS12_PRF 1
In old-style PSA configuration, define PSA_WANT_xxx When MBEDTLS_PSA_CRYPTO_CONFIG is disabled, if an Mbed TLS crypto feature is enabled, declare the corresponding PSA feature as enabled, in addition to enabling its software implementation. This is necessary for code that uses PSA APIs and relies on PSA_WANT_xxx symbols to know which features are enabled (application code, our library code using MBEDTLS_USE_PSA_CRYPTO, our test dependencies, etc.). Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
2020-11-25 00:07:18 +01:00
#define PSA_WANT_ALG_TLS12_PRF 1
Minor updates to address review comments Removed unecessary checks on the ALG_SHA_224 and ALG_SHA_384 since those are handled in config_psa.h by ensuring the correct _C is included. Reformatted config_psa.h to be alphabetical and made the assignments line up correctly for consistency. Fixed the guards for ALG_SHA_224 and ALG_SHA_384 to be correct in the crypto library source. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-12-01 06:06:05 +01:00
#define MBEDTLS_PSA_BUILTIN_ALG_TLS12_PSK_TO_MS 1
In old-style PSA configuration, define PSA_WANT_xxx When MBEDTLS_PSA_CRYPTO_CONFIG is disabled, if an Mbed TLS crypto feature is enabled, declare the corresponding PSA feature as enabled, in addition to enabling its software implementation. This is necessary for code that uses PSA APIs and relies on PSA_WANT_xxx symbols to know which features are enabled (application code, our library code using MBEDTLS_USE_PSA_CRYPTO, our test dependencies, etc.). Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
2020-11-25 00:07:18 +01:00
#define PSA_WANT_ALG_TLS12_PSK_TO_MS 1
Updates to PSA crypto library based on review comments Moved new check_crypto_config.h file from include/psa to library directory and the file is now included from *.c instead of the crypto_config.h file. Fixed guards in PSA crypto library based on review comments for new PSA crypto config features. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-17 07:08:34 +01:00
#endif /* MBEDTLS_MD_C */
Minor updates to address review comments Removed unecessary checks on the ALG_SHA_224 and ALG_SHA_384 since those are handled in config_psa.h by ensuring the correct _C is included. Reformatted config_psa.h to be alphabetical and made the assignments line up correctly for consistency. Fixed the guards for ALG_SHA_224 and ALG_SHA_384 to be correct in the crypto library source. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-12-01 06:06:05 +01:00
#if defined(MBEDTLS_MD2_C)
#define MBEDTLS_PSA_BUILTIN_ALG_MD2 1
#define PSA_WANT_ALG_MD2 1
#endif
#if defined(MBEDTLS_MD4_C)
#define MBEDTLS_PSA_BUILTIN_ALG_MD4 1
#define PSA_WANT_ALG_MD4 1
#endif
#if defined(MBEDTLS_MD5_C)
#define MBEDTLS_PSA_BUILTIN_ALG_MD5 1
#define PSA_WANT_ALG_MD5 1
#endif
#if defined(MBEDTLS_RIPEMD160_C)
#define MBEDTLS_PSA_BUILTIN_ALG_RIPEMD160 1
#define PSA_WANT_ALG_RIPEMD160 1
#endif
Added additional support for ECP for PSA_CRYPTO_CONFIG The KEY_TYPE_ECC_KEY_PAIR and KEY_TYPE_ECC_PUBLIC_KEY were previously being guarded by MBEDTLS_ECP_C in the PSA crypto library code. This change moves it to the new MBEDTLS_PSA_BUILTIN_xxx and separates KEY_PAIR and PUBLIC_KEY as needed. Tests have also been added to validate the new settings. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-10-29 04:09:55 +01:00
#if defined(MBEDTLS_RSA_C)
Add feature support for RSA for PSA crypto config In the original attempt to add RSA support to PSA crypto config was too generic. This set of changes adds support for the following RSA features: PSA_WANT_ALG_RSA_PKCS1V15_CRYPT, PSA_WANT_ALG_RSA_PKCS1V15_SIGN, PSA_WANT_ALG_RSA_OAEP, PSA_WANT_ALG_RSA_PSS, PSA_WANT_KEY_TYPE_RSA_KEY_PAIR, and PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY. There were also some updates to ensure the proper inclusion of PSA crypto library code when certain features are enabled. These updates were made to address warnings and errors in builds from the new tests for these features being added for PSA crypto configuration. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-01 06:06:54 +01:00
#if defined(MBEDTLS_PKCS1_V15)
Minor updates to address review comments Removed unecessary checks on the ALG_SHA_224 and ALG_SHA_384 since those are handled in config_psa.h by ensuring the correct _C is included. Reformatted config_psa.h to be alphabetical and made the assignments line up correctly for consistency. Fixed the guards for ALG_SHA_224 and ALG_SHA_384 to be correct in the crypto library source. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-12-01 06:06:05 +01:00
#define MBEDTLS_PSA_BUILTIN_ALG_RSA_PKCS1V15_CRYPT 1
In old-style PSA configuration, define PSA_WANT_xxx When MBEDTLS_PSA_CRYPTO_CONFIG is disabled, if an Mbed TLS crypto feature is enabled, declare the corresponding PSA feature as enabled, in addition to enabling its software implementation. This is necessary for code that uses PSA APIs and relies on PSA_WANT_xxx symbols to know which features are enabled (application code, our library code using MBEDTLS_USE_PSA_CRYPTO, our test dependencies, etc.). Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
2020-11-25 00:07:18 +01:00
#define PSA_WANT_ALG_RSA_PKCS1V15_CRYPT 1
Minor updates to address review comments Removed unecessary checks on the ALG_SHA_224 and ALG_SHA_384 since those are handled in config_psa.h by ensuring the correct _C is included. Reformatted config_psa.h to be alphabetical and made the assignments line up correctly for consistency. Fixed the guards for ALG_SHA_224 and ALG_SHA_384 to be correct in the crypto library source. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-12-01 06:06:05 +01:00
#define MBEDTLS_PSA_BUILTIN_ALG_RSA_PKCS1V15_SIGN 1
In old-style PSA configuration, define PSA_WANT_xxx When MBEDTLS_PSA_CRYPTO_CONFIG is disabled, if an Mbed TLS crypto feature is enabled, declare the corresponding PSA feature as enabled, in addition to enabling its software implementation. This is necessary for code that uses PSA APIs and relies on PSA_WANT_xxx symbols to know which features are enabled (application code, our library code using MBEDTLS_USE_PSA_CRYPTO, our test dependencies, etc.). Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
2020-11-25 00:07:18 +01:00
#define PSA_WANT_ALG_RSA_PKCS1V15_SIGN 1
Add feature support for RSA for PSA crypto config In the original attempt to add RSA support to PSA crypto config was too generic. This set of changes adds support for the following RSA features: PSA_WANT_ALG_RSA_PKCS1V15_CRYPT, PSA_WANT_ALG_RSA_PKCS1V15_SIGN, PSA_WANT_ALG_RSA_OAEP, PSA_WANT_ALG_RSA_PSS, PSA_WANT_KEY_TYPE_RSA_KEY_PAIR, and PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY. There were also some updates to ensure the proper inclusion of PSA crypto library code when certain features are enabled. These updates were made to address warnings and errors in builds from the new tests for these features being added for PSA crypto configuration. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-01 06:06:54 +01:00
#endif /* MBEDTLSS_PKCS1_V15 */
#if defined(MBEDTLS_PKCS1_V21)
Minor updates to address review comments Removed unecessary checks on the ALG_SHA_224 and ALG_SHA_384 since those are handled in config_psa.h by ensuring the correct _C is included. Reformatted config_psa.h to be alphabetical and made the assignments line up correctly for consistency. Fixed the guards for ALG_SHA_224 and ALG_SHA_384 to be correct in the crypto library source. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-12-01 06:06:05 +01:00
#define MBEDTLS_PSA_BUILTIN_ALG_RSA_OAEP 1
In old-style PSA configuration, define PSA_WANT_xxx When MBEDTLS_PSA_CRYPTO_CONFIG is disabled, if an Mbed TLS crypto feature is enabled, declare the corresponding PSA feature as enabled, in addition to enabling its software implementation. This is necessary for code that uses PSA APIs and relies on PSA_WANT_xxx symbols to know which features are enabled (application code, our library code using MBEDTLS_USE_PSA_CRYPTO, our test dependencies, etc.). Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
2020-11-25 00:07:18 +01:00
#define PSA_WANT_ALG_RSA_OAEP 1
Minor updates to address review comments Removed unecessary checks on the ALG_SHA_224 and ALG_SHA_384 since those are handled in config_psa.h by ensuring the correct _C is included. Reformatted config_psa.h to be alphabetical and made the assignments line up correctly for consistency. Fixed the guards for ALG_SHA_224 and ALG_SHA_384 to be correct in the crypto library source. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-12-01 06:06:05 +01:00
#define MBEDTLS_PSA_BUILTIN_ALG_RSA_PSS 1
In old-style PSA configuration, define PSA_WANT_xxx When MBEDTLS_PSA_CRYPTO_CONFIG is disabled, if an Mbed TLS crypto feature is enabled, declare the corresponding PSA feature as enabled, in addition to enabling its software implementation. This is necessary for code that uses PSA APIs and relies on PSA_WANT_xxx symbols to know which features are enabled (application code, our library code using MBEDTLS_USE_PSA_CRYPTO, our test dependencies, etc.). Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
2020-11-25 00:07:18 +01:00
#define PSA_WANT_ALG_RSA_PSS 1
Add feature support for RSA for PSA crypto config In the original attempt to add RSA support to PSA crypto config was too generic. This set of changes adds support for the following RSA features: PSA_WANT_ALG_RSA_PKCS1V15_CRYPT, PSA_WANT_ALG_RSA_PKCS1V15_SIGN, PSA_WANT_ALG_RSA_OAEP, PSA_WANT_ALG_RSA_PSS, PSA_WANT_KEY_TYPE_RSA_KEY_PAIR, and PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY. There were also some updates to ensure the proper inclusion of PSA crypto library code when certain features are enabled. These updates were made to address warnings and errors in builds from the new tests for these features being added for PSA crypto configuration. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-11-01 06:06:54 +01:00
#endif /* MBEDTLS_PKCS1_V21 */
Minor updates to address review comments Removed unecessary checks on the ALG_SHA_224 and ALG_SHA_384 since those are handled in config_psa.h by ensuring the correct _C is included. Reformatted config_psa.h to be alphabetical and made the assignments line up correctly for consistency. Fixed the guards for ALG_SHA_224 and ALG_SHA_384 to be correct in the crypto library source. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-12-01 06:06:05 +01:00
#define MBEDTLS_PSA_BUILTIN_KEY_TYPE_RSA_KEY_PAIR 1
In old-style PSA configuration, define PSA_WANT_xxx When MBEDTLS_PSA_CRYPTO_CONFIG is disabled, if an Mbed TLS crypto feature is enabled, declare the corresponding PSA feature as enabled, in addition to enabling its software implementation. This is necessary for code that uses PSA APIs and relies on PSA_WANT_xxx symbols to know which features are enabled (application code, our library code using MBEDTLS_USE_PSA_CRYPTO, our test dependencies, etc.). Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
2020-11-25 00:07:18 +01:00
#define PSA_WANT_KEY_TYPE_RSA_KEY_PAIR 1
Minor updates to address review comments Removed unecessary checks on the ALG_SHA_224 and ALG_SHA_384 since those are handled in config_psa.h by ensuring the correct _C is included. Reformatted config_psa.h to be alphabetical and made the assignments line up correctly for consistency. Fixed the guards for ALG_SHA_224 and ALG_SHA_384 to be correct in the crypto library source. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-12-01 06:06:05 +01:00
#define MBEDTLS_PSA_BUILTIN_KEY_TYPE_RSA_PUBLIC_KEY 1
In old-style PSA configuration, define PSA_WANT_xxx When MBEDTLS_PSA_CRYPTO_CONFIG is disabled, if an Mbed TLS crypto feature is enabled, declare the corresponding PSA feature as enabled, in addition to enabling its software implementation. This is necessary for code that uses PSA APIs and relies on PSA_WANT_xxx symbols to know which features are enabled (application code, our library code using MBEDTLS_USE_PSA_CRYPTO, our test dependencies, etc.). Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
2020-11-25 00:07:18 +01:00
#define PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY 1
Phase 2 support for MBEDTLS_PSA_CRYPTO_CONFIG This phase adds in support for the following features being added to the list of features that can be configured in the include/psa/crypto_config.h header file using the PSA_WANT_ALG_xxx macros: ECDH, HMAC, HKDF, and RSA. These changes include changes to the PSA crypto library to use the appropriate new guards that will allow the feature to be compiled in or out either using new PSA_WANT_ALG_xxx or the previous MBEDTLS_xxx macros. For HKDF and HMAC, most of the PSA library code did not have a specific matching MBEDTLS_xxx macro for that feature, but was instead using the generic dependent MBEDTLS_MD_C macro. The ECDH and RSA features more closely aligned with a direct replacement with a similar macro. The new tests for RSA, HMAC, and HKDF would normally unset additional dependent macros, but when attempting to implement that level of testing it required removal of too many core features like MD_C, PK_C, ECP_C and other low level features. This may point to additional phases of work to complete the transition of these features to the new model. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-10-30 05:37:36 +01:00
#endif /* MBEDTLS_RSA_C */
Minor updates to address review comments Removed unecessary checks on the ALG_SHA_224 and ALG_SHA_384 since those are handled in config_psa.h by ensuring the correct _C is included. Reformatted config_psa.h to be alphabetical and made the assignments line up correctly for consistency. Fixed the guards for ALG_SHA_224 and ALG_SHA_384 to be correct in the crypto library source. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-12-01 06:06:05 +01:00
#if defined(MBEDTLS_SHA1_C)
#define MBEDTLS_PSA_BUILTIN_ALG_SHA_1 1
#define PSA_WANT_ALG_SHA_1 1
#endif
#if defined(MBEDTLS_SHA256_C)
#define MBEDTLS_PSA_BUILTIN_ALG_SHA_224 1
#define MBEDTLS_PSA_BUILTIN_ALG_SHA_256 1
Add missing declaration of SHA-224 from MBEDTLS_SHA256_C Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
2021-01-12 00:00:53 +01:00
#define PSA_WANT_ALG_SHA_224 1
Minor updates to address review comments Removed unecessary checks on the ALG_SHA_224 and ALG_SHA_384 since those are handled in config_psa.h by ensuring the correct _C is included. Reformatted config_psa.h to be alphabetical and made the assignments line up correctly for consistency. Fixed the guards for ALG_SHA_224 and ALG_SHA_384 to be correct in the crypto library source. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-12-01 06:06:05 +01:00
#define PSA_WANT_ALG_SHA_256 1
#endif
#if defined(MBEDTLS_SHA512_C)
#if !defined(MBEDTLS_SHA512_NO_SHA384)
#define MBEDTLS_PSA_BUILTIN_ALG_SHA_384 1
#define PSA_WANT_ALG_SHA_384 1
#endif
#define MBEDTLS_PSA_BUILTIN_ALG_SHA_512 1
#define PSA_WANT_ALG_SHA_512 1
#endif
Add feature support for AES for PSA crypto config Basic support for enabling AES through PSA_WANT_KEY_TYPE_AES. Signed-off-by: David Brown <david.brown@linaro.org>
2021-01-05 20:03:25 +01:00
#if defined(MBEDTLS_AES_C)
#define PSA_WANT_KEY_TYPE_AES 1
#endif
Add feature support for ARC4 for PSA crypto config Basic support for enabling ARC4 through PSA_WANT_KEY_TYPE_ARC4. Signed-off-by: David Brown <david.brown@linaro.org>
2021-01-05 20:03:25 +01:00
#if defined(MBEDTLS_ARC4_C)
#define PSA_WANT_KEY_TYPE_ARC4 1
#endif
Add feature support for Camelia for PSA crypto config Basic support for enabling Camelia through PSA_WANT_KEY_TYPE_CAMELIA. Signed-off-by: David Brown <david.brown@linaro.org>
2021-01-05 20:03:25 +01:00
#if defined(MBEDTLS_CAMELLIA_C)
#define PSA_WANT_KEY_TYPE_CAMELLIA 1
#endif
Update how MBEDTLS_PSA_CRYPTO_CONFIG is handled Originally, MBEDTLS_PSA_CRYPTO_CONFIG was being used to allow inclusion of mbedlts/config_psa.h, but that needed to be updated so that mbedtls/config_psa.h is always included and the definitions specific to PSA configuration are now guarded by MBEDTLS_PSA_CRYPTO_CONFIG. This will allow for the standard setup to continue working while new PSA configuration items to also work. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-09-24 13:30:10 +02:00
#endif /* MBEDTLS_PSA_CRYPTO_CONFIG */
Add ECDSA support to PSA crypto configuration Initial changes to PSA crypto core to support configuration of ECDSA algorithm using PSA crypto configuration mechanism. Guards using MBEDTLS_ECDSA_C and MBEDTLS_ECDSA_DETERMINISTIC have been changed to be based off PSA_WANT_ALG_ECDSA and PSA_WANT_ALG_ECDSA_DETERMINISTIC. Added new tests to all.sh to confirm new settings are working properly. Current code does not pass the tests since built in signature verification is not in place. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-09-21 08:09:17 +02:00
Created infrastructure for MBEDTLS_PSA_CRYPTO_CONFIG In order to prepare for PSA cryptographic mechanism for conditional inclusion of various modules, there needs to be some updates to the mbedtls configuration to enable that feature to work. This initial set of changes just lays the ground work and future changes will implement the functional features. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
2020-09-18 06:15:13 +02:00
#ifdef __cplusplus
}
#endif
#endif /* MBEDTLS_CONFIG_PSA_H */
Reference in a new issue Copy permalink