mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2025-02-24 17:16:57 +00:00
Move check config feature for PSA_WANT
Moved from doing the dependency checks for MBEDTLS_PSA_BUILTIN to checking the PSA_WANT macros for the dependency checks. This required moving the file into the include/psa directory and having the file be included by crypto_config.h instead of config_psa.h. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
This commit is contained in:
John Durkop
parent
6ba40d1faa
commit
b6f7afcb5c
|
|
@ -1,87 +0,0 @@
|
||||||
/**
|
|
||||||
* \file check_config_psa.h
|
|
||||||
*
|
|
||||||
* \brief Consistency checks for PSA configuration options
|
|
||||||
*/
|
|
||||||
/*
|
|
||||||
* 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.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* It is recommended to include this file from your config_psa.h
|
|
||||||
* in order to catch dependency issues early.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef MBEDTLS_CHECK_CONFIG_PSA_H
|
|
||||||
#define MBEDTLS_CHECK_CONFIG_PSA_H
|
|
||||||
|
|
||||||
#if defined(MBEDTLS_PSA_BUILTIN_ALG_DETERMINISTIC_ECDSA) && \
|
|
||||||
!( defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_ECC_KEY_PAIR) || \
|
|
||||||
defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_ECC_PUBLIC_KEY) || \
|
|
||||||
defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_ECC_KEY_PAIR) || \
|
|
||||||
defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_ECC_PUBLIC_KEY) )
|
|
||||||
#error "MBEDTLS_PSA_BUILTIN_ALG_DETERMINISTIC_ECDSA defined, but not all prerequisites"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(MBEDTLS_PSA_BUILTIN_ALG_ECDSA) && \
|
|
||||||
!( defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_ECC_KEY_PAIR) || \
|
|
||||||
defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_ECC_PUBLIC_KEY) || \
|
|
||||||
defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_ECC_KEY_PAIR) || \
|
|
||||||
defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_ECC_PUBLIC_KEY) )
|
|
||||||
#error "MBEDTLS_PSA_BUILTIN_ALG_ECDSA defined, but not all prerequisites"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(MBEDTLS_PSA_BUILTIN_ALG_DETERMINISTIC_ECDSA) && \
|
|
||||||
!( defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_ECC_KEY_PAIR) || \
|
|
||||||
defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_ECC_PUBLIC_KEY) || \
|
|
||||||
defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_ECC_KEY_PAIR) || \
|
|
||||||
defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_ECC_PUBLIC_KEY) )
|
|
||||||
#error "MBEDTLS_PSA_BUILTIN_ALG_ECDH defined, but not all prerequisites"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(MBEDTLS_PSA_BUILTIN_ALG_RSA_PKCS1V15_CRYPT) && \
|
|
||||||
!( defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_RSA_KEY_PAIR) || \
|
|
||||||
defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_RSA_PUBLIC_KEY) || \
|
|
||||||
defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_RSA_KEY_PAIR) || \
|
|
||||||
defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_RSA_PUBLIC_KEY) )
|
|
||||||
#error "MBEDTLS_PSA_BUILTIN_ALG_RSA_PKCS1V15_CRYPT defined, but not all prerequisites"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(MBEDTLS_PSA_BUILTIN_ALG_RSA_PKCS1V15_SIGN) && \
|
|
||||||
!( defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_RSA_KEY_PAIR) || \
|
|
||||||
defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_RSA_PUBLIC_KEY) || \
|
|
||||||
defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_RSA_KEY_PAIR) || \
|
|
||||||
defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_RSA_PUBLIC_KEY) )
|
|
||||||
#error "MBEDTLS_PSA_BUILTIN_ALG_RSA_PKCS1V15_SIGN defined, but not all prerequisites"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(MBEDTLS_PSA_BUILTIN_ALG_RSA_OAEP) && \
|
|
||||||
!( defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_RSA_KEY_PAIR) || \
|
|
||||||
defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_RSA_PUBLIC_KEY) || \
|
|
||||||
defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_RSA_KEY_PAIR) || \
|
|
||||||
defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_RSA_PUBLIC_KEY) )
|
|
||||||
#error "MBEDTLS_PSA_BUILTIN_ALG_RSA_OAEP defined, but not all prerequisites"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(MBEDTLS_PSA_BUILTIN_ALG_RSA_PSS) && \
|
|
||||||
!( defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_RSA_KEY_PAIR) || \
|
|
||||||
defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_RSA_PUBLIC_KEY) || \
|
|
||||||
defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_RSA_KEY_PAIR) || \
|
|
||||||
defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_RSA_PUBLIC_KEY) )
|
|
||||||
#error "MBEDTLS_PSA_BUILTIN_ALG_RSA_PSS defined, but not all prerequisites"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* MBEDTLS_CHECK_CONFIG_PSA_H */
|
|
||||||
|
|
@ -207,8 +207,6 @@ extern "C" {
|
||||||
|
|
||||||
#endif /* MBEDTLS_PSA_CRYPTO_CONFIG */
|
#endif /* MBEDTLS_PSA_CRYPTO_CONFIG */
|
||||||
|
|
||||||
#include "mbedtls/check_config_psa.h"
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
67
include/psa/check_crypto_config.h
Normal file
67
include/psa/check_crypto_config.h
Normal file
|
|
@ -0,0 +1,67 @@
|
||||||
|
/**
|
||||||
|
* \file check_crypto_config.h
|
||||||
|
*
|
||||||
|
* \brief Consistency checks for PSA configuration options
|
||||||
|
*/
|
||||||
|
/*
|
||||||
|
* 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* It is recommended to include this file from your crypto_config.h
|
||||||
|
* in order to catch dependency issues early.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef MBEDTLS_CHECK_CRYPTO_CONFIG_H
|
||||||
|
#define MBEDTLS_CHECK_CRYPTO_CONFIG_H
|
||||||
|
|
||||||
|
#if defined(PSA_WANT_ALG_DETERMINISTIC_ECDSA) && \
|
||||||
|
!( defined(PSA_WANT_KEY_TYPE_ECC_KEY_PAIR) || \
|
||||||
|
defined(PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY) )
|
||||||
|
#error "PSA_WANT_ALG_DETERMINISTIC_ECDSA defined, but not all prerequisites"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PSA_WANT_ALG_ECDSA) && \
|
||||||
|
!( defined(PSA_WANT_KEY_TYPE_ECC_KEY_PAIR) || \
|
||||||
|
defined(PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY) )
|
||||||
|
#error "PSA_WANT_ALG_ECDSA defined, but not all prerequisites"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PSA_WANT_ALG_RSA_PKCS1V15_CRYPT) && \
|
||||||
|
!( defined(PSA_WANT_KEY_TYPE_RSA_KEY_PAIR) || \
|
||||||
|
defined(PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY) )
|
||||||
|
#error "PSA_WANT_ALG_RSA_PKCS1V15_CRYPT defined, but not all prerequisites"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PSA_WANT_ALG_RSA_PKCS1V15_SIGN) && \
|
||||||
|
!( defined(PSA_WANT_KEY_TYPE_RSA_KEY_PAIR) || \
|
||||||
|
defined(PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY) )
|
||||||
|
#error "PSA_WANT_ALG_RSA_PKCS1V15_SIGN defined, but not all prerequisites"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PSA_WANT_ALG_RSA_OAEP) && \
|
||||||
|
!( defined(PSA_WANT_KEY_TYPE_RSA_KEY_PAIR) || \
|
||||||
|
defined(PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY) )
|
||||||
|
#error "PSA_WANT_ALG_RSA_OAEP defined, but not all prerequisites"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PSA_WANT_ALG_RSA_PSS) && \
|
||||||
|
!( defined(PSA_WANT_KEY_TYPE_RSA_KEY_PAIR) || \
|
||||||
|
defined(PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY) )
|
||||||
|
#error "PSA_WANT_ALG_RSA_PSS defined, but not all prerequisites"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif /* MBEDTLS_CHECK_CRYPTO_CONFIG_H */
|
||||||
|
|
@ -64,4 +64,6 @@
|
||||||
#define PSA_WANT_KEY_TYPE_RSA_KEY_PAIR 1
|
#define PSA_WANT_KEY_TYPE_RSA_KEY_PAIR 1
|
||||||
#define PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY 1
|
#define PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY 1
|
||||||
|
|
||||||
|
#include "psa/check_crypto_config.h"
|
||||||
|
|
||||||
#endif /* PSA_CRYPTO_CONFIG_H */
|
#endif /* PSA_CRYPTO_CONFIG_H */
|
||||||
|
|
|
||||||
|
|
@ -157,7 +157,6 @@
|
||||||
<ClInclude Include="..\..\include\mbedtls\chacha20.h" />
|
<ClInclude Include="..\..\include\mbedtls\chacha20.h" />
|
||||||
<ClInclude Include="..\..\include\mbedtls\chachapoly.h" />
|
<ClInclude Include="..\..\include\mbedtls\chachapoly.h" />
|
||||||
<ClInclude Include="..\..\include\mbedtls\check_config.h" />
|
<ClInclude Include="..\..\include\mbedtls\check_config.h" />
|
||||||
<ClInclude Include="..\..\include\mbedtls\check_config_psa.h" />
|
|
||||||
<ClInclude Include="..\..\include\mbedtls\cipher.h" />
|
<ClInclude Include="..\..\include\mbedtls\cipher.h" />
|
||||||
<ClInclude Include="..\..\include\mbedtls\cipher_internal.h" />
|
<ClInclude Include="..\..\include\mbedtls\cipher_internal.h" />
|
||||||
<ClInclude Include="..\..\include\mbedtls\cmac.h" />
|
<ClInclude Include="..\..\include\mbedtls\cmac.h" />
|
||||||
|
|
@ -222,6 +221,7 @@
|
||||||
<ClInclude Include="..\..\include\mbedtls\x509_crt.h" />
|
<ClInclude Include="..\..\include\mbedtls\x509_crt.h" />
|
||||||
<ClInclude Include="..\..\include\mbedtls\x509_csr.h" />
|
<ClInclude Include="..\..\include\mbedtls\x509_csr.h" />
|
||||||
<ClInclude Include="..\..\include\mbedtls\xtea.h" />
|
<ClInclude Include="..\..\include\mbedtls\xtea.h" />
|
||||||
|
<ClInclude Include="..\..\include\psa\check_crypto_config.h" />
|
||||||
<ClInclude Include="..\..\include\psa\crypto.h" />
|
<ClInclude Include="..\..\include\psa\crypto.h" />
|
||||||
<ClInclude Include="..\..\include\psa\crypto_accel_driver.h" />
|
<ClInclude Include="..\..\include\psa\crypto_accel_driver.h" />
|
||||||
<ClInclude Include="..\..\include\psa\crypto_compat.h" />
|
<ClInclude Include="..\..\include\psa\crypto_compat.h" />
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue