yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-26 22:15:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

ssl_client2: Add helper to unhexify binary command line data

Browse Source
This commit is contained in:
Hanno Becker 2019-04-09 17:12:56 +01:00
parent f8542cf620
commit 1f583eecd8
1 changed files with 45 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
programs/ssl/ssl_client2.c
View File

@ -708,6 +708,45 @@ int idle( mbedtls_net_context *fd,
return( 0 ); return( 0 );
} }
/* Unhexify `hex` into `dst`. `dst` must have
* size at least `strlen( hex ) / 2`. */
int unhexify( unsigned char const *hex, unsigned char *dst )
{
unsigned char c;
size_t j;
size_t len = strlen( hex );
if( len % 2 != 0 )
return( -1 );
for( j = 0; j < len; j += 2 )
{
c = hex[j];
if( c >= '0' && c <= '9' )
c -= '0';
else if( c >= 'a' && c <= 'f' )
c -= 'a' - 10;
else if( c >= 'A' && c <= 'F' )
c -= 'A' - 10;
else
return( -1 );
dst[ j / 2 ] = c << 4;
c = hex[j + 1];
if( c >= '0' && c <= '9' )
c -= '0';
else if( c >= 'a' && c <= 'f' )
c -= 'a' - 10;
else if( c >= 'A' && c <= 'F' )
c -= 'A' - 10;
else
return( -1 );
dst[ j / 2 ] |= c;
}
return( 0 );
}
int main( int argc, char *argv[] ) int main( int argc, char *argv[] )
{ {
int ret = 0, len, tail_len, i, written, frags, retry_left; int ret = 0, len, tail_len, i, written, frags, retry_left;
@ -1257,46 +1296,17 @@ int main( int argc, char *argv[] )
*/ */
if( strlen( opt.psk ) ) if( strlen( opt.psk ) )
{ {
unsigned char c; psk_len = strlen( opt.psk ) / 2;
size_t j; if( psk_len > sizeof( psk ) )
if( strlen( opt.psk ) % 2 != 0 )
{ {
mbedtls_printf( "pre-shared key not valid hex\n" ); mbedtls_printf( "pre-shared key too long\n" );
goto exit; goto exit;
} }
psk_len = strlen( opt.psk ) / 2; if( unhexify( opt.psk, psk ) != 0 )
for( j = 0; j < strlen( opt.psk ); j += 2 )
{ {
c = opt.psk[j]; mbedtls_printf( "pre-shared key not valid hex\n" );
if( c >= '0' && c <= '9' ) goto exit;
c -= '0';
else if( c >= 'a' && c <= 'f' )
c -= 'a' - 10;
else if( c >= 'A' && c <= 'F' )
c -= 'A' - 10;
else
{
mbedtls_printf( "pre-shared key not valid hex\n" );
goto exit;
}
psk[ j / 2 ] = c << 4;
c = opt.psk[j + 1];
if( c >= '0' && c <= '9' )
c -= '0';
else if( c >= 'a' && c <= 'f' )
c -= 'a' - 10;
else if( c >= 'A' && c <= 'F' )
c -= 'A' - 10;
else
{
mbedtls_printf( "pre-shared key not valid hex\n" );
goto exit;
}
psk[ j / 2 ] |= c;
} }
} }
#endif /* MBEDTLS_KEY_EXCHANGE__SOME__PSK_ENABLED */ #endif /* MBEDTLS_KEY_EXCHANGE__SOME__PSK_ENABLED */