From 9f3e7749d9e4bd9be36319c51e7e113ad2a60dff Mon Sep 17 00:00:00 2001 From: David Brown Date: Tue, 9 Feb 2021 16:27:19 -0700 Subject: [PATCH] Revert "Change some examples to use new PSA crypto config" This reverts commit 4192e9a90c210005f6b558ec51c6a694c902b51d. Converting conditional compliation for PSA configuration will come later. Signed-off-by: David Brown --- programs/psa/crypto_examples.c | 6 +++--- programs/psa/key_ladder_demo.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/psa/crypto_examples.c b/programs/psa/crypto_examples.c index e9323a5b2..935d657af 100644 --- a/programs/psa/crypto_examples.c +++ b/programs/psa/crypto_examples.c @@ -43,13 +43,13 @@ } \ } while ( 0 ) -#if !defined(MBEDTLS_PSA_CRYPTO_C) || !defined(PSA_WANT_KEY_TYPE_AES) || \ +#if !defined(MBEDTLS_PSA_CRYPTO_C) || !defined(MBEDTLS_AES_C) || \ !defined(MBEDTLS_CIPHER_MODE_CBC) || !defined(MBEDTLS_CIPHER_MODE_CTR) || \ !defined(MBEDTLS_CIPHER_MODE_WITH_PADDING) || \ defined(MBEDTLS_PSA_CRYPTO_KEY_ID_ENCODES_OWNER) int main( void ) { - printf( "MBEDTLS_PSA_CRYPTO_C and/or PSA_WANT_KEY_TYPE_AES and/or " + printf( "MBEDTLS_PSA_CRYPTO_C and/or MBEDTLS_AES_C and/or " "MBEDTLS_CIPHER_MODE_CBC and/or MBEDTLS_CIPHER_MODE_CTR " "and/or MBEDTLS_CIPHER_MODE_WITH_PADDING " "not defined and/or MBEDTLS_PSA_CRYPTO_KEY_ID_ENCODES_OWNER" @@ -327,5 +327,5 @@ exit: mbedtls_psa_crypto_free( ); return( 0 ); } -#endif /* MBEDTLS_PSA_CRYPTO_C && PSA_WANT_KEY_TYPE_AES && MBEDTLS_CIPHER_MODE_CBC && +#endif /* MBEDTLS_PSA_CRYPTO_C && MBEDTLS_AES_C && MBEDTLS_CIPHER_MODE_CBC && MBEDTLS_CIPHER_MODE_CTR && MBEDTLS_CIPHER_MODE_WITH_PADDING */ diff --git a/programs/psa/key_ladder_demo.c b/programs/psa/key_ladder_demo.c index 2abb1b89f..47d5de642 100644 --- a/programs/psa/key_ladder_demo.c +++ b/programs/psa/key_ladder_demo.c @@ -66,13 +66,13 @@ /* If the build options we need are not enabled, compile a placeholder. */ #if !defined(MBEDTLS_SHA256_C) || !defined(MBEDTLS_MD_C) || \ - !defined(PSA_WANT_KEY_TYPE_AES) || !defined(MBEDTLS_CCM_C) || \ + !defined(MBEDTLS_AES_C) || !defined(MBEDTLS_CCM_C) || \ !defined(MBEDTLS_PSA_CRYPTO_C) || !defined(MBEDTLS_FS_IO) || \ defined(MBEDTLS_PSA_CRYPTO_KEY_ID_ENCODES_OWNER) int main( void ) { printf( "MBEDTLS_SHA256_C and/or MBEDTLS_MD_C and/or " - "PSA_WANT_KEY_TYPE_AES and/or MBEDTLS_CCM_C and/or " + "MBEDTLS_AES_C and/or MBEDTLS_CCM_C and/or " "MBEDTLS_PSA_CRYPTO_C and/or MBEDTLS_FS_IO " "not defined and/or MBEDTLS_PSA_CRYPTO_KEY_ID_ENCODES_OWNER " "defined.\n" ); @@ -695,4 +695,4 @@ usage_failure: usage( ); return( EXIT_FAILURE ); } -#endif /* MBEDTLS_SHA256_C && MBEDTLS_MD_C && PSA_WANT_KEY_TYPE_AES && MBEDTLS_CCM_C && MBEDTLS_PSA_CRYPTO_C && MBEDTLS_FS_IO */ +#endif /* MBEDTLS_SHA256_C && MBEDTLS_MD_C && MBEDTLS_AES_C && MBEDTLS_CCM_C && MBEDTLS_PSA_CRYPTO_C && MBEDTLS_FS_IO */