Changed order of config file checking in include defines

2019-09-02 22:17:25 +03:00 · 2019-09-02 22:17:25 +03:00 · 235949b1f4
parent 08fd15796a
commit 235949b1f4
14 changed files with 39 additions and 40 deletions
--- a/features/mbedtls/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_PSOC6_01/sha1_alt.h
+++ b/features/mbedtls/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_PSOC6_01/sha1_alt.h
@ -28,10 +28,10 @@
 #if !defined(SHA1_ALT_H)
 #define SHA1_ALT_H

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "config.h"
-#else
+#if defined(MBEDTLS_CONFIG_FILE)
 #include MBEDTLS_CONFIG_FILE
+#else
+#include "config.h"
 #endif

 #include "crypto_common.h"
--- a/features/mbedtls/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_PSOC6_01/sha256_alt.h
+++ b/features/mbedtls/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_PSOC6_01/sha256_alt.h
@ -29,10 +29,10 @@
 #if !defined(SHA256_ALT_H)
 #define SHA256_ALT_H

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "config.h"
-#else
+#if defined(MBEDTLS_CONFIG_FILE)
 #include MBEDTLS_CONFIG_FILE
+#else
+#include "config.h"
 #endif

 #include "crypto_common.h"
--- a/features/mbedtls/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_PSOC6_01/sha512_alt.h
+++ b/features/mbedtls/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_PSOC6_01/sha512_alt.h
@ -28,10 +28,10 @@
 #if !defined(SHA512_ALT_H)
 #define SHA512_ALT_H

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "config.h"
-#else
+#if defined(MBEDTLS_CONFIG_FILE)
 #include MBEDTLS_CONFIG_FILE
+#else
+#include "config.h"
 #endif

 #include "crypto_common.h"
--- a/features/mbedtls/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_PSOC6_02/sha1_alt.h
+++ b/features/mbedtls/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_PSOC6_02/sha1_alt.h
@ -28,10 +28,10 @@
 #if !defined(SHA1_ALT_H)
 #define SHA1_ALT_H

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "config.h"
-#else
+#if defined(MBEDTLS_CONFIG_FILE)
 #include MBEDTLS_CONFIG_FILE
+#else
+#include "config.h"
 #endif

 #include "crypto_common.h"
--- a/features/mbedtls/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_PSOC6_02/sha256_alt.h
+++ b/features/mbedtls/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_PSOC6_02/sha256_alt.h
@ -29,10 +29,10 @@
 #if !defined(SHA256_ALT_H)
 #define SHA256_ALT_H

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "config.h"
-#else
+#if defined(MBEDTLS_CONFIG_FILE)
 #include MBEDTLS_CONFIG_FILE
+#else
+#include "config.h"
 #endif

 #include "crypto_common.h"
--- a/features/mbedtls/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_PSOC6_02/sha512_alt.h
+++ b/features/mbedtls/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_PSOC6_02/sha512_alt.h
@ -28,10 +28,10 @@
 #if !defined(SHA512_ALT_H)
 #define SHA512_ALT_H

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "config.h"
-#else
+#if defined(MBEDTLS_CONFIG_FILE)
 #include MBEDTLS_CONFIG_FILE
+#else
+#include "config.h"
 #endif

 #include "crypto_common.h"
--- a/features/mbedtls/targets/TARGET_Cypress/TARGET_PSOC6/aes_alt.c
+++ b/features/mbedtls/targets/TARGET_Cypress/TARGET_PSOC6/aes_alt.c
@ -122,7 +122,6 @@ static int aes_set_keys( mbedtls_aes_context *ctx, const unsigned char *key,
    if (CY_CRYPTO_SUCCESS != status)
    {
        ret = MBEDTLS_ERR_AES_HW_ACCEL_FAILED;
-        goto exit;
    }

 exit:
--- a/features/mbedtls/targets/TARGET_Cypress/TARGET_PSOC6/crypto_common.h
+++ b/features/mbedtls/targets/TARGET_Cypress/TARGET_PSOC6/crypto_common.h
@ -27,10 +27,10 @@
 #if !defined(CRYPTO_COMMON_H)
 #define CRYPTO_COMMON_H

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
+#if defined(MBEDTLS_CONFIG_FILE)
 #include MBEDTLS_CONFIG_FILE
+#else
+#include "config.h"
 #endif

 #include "mbedtls/ecp.h"
--- a/features/mbedtls/targets/TARGET_Cypress/TARGET_PSOC6/ecdsa_alt.c
+++ b/features/mbedtls/targets/TARGET_Cypress/TARGET_PSOC6/ecdsa_alt.c
@ -25,10 +25,10 @@
 *
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
+#if defined(MBEDTLS_CONFIG_FILE)
 #include MBEDTLS_CONFIG_FILE
+#else
+#include "config.h"
 #endif

 #if defined(MBEDTLS_ECDSA_C)
--- a/features/mbedtls/targets/TARGET_Cypress/TARGET_PSOC6/ecp_alt.c
+++ b/features/mbedtls/targets/TARGET_Cypress/TARGET_PSOC6/ecp_alt.c
@ -43,10 +43,10 @@
 *     <http://eprint.iacr.org/2004/342.pdf>
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
+#if defined(MBEDTLS_CONFIG_FILE)
 #include MBEDTLS_CONFIG_FILE
+#else
+#include "config.h"
 #endif

 #if defined(MBEDTLS_ECP_C)
--- a/features/mbedtls/targets/TARGET_Cypress/TARGET_PSOC6/ecp_curves_alt.c
+++ b/features/mbedtls/targets/TARGET_Cypress/TARGET_PSOC6/ecp_curves_alt.c
@ -25,10 +25,10 @@
 *
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
+#if defined(MBEDTLS_CONFIG_FILE)
 #include MBEDTLS_CONFIG_FILE
+#else
+#include "config.h"
 #endif

 #if defined(MBEDTLS_ECP_C)
--- a/features/mbedtls/targets/TARGET_Cypress/TARGET_PSOC6/sha1_alt.c
+++ b/features/mbedtls/targets/TARGET_Cypress/TARGET_PSOC6/sha1_alt.c
@ -26,10 +26,10 @@
 */


-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
+#if defined(MBEDTLS_CONFIG_FILE)
 #include MBEDTLS_CONFIG_FILE
+#else
+#include "config.h"
 #endif

 #if defined(MBEDTLS_SHA1_C)
--- a/features/mbedtls/targets/TARGET_Cypress/TARGET_PSOC6/sha256_alt.c
+++ b/features/mbedtls/targets/TARGET_Cypress/TARGET_PSOC6/sha256_alt.c
@ -25,10 +25,10 @@
 *
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
+#if defined(MBEDTLS_CONFIG_FILE)
 #include MBEDTLS_CONFIG_FILE
+#else
+#include "config.h"
 #endif

 #if defined(MBEDTLS_SHA256_C)
--- a/features/mbedtls/targets/TARGET_Cypress/TARGET_PSOC6/sha512_alt.c
+++ b/features/mbedtls/targets/TARGET_Cypress/TARGET_PSOC6/sha512_alt.c
@ -25,10 +25,10 @@
 *
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
+#if defined(MBEDTLS_CONFIG_FILE)
 #include MBEDTLS_CONFIG_FILE
+#else
+#include "config.h"
 #endif

 #if defined(MBEDTLS_SHA512_C)