commit 11750441563cf05c700f935947457c7d7bbfd32a
author Andrzej Kurek <andrzej.kurek@arm.com> Thu Sep 17 07:12:06 2020 -0400
committer Andrzej Kurek <andrzej.kurek@arm.com> Thu Sep 17 23:51:58 2020 +0200
tree 961844d3cb7af7047a06df1ea9ef49d5467fab42
parent 6f3a987ae3bc4ac10800db02937dcf9dd37e032f

Merge enc/dec cipher contexts in ssl transforms

Store the raw encryption and decryption keys in transforms
to set them before each cipher operation. Add a config option
for this - MBEDTLS_SSL_TRANSFORM_OPTIMIZE_CIPHERS.
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>

tests/suites/test_suite_ssl.function

diff --git a/tests/suites/test_suite_ssl.function b/tests/suites/test_suite_ssl.function
index 9873dd8..a689d45 100644
--- a/tests/suites/test_suite_ssl.function
+++ b/tests/suites/test_suite_ssl.function
@@ -68,15 +68,41 @@
     memset( key0, 0x1, keylen );
     memset( key1, 0x2, keylen );
 
+#if defined(MBEDTLS_SSL_TRANSFORM_OPTIMIZE_CIPHERS)
+    t_in->key_enc = mbedtls_calloc( 1, keylen );
+    t_in->key_dec = mbedtls_calloc( 1, keylen );
+
+    t_out->key_enc = mbedtls_calloc( 1, keylen );
+    t_out->key_dec = mbedtls_calloc( 1, keylen );
+
+    memcpy( t_in->key_enc, key0, keylen);
+    memcpy( t_in->key_dec, key1, keylen);
+    t_in->key_bitlen = cipher_info->key_bitlen;
+
+    memcpy( t_out->key_enc, key1, keylen);
+    memcpy( t_out->key_dec, key0, keylen);
+    t_out->key_bitlen = cipher_info->key_bitlen;
+
+    /* Setup cipher contexts */
+    CHK( mbedtls_cipher_setup( &t_in->cipher_ctx,  cipher_info ) == 0 );
+    CHK( mbedtls_cipher_setup( &t_out->cipher_ctx, cipher_info ) == 0 );
+#else
     /* Setup cipher contexts */
     CHK( mbedtls_cipher_setup( &t_in->cipher_ctx_enc,  cipher_info ) == 0 );
     CHK( mbedtls_cipher_setup( &t_in->cipher_ctx_dec,  cipher_info ) == 0 );
     CHK( mbedtls_cipher_setup( &t_out->cipher_ctx_enc, cipher_info ) == 0 );
     CHK( mbedtls_cipher_setup( &t_out->cipher_ctx_dec, cipher_info ) == 0 );
+#endif
 
 #if defined(MBEDTLS_CIPHER_MODE_CBC)
     if( cipher_info->mode == MBEDTLS_MODE_CBC )
     {
+#if defined(MBEDTLS_SSL_TRANSFORM_OPTIMIZE_CIPHERS)
+        CHK( mbedtls_cipher_set_padding_mode( &t_in->cipher_ctx,
+                                              MBEDTLS_PADDING_NONE ) == 0 );
+        CHK( mbedtls_cipher_set_padding_mode( &t_out->cipher_ctx,
+                                              MBEDTLS_PADDING_NONE ) == 0 );
+#else
         CHK( mbedtls_cipher_set_padding_mode( &t_in->cipher_ctx_enc,
                                               MBEDTLS_PADDING_NONE ) == 0 );
         CHK( mbedtls_cipher_set_padding_mode( &t_in->cipher_ctx_dec,
@@ -85,9 +111,11 @@
                                               MBEDTLS_PADDING_NONE ) == 0 );
         CHK( mbedtls_cipher_set_padding_mode( &t_out->cipher_ctx_dec,
                                               MBEDTLS_PADDING_NONE ) == 0 );
+#endif
     }
 #endif /* MBEDTLS_CIPHER_MODE_CBC */
 
+#if !defined(MBEDTLS_SSL_TRANSFORM_OPTIMIZE_CIPHERS)
     CHK( mbedtls_cipher_setkey( &t_in->cipher_ctx_enc, key0,
                                 keylen << 3, MBEDTLS_ENCRYPT ) == 0 );
     CHK( mbedtls_cipher_setkey( &t_in->cipher_ctx_dec, key1,
@@ -96,7 +124,7 @@
                                 keylen << 3, MBEDTLS_ENCRYPT ) == 0 );
     CHK( mbedtls_cipher_setkey( &t_out->cipher_ctx_dec, key0,
                                 keylen << 3, MBEDTLS_DECRYPT ) == 0 );
-
+#endif
     /* Setup MAC contexts */
 #if defined(MBEDTLS_SSL_SOME_MODES_USE_MAC)
     if( cipher_info->mode == MBEDTLS_MODE_CBC ||