commit ca60937cf9dd6961242a3c0c9a4aca6f9a7dcb0d
author Andrzej Kurek <andrzej.kurek@arm.com> Wed Jul 08 03:19:02 2020 -0400
committer Andrzej Kurek <andrzej.kurek@arm.com> Wed Jul 08 09:25:49 2020 -0400
tree ca869cccc04b91a66c498f4d8a38e24525959fb4
parent 0919b142b6bb9c340f68b1112118506273b17483

Add buffer and context clearing upon suspected FI

Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>

library/aes.c

diff --git a/library/aes.c b/library/aes.c
index 8cfb4ba..e49f74f 100644
--- a/library/aes.c
+++ b/library/aes.c
@@ -822,6 +822,7 @@
         }
     }
 
+    mbedtls_platform_memset( RK, 0, ( keybits >> 5 ) * 4 );
     return( MBEDTLS_ERR_PLATFORM_FAULT_DETECTED );
 }
 #endif /* !MBEDTLS_AES_SETKEY_ENC_ALT */
@@ -1176,6 +1177,8 @@
         }
     }
 
+    // Clear the output in case of a FI
+    mbedtls_platform_memset( output, 0, 16 );
     return( MBEDTLS_ERR_PLATFORM_FAULT_DETECTED );
 }
 
@@ -1460,6 +1463,8 @@
         }
     }
 
+    // Clear the output in case of a FI
+    mbedtls_platform_memset( output, 0, 16 );
     return( MBEDTLS_ERR_PLATFORM_FAULT_DETECTED );
 }