commit 6e152fa36219fe9944a1e77ba567a4e48b5155d3
author Paul Elliott <paul.elliott@arm.com> Mon Mar 01 18:33:09 2021 +0000
committer Paul Elliott <paul.elliott@arm.com> Mon Mar 01 18:33:09 2021 +0000
tree 6c6fa818cffbc7279888b5fd28c9d8c58941c978
parent 717ba77e5262510c86c72e7870980c64883bc1e1

Optimise unneccesary cf table accesses away

Also fix missed bare access of base_64_dec_map

Signed-off-by: Paul Elliott <paul.elliott@arm.com>

library/base64.c

diff --git a/library/base64.c b/library/base64.c
index ed7db83..1c16a88 100644
--- a/library/base64.c
+++ b/library/base64.c
@@ -207,6 +207,7 @@
     size_t i, n;
     uint32_t j, x;
     unsigned char *p;
+    unsigned char dec_map_lookup;
 
     /* First pass: check for validity and get output length */
     for( i = n = j = 0; i < slen; i++ )
@@ -237,11 +238,12 @@
         if( src[i] == '=' && ++j > 2 )
             return( MBEDTLS_ERR_BASE64_INVALID_CHARACTER );
 
-        if( src[i] > 127 ||
-            mbedtls_base64_table_lookup( base64_dec_map, sizeof( base64_dec_map ), src[i] ) == 127 )
+        dec_map_lookup = mbedtls_base64_table_lookup( base64_dec_map, sizeof( base64_dec_map ), src[i] );
+
+        if( src[i] > 127 || dec_map_lookup == 127 )
             return( MBEDTLS_ERR_BASE64_INVALID_CHARACTER );
 
-        if( base64_dec_map[src[i]] < 64 && j != 0 )
+        if( dec_map_lookup < 64 && j != 0 )
             return( MBEDTLS_ERR_BASE64_INVALID_CHARACTER );
 
         n++;
@@ -271,9 +273,10 @@
         if( *src == '\r' || *src == '\n' || *src == ' ' )
             continue;
 
-        j -= ( mbedtls_base64_table_lookup(base64_dec_map, sizeof( base64_dec_map ), *src ) == 64 );
-        x  = ( x << 6 ) |
-            ( mbedtls_base64_table_lookup( base64_dec_map, sizeof( base64_dec_map ), *src ) & 0x3F );
+        dec_map_lookup = mbedtls_base64_table_lookup(base64_dec_map, sizeof( base64_dec_map ), *src );
+
+        j -= ( dec_map_lookup == 64 );
+        x  = ( x << 6 ) | ( dec_map_lookup & 0x3F );
 
         if( ++n == 4 )
         {