diff --git a/wolfcrypt/src/aes.c b/wolfcrypt/src/aes.c
index 58d382ee8..88413eaa1 100644
--- a/wolfcrypt/src/aes.c
+++ b/wolfcrypt/src/aes.c
@@ -2974,22 +2974,22 @@ int wc_AesSetIV(Aes* aes, const byte* iv)
         hcryp.Init.pInitVect = (STM_CRYPT_TYPE*)aes->reg;
         HAL_CRYP_Init(&hcryp);
 
-	#ifdef STM32_CRYPTO_AES_ONLY
-		ret = HAL_CRYPEx_AES(&hcryp, (uint8_t*)in, blocks * AES_BLOCK_SIZE,
-			out, STM32_HAL_TIMEOUT);
-	#elif defined(STM32_HAL_V2)
-		ret = HAL_CRYP_Encrypt(&hcryp, (uint32_t*)in, blocks * AES_BLOCK_SIZE,
-			(uint32_t*)out, STM32_HAL_TIMEOUT);
-	#else
-		ret = HAL_CRYP_AESCBC_Encrypt(&hcryp, (uint8_t*)in, blocks * AES_BLOCK_SIZE,
-			out, STM32_HAL_TIMEOUT);
-	#endif
-		if (ret != HAL_OK) {
-			ret = WC_TIMEOUT_E;
-		}
+    #ifdef STM32_CRYPTO_AES_ONLY
+        ret = HAL_CRYPEx_AES(&hcryp, (uint8_t*)in, blocks * AES_BLOCK_SIZE,
+            out, STM32_HAL_TIMEOUT);
+    #elif defined(STM32_HAL_V2)
+        ret = HAL_CRYP_Encrypt(&hcryp, (uint32_t*)in, blocks * AES_BLOCK_SIZE,
+            (uint32_t*)out, STM32_HAL_TIMEOUT);
+    #else
+        ret = HAL_CRYP_AESCBC_Encrypt(&hcryp, (uint8_t*)in, blocks * AES_BLOCK_SIZE,
+            out, STM32_HAL_TIMEOUT);
+    #endif
+        if (ret != HAL_OK) {
+            ret = WC_TIMEOUT_E;
+        }
 
-		/* store iv for next call */
-		XMEMCPY(aes->reg, out + sz - AES_BLOCK_SIZE, AES_BLOCK_SIZE);
+        /* store iv for next call */
+        XMEMCPY(aes->reg, out + sz - AES_BLOCK_SIZE, AES_BLOCK_SIZE);
 
         HAL_CRYP_DeInit(&hcryp);
 
@@ -3028,19 +3028,19 @@ int wc_AesSetIV(Aes* aes, const byte* iv)
         hcryp.Init.pInitVect = (STM_CRYPT_TYPE*)aes->reg;
         HAL_CRYP_Init(&hcryp);
 
-	#ifdef STM32_CRYPTO_AES_ONLY
-		ret = HAL_CRYPEx_AES(&hcryp, (uint8_t*)in, blocks * AES_BLOCK_SIZE,
-			out, STM32_HAL_TIMEOUT);
-	#elif defined(STM32_HAL_V2)
-		ret = HAL_CRYP_Decrypt(&hcryp, (uint32_t*)in, blocks * AES_BLOCK_SIZE,
-			(uint32_t*)out, STM32_HAL_TIMEOUT);
-	#else
-		ret = HAL_CRYP_AESCBC_Decrypt(&hcryp, (uint8_t*)in, blocks * AES_BLOCK_SIZE,
-			out, STM32_HAL_TIMEOUT);
-	#endif
-		if (ret != HAL_OK) {
-			ret = WC_TIMEOUT_E;
-		}
+    #ifdef STM32_CRYPTO_AES_ONLY
+        ret = HAL_CRYPEx_AES(&hcryp, (uint8_t*)in, blocks * AES_BLOCK_SIZE,
+            out, STM32_HAL_TIMEOUT);
+    #elif defined(STM32_HAL_V2)
+        ret = HAL_CRYP_Decrypt(&hcryp, (uint32_t*)in, blocks * AES_BLOCK_SIZE,
+            (uint32_t*)out, STM32_HAL_TIMEOUT);
+    #else
+        ret = HAL_CRYP_AESCBC_Decrypt(&hcryp, (uint8_t*)in, blocks * AES_BLOCK_SIZE,
+            out, STM32_HAL_TIMEOUT);
+    #endif
+        if (ret != HAL_OK) {
+            ret = WC_TIMEOUT_E;
+        }
 
         /* store iv for next call */
         XMEMCPY(aes->reg, aes->tmp, AES_BLOCK_SIZE);
