bce4dc028f
When the new PSA crypto configuration mechanism MBEDTLS_PSA_CRYPTO_CONFIG is disabled, legacy configurations must keep working, even if they don't include the new header file mbedtls/config_psa.h. Code that uses or implements PSA crypto interfaces needs some of the symbols defined by the new header file. Therefore, include the new header file via PSA crypto headers, which are included everywhere mbedtls/config_psa.h is needed. Include it early, in psa/crypto_platform.h, just after including mbedtls/config.h, so that its symbols are available wherever the symbols from mbedtls/config.h is available. This fixes the unit tests with configs/config-psa-crypto.h: some unit tests were failing, revealing that library features controlled with the new symbols were no longer getting built. Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
87 lines
2.8 KiB
C
87 lines
2.8 KiB
C
/**
|
|
* \file psa/crypto_platform.h
|
|
*
|
|
* \brief PSA cryptography module: Mbed TLS platform definitions
|
|
*
|
|
* \note This file may not be included directly. Applications must
|
|
* include psa/crypto.h.
|
|
*
|
|
* This file contains platform-dependent type definitions.
|
|
*
|
|
* In implementations with isolation between the application and the
|
|
* cryptography module, implementers should take care to ensure that
|
|
* the definitions that are exposed to applications match what the
|
|
* module implements.
|
|
*/
|
|
/*
|
|
* 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 PSA_CRYPTO_PLATFORM_H
|
|
#define PSA_CRYPTO_PLATFORM_H
|
|
|
|
/* Include the Mbed TLS configuration file, the way Mbed TLS does it
|
|
* in each of its header files. */
|
|
#if !defined(MBEDTLS_CONFIG_FILE)
|
|
#include "mbedtls/config.h"
|
|
#else
|
|
#include MBEDTLS_CONFIG_FILE
|
|
#endif
|
|
|
|
/* Translate between classic MBEDTLS_xxx feature symbols and PSA_xxx
|
|
* feature symbols. */
|
|
#include "mbedtls/config_psa.h"
|
|
|
|
/* PSA requires several types which C99 provides in stdint.h. */
|
|
#include <stdint.h>
|
|
|
|
#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \
|
|
!defined(inline) && !defined(__cplusplus)
|
|
#define inline __inline
|
|
#endif
|
|
|
|
/* Integral type representing a key handle. */
|
|
typedef uint16_t psa_key_handle_t;
|
|
|
|
#if defined(MBEDTLS_PSA_CRYPTO_KEY_ID_ENCODES_OWNER)
|
|
|
|
/* Building for the PSA Crypto service on a PSA platform, a key owner is a PSA
|
|
* partition identifier.
|
|
*
|
|
* The function psa_its_identifier_of_slot() in psa_crypto_storage.c that
|
|
* translates a key identifier to a key storage file name assumes that
|
|
* mbedtls_key_owner_id_t is an 32 bits integer. This function thus needs
|
|
* reworking if mbedtls_key_owner_id_t is not defined as a 32 bits integer
|
|
* here anymore.
|
|
*/
|
|
typedef int32_t mbedtls_key_owner_id_t;
|
|
|
|
/** Compare two key owner identifiers.
|
|
*
|
|
* \param id1 First key owner identifier.
|
|
* \param id2 Second key owner identifier.
|
|
*
|
|
* \return Non-zero if the two key owner identifiers are equal, zero otherwise.
|
|
*/
|
|
static inline int mbedtls_key_owner_id_equal( mbedtls_key_owner_id_t id1,
|
|
mbedtls_key_owner_id_t id2 )
|
|
{
|
|
return( id1 == id2 );
|
|
}
|
|
|
|
#endif /* MBEDTLS_PSA_CRYPTO_KEY_ID_ENCODES_OWNER */
|
|
|
|
#endif /* PSA_CRYPTO_PLATFORM_H */
|