Cleanup the user_settings.h logic between wolfTPM and wolfSSL.

Author: dgarske

wolftpm/tpm2_types.h

@@ -22,27 +22,32 @@
 #ifndef __TPM2_TYPES_H__
 #define __TPM2_TYPES_H__
 
-#include <wolftpm/visibility.h>
 #include <stdint.h>
 
-#if defined(USE_HAL_DRIVER) && !defined(HAVE_CONFIG_H)
+#ifdef WOLFTPM_USER_SETTINGS
+    #include "user_settings.h"
+#elif defined(USE_HAL_DRIVER) && !defined(HAVE_CONFIG_H)
     /* STM Configuration File (generated by CubeMX) */
     #include "wolfSSL.I-CUBE-wolfTPM_conf.h"
-#elif !defined(WOLFTPM_USER_SETTINGS)
-    /* use generated options.h or a custom one */
+#else
+    /* use generated library options.h */
     #include <wolftpm/options.h>
 #endif
 
 #ifndef WOLFTPM2_NO_WOLFCRYPT
-    #ifndef WOLFSSL_USER_SETTINGS
-        #include <wolfssl/options.h>
-    #endif
-#else
-    #ifdef WOLFTPM_USER_SETTINGS
+    #ifdef WOLFSSL_USER_SETTINGS
         #include "user_settings.h"
+    #elif defined(USE_HAL_DRIVER) && !defined(HAVE_CONFIG_H)
+        /* STM Configuration File (generated by CubeMX) */
+        #include "wolfSSL.I-CUBE-wolfTPM_conf.h"
+    #else
+        /* use generated library options.h */
+        #include <wolfssl/options.h>
     #endif
 #endif
 
+#include <wolftpm/visibility.h>
+
 #ifdef WOLFTPM_WINAPI
     #ifdef _WIN32
         #include <winsock2.h>