commit 86c603702e74db1490579e6f0a20a8c5a2d8d6dd
author Gilles Peskine <Gilles.Peskine@arm.com> Thu Jun 20 22:08:44 2024 +0200
committer Gilles Peskine <Gilles.Peskine@arm.com> Wed Jul 17 12:21:21 2024 +0200
tree c2bbf4df155088e33e36b5a4cb9b167ee23b0544
parent 4804847b1528c00fff132fcde66f35d94e4f55b5

Reorder blocks to avoid double negations

Convert `#if !... A #else B #endif` to `#if ... B #else A`. No semantic change.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

include/mbedtls/ctr_drbg.h

diff --git a/include/mbedtls/ctr_drbg.h b/include/mbedtls/ctr_drbg.h
index c7db470..216169c 100644
--- a/include/mbedtls/ctr_drbg.h
+++ b/include/mbedtls/ctr_drbg.h
@@ -49,10 +49,10 @@
 #define MBEDTLS_CTR_DRBG_USE_PSA_CRYPTO
 #endif
 
-#if !defined(MBEDTLS_CTR_DRBG_USE_PSA_CRYPTO)
-#include "mbedtls/aes.h"
-#else
+#if defined(MBEDTLS_CTR_DRBG_USE_PSA_CRYPTO)
 #include "psa/crypto.h"
+#else
+#include "mbedtls/aes.h"
 #endif
 
 #include "entropy.h"
@@ -204,10 +204,10 @@
                                                   * This is the maximum number of requests
                                                   * that can be made between reseedings. */
 
-#if !defined(MBEDTLS_CTR_DRBG_USE_PSA_CRYPTO)
-    mbedtls_aes_context MBEDTLS_PRIVATE(aes_ctx);        /*!< The AES context. */
-#else
+#if defined(MBEDTLS_CTR_DRBG_USE_PSA_CRYPTO)
     mbedtls_ctr_drbg_psa_context MBEDTLS_PRIVATE(psa_ctx); /*!< The PSA context. */
+#else
+    mbedtls_aes_context MBEDTLS_PRIVATE(aes_ctx);        /*!< The AES context. */
 #endif
 
     /*