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

ssl_client2/ss_server2: optimize code for opaque key

Browse source 
Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
This commit is contained in:
Przemek Stekiel 2022-05-04 15:11:24 +02:00
parent 76a41f5a52
commit 092128324f
2 changed files with 39 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
programs/ssl/ssl_client2.c
View file

@ -1720,6 +1720,20 @@ int main( int argc, char *argv[] )
psa_algorithm_t psa_alg, psa_alg2;
psa_key_usage_t usage = PSA_KEY_USAGE_SIGN_HASH;
if( strcmp( opt.key_opaque_alg1, DFL_KEY_OPAQUE_ALG ) == 0 )
{
if( mbedtls_pk_get_type( &pkey ) == MBEDTLS_PK_ECKEY )
{
opt.key_opaque_alg1 = "ecdsa-sign";
opt.key_opaque_alg2 = "ecdh";
}
else
{
opt.key_opaque_alg1 = "rsa-sign-pkcs1";
opt.key_opaque_alg2 = "none";
}
}
if ( strcmp( opt.key_opaque_alg1, DFL_KEY_OPAQUE_ALG ) != 0 )
{
ret = key_opaque_set_alg_usage( opt.key_opaque_alg1,
@ -1732,19 +1746,6 @@ int main( int argc, char *argv[] )
goto exit;
}
}
else
{
if( mbedtls_pk_get_type( &pkey ) == MBEDTLS_PK_ECKEY )
{
psa_alg = PSA_ALG_ECDSA( PSA_ALG_ANY_HASH );
psa_alg2 = PSA_ALG_NONE;
}
else
{
psa_alg = PSA_ALG_RSA_PKCS1V15_SIGN( PSA_ALG_ANY_HASH );
psa_alg2 = PSA_ALG_RSA_PSS( PSA_ALG_ANY_HASH );
}
}
if( ( ret = mbedtls_pk_wrap_as_opaque( &pkey, &key_slot, psa_alg,
usage, psa_alg2 ) ) != 0 )

80
programs/ssl/ssl_server2.c
View file

@ -2596,6 +2596,20 @@ int main( int argc, char *argv[] )
psa_algorithm_t psa_alg, psa_alg2;
psa_key_usage_t psa_usage;
if( strcmp( opt.key1_opaque_alg1, DFL_KEY_OPAQUE_ALG ) == 0 )
{
if( mbedtls_pk_get_type( &pkey ) == MBEDTLS_PK_ECKEY )
{
opt.key1_opaque_alg1 = "ecdsa-sign";
opt.key1_opaque_alg2 = "ecdh";
}
else if( mbedtls_pk_get_type( &pkey ) == MBEDTLS_PK_RSA )
{
opt.key1_opaque_alg1 = "rsa-sign-pkcs1";
opt.key1_opaque_alg2 = "none";
}
}
if ( strcmp( opt.key1_opaque_alg1, DFL_KEY_OPAQUE_ALG ) != 0 )
{
ret = key_opaque_set_alg_usage( opt.key1_opaque_alg1,
@ -2618,33 +2632,18 @@ int main( int argc, char *argv[] )
goto exit;
}
}
else
{
if ( mbedtls_pk_get_type( &pkey ) == MBEDTLS_PK_ECKEY ||
mbedtls_pk_get_type( &pkey ) == MBEDTLS_PK_RSA )
{
if( mbedtls_pk_get_type( &pkey ) == MBEDTLS_PK_ECKEY )
{
psa_alg = PSA_ALG_ECDSA( PSA_ALG_ANY_HASH );
psa_alg2 = PSA_ALG_ECDH;
psa_usage = PSA_KEY_USAGE_SIGN_HASH | PSA_KEY_USAGE_DERIVE;
}
else
{
psa_alg = PSA_ALG_RSA_PKCS1V15_SIGN( PSA_ALG_ANY_HASH );
psa_alg2 = PSA_ALG_NONE;
psa_usage = PSA_KEY_USAGE_SIGN_HASH;
}
if( ( ret = mbedtls_pk_wrap_as_opaque( &pkey, &key_slot,
psa_alg,
psa_usage,
psa_alg2 ) ) != 0 )
{
mbedtls_printf( " failed\n ! "
"mbedtls_pk_wrap_as_opaque returned -0x%x\n\n", (unsigned int) -ret );
goto exit;
}
if( strcmp( opt.key2_opaque_alg1, DFL_KEY_OPAQUE_ALG ) == 0 )
{
if( mbedtls_pk_get_type( &pkey ) == MBEDTLS_PK_ECKEY )
{
opt.key2_opaque_alg1 = "ecdsa-sign";
opt.key2_opaque_alg2 = "ecdh";
}
else if( mbedtls_pk_get_type( &pkey ) == MBEDTLS_PK_RSA )
{
opt.key2_opaque_alg1 = "rsa-sign-pkcs1";
opt.key2_opaque_alg2 = "none";
}
}
@ -2670,35 +2669,6 @@ int main( int argc, char *argv[] )
goto exit;
}
}
else
{
if ( mbedtls_pk_get_type( &pkey2 ) == MBEDTLS_PK_ECKEY ||
mbedtls_pk_get_type( &pkey2 ) == MBEDTLS_PK_RSA )
{
if( mbedtls_pk_get_type( &pkey2 ) == MBEDTLS_PK_ECKEY )
{
psa_alg = PSA_ALG_ECDSA( PSA_ALG_ANY_HASH );
psa_alg2 = PSA_ALG_ECDH;
psa_usage = PSA_KEY_USAGE_SIGN_HASH | PSA_KEY_USAGE_DERIVE;
}
else
{
psa_alg = PSA_ALG_RSA_PKCS1V15_SIGN( PSA_ALG_ANY_HASH );
psa_alg2 = PSA_ALG_NONE;
psa_usage = PSA_KEY_USAGE_SIGN_HASH;
}
if( ( ret = mbedtls_pk_wrap_as_opaque( &pkey2, &key_slot2,
psa_alg,
psa_usage,
psa_alg2 ) ) != 0 )
{
mbedtls_printf( " failed\n ! "
"mbedtls_pk_wrap_as_opaque returned -0x%x\n\n", (unsigned int) -ret );
goto exit;
}
}
}
}
#endif /* MBEDTLS_USE_PSA_CRYPTO */