commit 69bafce7a32ac2b95fe859fa5c763b3857720c62
author Andrzej Kurek <andrzej.kurek@arm.com> Sat Sep 19 12:45:20 2020 +0200
committer Andrzej Kurek <andrzej.kurek@arm.com> Sat Sep 19 12:45:20 2020 +0200
tree 140dc3cd87597f08c330ad2f3bdac7fd9ff1b034
parent f7df0d37abeb7175f0f30111b16da8520856a4c7

Improve the FI resistance in ssl_tls.c key switching

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

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 89ac9b4..e00dd01 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -63,12 +63,14 @@
                                    const mbedtls_operation_t operation )
 {
     unsigned char * key;
-    int ret;
+    int ret = MBEDTLS_ERR_PLATFORM_FAULT_DETECTED;
+    int flow_ctrl = 0;
 #if defined(MBEDTLS_VALIDATE_SSL_KEYS_INTEGRITY)
     uint32_t hash;
 #endif
     if( operation == MBEDTLS_ENCRYPT )
     {
+        flow_ctrl++;
         key = transform->key_enc;
 #if defined(MBEDTLS_VALIDATE_SSL_KEYS_INTEGRITY)
         hash = transform->key_enc_hash;
@@ -76,6 +78,7 @@
     }
     else if ( operation == MBEDTLS_DECRYPT )
     {
+        flow_ctrl++;
         key = transform->key_dec;
 #if defined(MBEDTLS_VALIDATE_SSL_KEYS_INTEGRITY)
         hash = transform->key_dec_hash;
@@ -91,6 +94,12 @@
     {
         return( MBEDTLS_ERR_PLATFORM_FAULT_DETECTED );
     }
+    else
+    {
+        flow_ctrl++;
+    }
+#else
+    flow_ctrl++;
 #endif
     if( operation != transform->cipher_ctx.operation )
     {
@@ -102,7 +111,11 @@
             return( ret );
         }
     }
-    return( 0 );
+    if( flow_ctrl == 2 )
+    {
+        return( 0 );
+    }
+    return( MBEDTLS_ERR_PLATFORM_FAULT_DETECTED );
 }
 #endif