bfc6ef7a5c
Centralize it in a new file psa/config_adjust_keypair_types.h. I think this file indeed belongs in include/psa (as opposed to include/mbedtls) because it only touches PSA_WANT symbols (no MBEDTLS_PSA symbols), and implements things that are described in psa-conditional-inclusion.md. The code is not new, just moved from config_psa.h and config_adjust_legacy_from_psa.h where is was intermingled with handling of ACCEL/BUILTIN symbols. (git's --color-moved option will hardly help in checking that assertion, due to the way things were intermixed.) Note: the parts about BUILTIN in config_psa.h were not moved, just removed for now. They belong to include/mbedtls/config_adjust_legacy_from_psa.h and will be re-added there in a future commit which will completely re-organize the handling or ACCEL/BUILTIN for ECC. See comments inside the commit about placement of this file relative to others. Signed-off-by: Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com>
67 lines
2.1 KiB
C
67 lines
2.1 KiB
C
/**
|
|
* \file mbedtls/config_psa.h
|
|
* \brief PSA crypto configuration options (set of defines)
|
|
*
|
|
* This set of compile-time options takes settings defined in
|
|
* include/mbedtls/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/mbedtls_config.h for MBEDTLS_XXX settings or
|
|
* include/psa/crypto_config.h for PSA_WANT_XXX settings.
|
|
*/
|
|
/*
|
|
* 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
|
|
|
|
#include "psa/crypto_legacy.h"
|
|
|
|
#include "psa/crypto_adjust_config_synonyms.h"
|
|
|
|
#include "mbedtls/config_adjust_psa_superset_legacy.h"
|
|
|
|
#if defined(MBEDTLS_PSA_CRYPTO_CONFIG)
|
|
|
|
/* Require built-in implementations based on PSA requirements */
|
|
|
|
/* We need this to have a complete list of requirements
|
|
* before we deduce what built-ins are required. */
|
|
#include "psa/crypto_adjust_keypair_types.h"
|
|
|
|
#include "mbedtls/config_adjust_legacy_from_psa.h"
|
|
|
|
#else /* MBEDTLS_PSA_CRYPTO_CONFIG */
|
|
|
|
/* Infer PSA requirements from Mbed TLS capabilities */
|
|
|
|
#include "mbedtls/config_adjust_psa_from_legacy.h"
|
|
|
|
/* Hopefully the file above will have enabled keypair symbols in a consistent
|
|
* way, but including this here fixes them if that wasn't the case. */
|
|
#include "psa/crypto_adjust_keypair_types.h"
|
|
|
|
#endif /* MBEDTLS_PSA_CRYPTO_CONFIG */
|
|
|
|
#if defined(PSA_WANT_ALG_JPAKE)
|
|
#define PSA_WANT_ALG_SOME_PAKE 1
|
|
#endif
|
|
|
|
#include "psa/crypto_adjust_auto_enabled.h"
|
|
|
|
#endif /* MBEDTLS_CONFIG_PSA_H */
|