@@ -5960,16 +5960,16 @@ static int wc_AesGcmEncrypt_STM32(Aes* aes, byte* out, const byte* in, word32 sz
     if (authPadSz != 0) {
         authPadSz = authInSz + sizeof(word32) - authPadSz;
         if (authPadSz <= sizeof(authhdr)) {
-        	authInPadded = (byte*)authhdr;
+            authInPadded = (byte*)authhdr;
         }
         else {
-			authInPadded = (byte*)XMALLOC(authPadSz, aes->heap,
-				DYNAMIC_TYPE_TMP_BUFFER);
-			if (authInPadded == NULL) {
-				wolfSSL_CryptHwMutexUnLock();
-				return MEMORY_E;
-			}
-			wasAlloc = 1;
+            authInPadded = (byte*)XMALLOC(authPadSz, aes->heap,
+                DYNAMIC_TYPE_TMP_BUFFER);
+            if (authInPadded == NULL) {
+                wolfSSL_CryptHwMutexUnLock();
+                return MEMORY_E;
+            }
+            wasAlloc = 1;
         }
         XMEMSET(authInPadded, 0, authPadSz);
         XMEMCPY(authInPadded, authIn, authInSz);
@@ -6012,7 +6012,7 @@ static int wc_AesGcmEncrypt_STM32(Aes* aes, byte* out, const byte* in, word32 sz
         XMEMSET(partialBlock, 0, sizeof(partialBlock));
         XMEMCPY(partialBlock, in + (blocks * AES_BLOCK_SIZE), partial);
         status = HAL_CRYPEx_AES_Auth(&hcryp, (uint8_t*)partialBlock, partial,
-        		(uint8_t*)partialBlock, STM32_HAL_TIMEOUT);
+                (uint8_t*)partialBlock, STM32_HAL_TIMEOUT);
         XMEMCPY(out + (blocks * AES_BLOCK_SIZE), partialBlock, partial);
     }
     if (status == HAL_OK) {
@@ -6403,17 +6403,17 @@ static int wc_AesGcmDecrypt_STM32(Aes* aes, byte* out,
     if (authPadSz != 0) {
         authPadSz = authInSz + sizeof(word32) - authPadSz;
         if (authPadSz <= sizeof(authhdr)) {
-			authInPadded = (byte*)authhdr;
-		}
-		else {
-			authInPadded = (byte*)XMALLOC(authPadSz, aes->heap,
-				DYNAMIC_TYPE_TMP_BUFFER);
-			if (authInPadded == NULL) {
-				wolfSSL_CryptHwMutexUnLock();
-				return MEMORY_E;
-			}
-			wasAlloc = 1;
-		}
+            authInPadded = (byte*)authhdr;
+        }
+        else {
+            authInPadded = (byte*)XMALLOC(authPadSz, aes->heap,
+                DYNAMIC_TYPE_TMP_BUFFER);
+            if (authInPadded == NULL) {
+                wolfSSL_CryptHwMutexUnLock();
+                return MEMORY_E;
+            }
+            wasAlloc = 1;
+        }
         XMEMSET(authInPadded, 0, authPadSz);
         XMEMCPY(authInPadded, authIn, authInSz);
     } else {
@@ -6429,7 +6429,7 @@ static int wc_AesGcmDecrypt_STM32(Aes* aes, byte* out,
     /* Set the CRYP parameters */
     hcryp.Init.HeaderSize = authPadSz;
     if (authPadSz == 0)
-    	hcryp.Init.Header = NULL; /* cannot pass pointer when authIn == 0 */
+        hcryp.Init.Header = NULL; /* cannot pass pointer when authIn == 0 */
     hcryp.Init.ChainingMode  = CRYP_CHAINMODE_AES_GCM_GMAC;
     hcryp.Init.OperatingMode = CRYP_ALGOMODE_DECRYPT;
     hcryp.Init.GCMCMACPhase  = CRYP_INIT_PHASE;