yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename functions to have suitable name

Browse source 
Signed-off-by: Gabor Mezei <gabor.mezei@arm.com>
This commit is contained in:
Gabor Mezei 2021-11-15 16:03:24 +01:00
parent 74217ee03c
commit b8d78926eb
No known key found for this signature in database
GPG key ID: 106F5A41ECC305BD
3 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
library/base64.c
View file

@ -43,7 +43,7 @@
* Constant flow with respect to c. * Constant flow with respect to c.
*/ */
MBEDTLS_STATIC_TESTABLE MBEDTLS_STATIC_TESTABLE
unsigned char mbedtls_base64_mask_of_range( unsigned char low, unsigned char mbedtls_ct_uchar_mask_of_range( unsigned char low,
unsigned char high, unsigned char high,
unsigned char c ) unsigned char c )
{ {
@ -59,17 +59,17 @@ unsigned char mbedtls_base64_mask_of_range( unsigned char low,
* but not EBCDIC). * but not EBCDIC).
*/ */
MBEDTLS_STATIC_TESTABLE MBEDTLS_STATIC_TESTABLE
unsigned char mbedtls_base64_enc_char( unsigned char val ) unsigned char mbedtls_ct_base64_enc_char( unsigned char val )
{ {
unsigned char digit = 0; unsigned char digit = 0;
/* For each range of values, if val is in that range, mask digit with /* For each range of values, if val is in that range, mask digit with
* the corresponding value. Since val can only be in a single range, * the corresponding value. Since val can only be in a single range,
* only at most one masking will change digit. */ * only at most one masking will change digit. */
digit |= mbedtls_base64_mask_of_range( 0, 25, val ) & ( 'A' + val ); digit |= mbedtls_ct_uchar_mask_of_range( 0, 25, val ) & ( 'A' + val );
digit |= mbedtls_base64_mask_of_range( 26, 51, val ) & ( 'a' + val - 26 ); digit |= mbedtls_ct_uchar_mask_of_range( 26, 51, val ) & ( 'a' + val - 26 );
digit |= mbedtls_base64_mask_of_range( 52, 61, val ) & ( '0' + val - 52 ); digit |= mbedtls_ct_uchar_mask_of_range( 52, 61, val ) & ( '0' + val - 52 );
digit |= mbedtls_base64_mask_of_range( 62, 62, val ) & '+'; digit |= mbedtls_ct_uchar_mask_of_range( 62, 62, val ) & '+';
digit |= mbedtls_base64_mask_of_range( 63, 63, val ) & '/'; digit |= mbedtls_ct_uchar_mask_of_range( 63, 63, val ) & '/';
return( digit ); return( digit );
} }
@ -113,12 +113,12 @@ int mbedtls_base64_encode( unsigned char *dst, size_t dlen, size_t *olen,
C2 = *src++; C2 = *src++;
C3 = *src++; C3 = *src++;
*p++ = mbedtls_base64_enc_char( ( C1 >> 2 ) & 0x3F ); *p++ = mbedtls_ct_base64_enc_char( ( C1 >> 2 ) & 0x3F );
*p++ = mbedtls_base64_enc_char( ( ( ( C1 & 3 ) << 4 ) + ( C2 >> 4 ) ) *p++ = mbedtls_ct_base64_enc_char( ( ( ( C1 & 3 ) << 4 ) + ( C2 >> 4 ) )
& 0x3F ); & 0x3F );
*p++ = mbedtls_base64_enc_char( ( ( ( C2 & 15 ) << 2 ) + ( C3 >> 6 ) ) *p++ = mbedtls_ct_base64_enc_char( ( ( ( C2 & 15 ) << 2 ) + ( C3 >> 6 ) )
& 0x3F ); & 0x3F );
*p++ = mbedtls_base64_enc_char( C3 & 0x3F ); *p++ = mbedtls_ct_base64_enc_char( C3 & 0x3F );
} }
if( i < slen ) if( i < slen )
@ -126,12 +126,12 @@ int mbedtls_base64_encode( unsigned char *dst, size_t dlen, size_t *olen,
C1 = *src++; C1 = *src++;
C2 = ( ( i + 1 ) < slen ) ? *src++ : 0; C2 = ( ( i + 1 ) < slen ) ? *src++ : 0;
*p++ = mbedtls_base64_enc_char( ( C1 >> 2 ) & 0x3F ); *p++ = mbedtls_ct_base64_enc_char( ( C1 >> 2 ) & 0x3F );
*p++ = mbedtls_base64_enc_char( ( ( ( C1 & 3 ) << 4 ) + ( C2 >> 4 ) ) *p++ = mbedtls_ct_base64_enc_char( ( ( ( C1 & 3 ) << 4 ) + ( C2 >> 4 ) )
& 0x3F ); & 0x3F );
if( ( i + 1 ) < slen ) if( ( i + 1 ) < slen )
*p++ = mbedtls_base64_enc_char( ( ( C2 & 15 ) << 2 ) & 0x3F ); *p++ = mbedtls_ct_base64_enc_char( ( ( C2 & 15 ) << 2 ) & 0x3F );
else *p++ = '='; else *p++ = '=';
*p++ = '='; *p++ = '=';
@ -155,18 +155,18 @@ int mbedtls_base64_encode( unsigned char *dst, size_t dlen, size_t *olen,
* access. * access.
*/ */
MBEDTLS_STATIC_TESTABLE MBEDTLS_STATIC_TESTABLE
signed char mbedtls_base64_dec_value( unsigned char c ) signed char mbedtls_ct_base64_dec_value( unsigned char c )
{ {
unsigned char val = 0; unsigned char val = 0;
/* For each range of digits, if c is in that range, mask val with /* For each range of digits, if c is in that range, mask val with
* the corresponding value. Since c can only be in a single range, * the corresponding value. Since c can only be in a single range,
* only at most one masking will change val. Set val to one plus * only at most one masking will change val. Set val to one plus
* the desired value so that it stays 0 if c is in none of the ranges. */ * the desired value so that it stays 0 if c is in none of the ranges. */
val |= mbedtls_base64_mask_of_range( 'A', 'Z', c ) & ( c - 'A' + 0 + 1 ); val |= mbedtls_ct_uchar_mask_of_range( 'A', 'Z', c ) & ( c - 'A' + 0 + 1 );
val |= mbedtls_base64_mask_of_range( 'a', 'z', c ) & ( c - 'a' + 26 + 1 ); val |= mbedtls_ct_uchar_mask_of_range( 'a', 'z', c ) & ( c - 'a' + 26 + 1 );
val |= mbedtls_base64_mask_of_range( '0', '9', c ) & ( c - '0' + 52 + 1 ); val |= mbedtls_ct_uchar_mask_of_range( '0', '9', c ) & ( c - '0' + 52 + 1 );
val |= mbedtls_base64_mask_of_range( '+', '+', c ) & ( c - '+' + 62 + 1 ); val |= mbedtls_ct_uchar_mask_of_range( '+', '+', c ) & ( c - '+' + 62 + 1 );
val |= mbedtls_base64_mask_of_range( '/', '/', c ) & ( c - '/' + 63 + 1 ); val |= mbedtls_ct_uchar_mask_of_range( '/', '/', c ) & ( c - '/' + 63 + 1 );
/* At this point, val is 0 if c is an invalid digit and v+1 if c is /* At this point, val is 0 if c is an invalid digit and v+1 if c is
* a digit with the value v. */ * a digit with the value v. */
return( val - 1 ); return( val - 1 );
@ -224,7 +224,7 @@ int mbedtls_base64_decode( unsigned char *dst, size_t dlen, size_t *olen,
{ {
if( equals != 0 ) if( equals != 0 )
return( MBEDTLS_ERR_BASE64_INVALID_CHARACTER ); return( MBEDTLS_ERR_BASE64_INVALID_CHARACTER );
if( mbedtls_base64_dec_value( src[i] ) < 0 ) if( mbedtls_ct_base64_dec_value( src[i] ) < 0 )
return( MBEDTLS_ERR_BASE64_INVALID_CHARACTER ); return( MBEDTLS_ERR_BASE64_INVALID_CHARACTER );
} }
n++; n++;
@ -259,7 +259,7 @@ int mbedtls_base64_decode( unsigned char *dst, size_t dlen, size_t *olen,
if( *src == '=' ) if( *src == '=' )
++equals; ++equals;
else else
x |= mbedtls_base64_dec_value( *src ); x |= mbedtls_ct_base64_dec_value( *src );
if( ++accumulated_digits == 4 ) if( ++accumulated_digits == 4 )
{ {

6
library/base64_invasive.h
View file

@ -33,7 +33,7 @@
* *
* Constant flow with respect to c. * Constant flow with respect to c.
*/ */
unsigned char mbedtls_base64_mask_of_range( unsigned char low, unsigned char mbedtls_ct_uchar_mask_of_range( unsigned char low,
unsigned char high, unsigned char high,
unsigned char c ); unsigned char c );
@ -41,7 +41,7 @@ unsigned char mbedtls_base64_mask_of_range( unsigned char low,
* *
* Operates in constant time (no branches or memory access depending on val). * Operates in constant time (no branches or memory access depending on val).
*/ */
unsigned char mbedtls_base64_enc_char( unsigned char val ); unsigned char mbedtls_ct_base64_enc_char( unsigned char val );
/* Given a Base64 digit, return its value. /* Given a Base64 digit, return its value.
* If c is not a Base64 digit ('A'..'Z', 'a'..'z', '0'..'9', '+' or '/'), * If c is not a Base64 digit ('A'..'Z', 'a'..'z', '0'..'9', '+' or '/'),
@ -49,7 +49,7 @@ unsigned char mbedtls_base64_enc_char( unsigned char val );
* *
* Operates in constant time (no branches or memory access depending on c). * Operates in constant time (no branches or memory access depending on c).
*/ */
signed char mbedtls_base64_dec_value( unsigned char c ); signed char mbedtls_ct_base64_dec_value( unsigned char c );
#endif /* MBEDTLS_TEST_HOOKS */ #endif /* MBEDTLS_TEST_HOOKS */
#endif /* MBEDTLS_BASE64_INVASIVE_H */ #endif /* MBEDTLS_BASE64_INVASIVE_H */

6
tests/suites/test_suite_base64.function
View file

@ -24,7 +24,7 @@ void mask_of_range( int low_arg, int high_arg )
{ {
mbedtls_test_set_step( c ); mbedtls_test_set_step( c );
TEST_CF_SECRET( &c, sizeof( c ) ); TEST_CF_SECRET( &c, sizeof( c ) );
unsigned char m = mbedtls_base64_mask_of_range( low, high, c ); unsigned char m = mbedtls_ct_uchar_mask_of_range( low, high, c );
TEST_CF_PUBLIC( &c, sizeof( c ) ); TEST_CF_PUBLIC( &c, sizeof( c ) );
TEST_CF_PUBLIC( &m, sizeof( m ) ); TEST_CF_PUBLIC( &m, sizeof( m ) );
if( low <= c && c <= high ) if( low <= c && c <= high )
@ -42,7 +42,7 @@ void enc_chars( )
{ {
mbedtls_test_set_step( value ); mbedtls_test_set_step( value );
TEST_CF_SECRET( &value, sizeof( value ) ); TEST_CF_SECRET( &value, sizeof( value ) );
unsigned char digit = mbedtls_base64_enc_char( value ); unsigned char digit = mbedtls_ct_base64_enc_char( value );
TEST_CF_PUBLIC( &value, sizeof( value ) ); TEST_CF_PUBLIC( &value, sizeof( value ) );
TEST_CF_PUBLIC( &digit, sizeof( digit ) ); TEST_CF_PUBLIC( &digit, sizeof( digit ) );
TEST_EQUAL( digit, base64_digits[value] ); TEST_EQUAL( digit, base64_digits[value] );
@ -66,7 +66,7 @@ void dec_chars( )
else else
expected = p - base64_digits; expected = p - base64_digits;
TEST_CF_SECRET( &c, sizeof( c ) ); TEST_CF_SECRET( &c, sizeof( c ) );
signed char actual = mbedtls_base64_dec_value( c ); signed char actual = mbedtls_ct_base64_dec_value( c );
TEST_CF_PUBLIC( &c, sizeof( c ) ); TEST_CF_PUBLIC( &c, sizeof( c ) );
TEST_CF_PUBLIC( &actual, sizeof( actual ) ); TEST_CF_PUBLIC( &actual, sizeof( actual ) );
TEST_EQUAL( actual, expected ); TEST_EQUAL( actual, expected );