yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-22 16:35:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixup certs.c: Remove redundant TinyCrypt guard

Browse Source
This commit is contained in:
Hanno Becker 2019-09-04 16:09:56 +01:00
parent d2929b5626
commit f45d9da878
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
library/certs.c
View File

@ -45,7 +45,7 @@
/* Use CRTs with Secp256r1-only if Secp384r1 is disabled.
* Otherwise, fall back to previous test CRTs using both
* Secp256r1 and Secp384r1. */
#if !defined(MBEDTLS_ECP_DP_SECP384R1_ENABLED) || defined(MBEDTLS_USE_TINYCRYPT)
#if !defined(MBEDTLS_ECP_DP_SECP384R1_ENABLED)
/* This is taken from tests/data_files/test-ca3.crt.pem */
/* BEGIN FILE string macro TEST_CA_CRT_EC_PEM tests/data_files/test-ca3.crt.pem */
@ -135,7 +135,7 @@
}
/* END FILE */
#else /* !MBEDTLS_ECP_DP_SECP384R1_ENABLED || MBEDTLS_USE_TINYCRYPT */
#else /* !MBEDTLS_ECP_DP_SECP384R1_ENABLED */
/* This is taken from tests/data_files/test-ca2.crt */
/* BEGIN FILE string macro TEST_CA_CRT_EC_PEM tests/data_files/test-ca2.crt */
@ -241,7 +241,7 @@
}
/* END FILE */
#endif /* MBEDTLS_ECP_DP_SECP384R1_ENABLED || MBEDTLS_USE_TINYCRYPT */
#endif /* MBEDTLS_ECP_DP_SECP384R1_ENABLED */
#define TEST_CA_PWD_EC_PEM "PolarSSLTest"
@ -607,7 +607,7 @@
/* Use CRTs with Secp256r1-only if Secp384r1 is disabled.
* Otherwise, fall back to previous test CRTs using both
* Secp256r1 and Secp384r1. */
#if !defined(MBEDTLS_ECP_DP_SECP384R1_ENABLED) || defined(MBEDTLS_USE_TINYCRYPT)
#if !defined(MBEDTLS_ECP_DP_SECP384R1_ENABLED)
/* This is taken from tests/data_files/server11.crt.pem. */
/* BEGIN FILE string macro TEST_SRV_CRT_EC_PEM tests/data_files/server11.crt.pem */
@ -696,7 +696,7 @@
}
/* END FILE */
#else /* MBEDTLS_ECP_DP_SECP384R1_ENABLED || MBEDTLS_USE_TINYCRYPT */
#else /* MBEDTLS_ECP_DP_SECP384R1_ENABLED */
/* This is taken from tests/data_files/server5.crt. */
/* BEGIN FILE string macro TEST_SRV_CRT_EC_PEM tests/data_files/server5.crt */
@ -796,7 +796,7 @@
}
/* END FILE */
#endif /* MBEDTLS_ECP_DP_SECP384R1_ENABLED || MBEDTLS_USE_TINYCRYPT */
#endif /* MBEDTLS_ECP_DP_SECP384R1_ENABLED */
/* This is taken from tests/data_files/server2-sha256.crt. */
/* BEGIN FILE string macro TEST_SRV_CRT_RSA_SHA256_PEM tests/data_files/server2-sha256.crt */
@ -1152,7 +1152,7 @@
/* Use CRTs with Secp256r1-only if Secp384r1 is disabled.
* Otherwise, fall back to previous test CRTs using both
* Secp256r1 and Secp384r1. */
#if !defined(MBEDTLS_ECP_DP_SECP384R1_ENABLED) || defined(MBEDTLS_USE_TINYCRYPT)
#if !defined(MBEDTLS_ECP_DP_SECP384R1_ENABLED)
/* This is taken from tests/data_files/cli3.crt. */
/* BEGIN FILE string macro TEST_CLI_CRT_EC_PEM tests/data_files/cli3.crt.pem */
@ -1242,7 +1242,7 @@
}
/* END FILE */
#else /* MBEDTLS_ECP_DP_SECP384R1_ENABLED || MBEDTLS_USE_TINYCRYPT */
#else /* MBEDTLS_ECP_DP_SECP384R1_ENABLED */
/* This is taken from tests/data_files/cli2.crt. */
/* BEGIN FILE string macro TEST_CLI_CRT_EC_PEM tests/data_files/cli2.crt */
@ -1336,7 +1336,7 @@
}
/* END FILE */
#endif /* MBEDTLS_ECP_DP_SECP384R1_ENABLED || MBEDTLS_USE_TINYCRYPT */
#endif /* MBEDTLS_ECP_DP_SECP384R1_ENABLED */
/* This is taken from tests/data_files/cli-rsa-sha256.crt. */
/* BEGIN FILE string macro TEST_CLI_CRT_RSA_PEM tests/data_files/cli-rsa-sha256.crt */