From 9198e8c259bf3d50e08cce6c015c87649dddce13 Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Wed, 17 Mar 2021 14:29:56 +0100 Subject: [PATCH] psa: driver contexts: Fix include order and wrapping Signed-off-by: Ronald Cron --- include/psa/crypto_driver_contexts.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/include/psa/crypto_driver_contexts.h b/include/psa/crypto_driver_contexts.h index f3f08b8eb..bee6895e8 100644 --- a/include/psa/crypto_driver_contexts.h +++ b/include/psa/crypto_driver_contexts.h @@ -30,8 +30,8 @@ * declared during the autogeneration process. */ /* Include the context structure definitions for the Mbed TLS software drivers */ -#include "psa/crypto_builtin_hash.h" #include "psa/crypto_builtin_cipher.h" +#include "psa/crypto_builtin_hash.h" /* Define the context to be used for an operation that is executed through the * PSA Driver wrapper layer as the union of all possible driver's contexts. @@ -52,11 +52,8 @@ typedef union { unsigned dummy; /* Make sure this structure is always non-empty */ mbedtls_psa_cipher_operation_t mbedtls_ctx; #if defined(PSA_CRYPTO_DRIVER_TEST) - mbedtls_transparent_test_driver_cipher_operation_t - transparent_test_driver_ctx; - - mbedtls_opaque_test_driver_cipher_operation_t - opaque_test_driver_ctx; + mbedtls_transparent_test_driver_cipher_operation_t transparent_test_driver_ctx; + mbedtls_opaque_test_driver_cipher_operation_t opaque_test_driver_ctx; #endif } psa_driver_cipher_context_t;