Fix for .c files to ensure macro guards for wildcard.

Author: dgarske

wolfcrypt/src/port/autosar/cryif.c

@@ -28,13 +28,15 @@
 #endif
 
 #include <wolfssl/wolfcrypt/settings.h>
+
+#ifdef WOLFSSL_AUTOSAR
+#ifndef NO_WOLFSSL_AUTOSAR_CRYIF
+
 #include <wolfssl/version.h>
 #include <wolfssl/wolfcrypt/port/autosar/Csm.h>
 #include <wolfssl/wolfcrypt/port/autosar/CryIf.h>
 #include <wolfssl/wolfcrypt/port/autosar/Crypto.h>
 
-#ifdef WOLFSSL_AUTOSAR
-#ifndef NO_WOLFSSL_AUTOSAR_CRYIF
 
 #include <wolfssl/wolfcrypt/logging.h>
 

wolfcrypt/src/port/autosar/crypto.c

@@ -25,12 +25,12 @@
 #endif
 
 #include <wolfssl/wolfcrypt/settings.h>
-#include <wolfssl/wolfcrypt/port/autosar/Csm.h>
-#include <wolfssl/wolfcrypt/port/autosar/Crypto.h>
 
 #ifdef WOLFSSL_AUTOSAR
 #ifndef NO_WOLFSSL_AUTOSAR_CRYPTO
 
+#include <wolfssl/wolfcrypt/port/autosar/Csm.h>
+#include <wolfssl/wolfcrypt/port/autosar/Crypto.h>
 #include <wolfssl/wolfcrypt/logging.h>
 #include <wolfssl/wolfcrypt/aes.h>
 #include <wolfssl/wolfcrypt/random.h>

wolfcrypt/src/port/autosar/csm.c

@@ -25,14 +25,15 @@
 #endif
 
 #include <wolfssl/wolfcrypt/settings.h>
+
+#ifdef WOLFSSL_AUTOSAR
+#ifndef NO_WOLFSSL_AUTOSAR_CSM
+
 #include <wolfssl/wolfcrypt/logging.h>
 #include <wolfssl/version.h>
 #include <wolfssl/wolfcrypt/port/autosar/Csm.h>
 #include <wolfssl/wolfcrypt/port/autosar/CryIf.h>
 
-#ifdef WOLFSSL_AUTOSAR
-#ifndef NO_WOLFSSL_AUTOSAR_CSM
-
 
 /* AutoSAR 4.4 */
 /* basic shim layer to plug in wolfSSL crypto */

wolfcrypt/src/port/autosar/test.c

@@ -24,6 +24,9 @@
 #endif
 
 #include <wolfssl/wolfcrypt/settings.h>
+
+#ifdef WOLFSSL_AUTOSAR
+
 #include <wolfssl/wolfcrypt/logging.h>
 #include <wolfssl/wolfcrypt/port/autosar/Csm.h>
 #define BLOCK_SIZE 16
@@ -428,3 +431,5 @@ int main(int argc, char* argv[])
 #endif /* REDIRECTION_CONFIG */
     return ret;
 }
+
+#endif /* WOLFSSL_AUTOSAR */