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

Address review comments

Browse source 
Signed-off-by: Przemyslaw Stekiel <przemyslaw.stekiel@mobica.com>
This commit is contained in:
Przemyslaw Stekiel 2021-10-21 12:26:58 +02:00
parent db0ed7c579
commit 8132c2ff46
2 changed files with 37 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
programs/ssl/ssl_server2.c
View file

@ -203,7 +203,7 @@ int main( void )
#endif /* MBEDTLS_X509_CRT_PARSE_C */ #endif /* MBEDTLS_X509_CRT_PARSE_C */
#if defined(MBEDTLS_USE_PSA_CRYPTO) && defined(MBEDTLS_X509_CRT_PARSE_C) #if defined(MBEDTLS_USE_PSA_CRYPTO) && defined(MBEDTLS_X509_CRT_PARSE_C)
#define USAGE_KEY_OPAQUE \ #define USAGE_KEY_OPAQUE \
" key_opaque=%%d Handle your private key as if it were opaque\n" \ " key_opaque=%%d Handle your private keys as if they were opaque\n" \
" default: 0 (disabled)\n" " default: 0 (disabled)\n"
#else #else
#define USAGE_KEY_OPAQUE "" #define USAGE_KEY_OPAQUE ""
@ -1325,8 +1325,9 @@ int main( int argc, char *argv[] )
mbedtls_pk_context pkey; mbedtls_pk_context pkey;
mbedtls_x509_crt srvcert2; mbedtls_x509_crt srvcert2;
mbedtls_pk_context pkey2; mbedtls_pk_context pkey2;
#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_USE_PSA_CRYPTO) #if defined(MBEDTLS_USE_PSA_CRYPTO)
psa_key_id_t key_slot = 0; /* invalid key slot */ psa_key_id_t key_slot = 0; /* invalid key slot */
psa_key_id_t key_slot2 = 0; /* invalid key slot */
#endif #endif
int key_cert_init = 0, key_cert_init2 = 0; int key_cert_init = 0, key_cert_init2 = 0;
#if defined(MBEDTLS_SSL_ASYNC_PRIVATE) #if defined(MBEDTLS_SSL_ASYNC_PRIVATE)
@ -2491,10 +2492,16 @@ int main( int argc, char *argv[] )
(unsigned int) -ret ); (unsigned int) -ret );
goto exit; goto exit;
} }
key_cert_init2 = 2;
#endif /* MBEDTLS_ECDSA_C */
}
#if defined(MBEDTLS_USE_PSA_CRYPTO) #if defined(MBEDTLS_USE_PSA_CRYPTO)
if( opt.key_opaque != 0 ) if( opt.key_opaque != 0 )
{ {
if( ( ret = mbedtls_pk_wrap_as_opaque( &pkey2, &key_slot, if ( mbedtls_pk_get_type( &pkey ) == MBEDTLS_PK_ECKEY )
{
if( ( ret = mbedtls_pk_wrap_as_opaque( &pkey, &key_slot,
PSA_ALG_SHA_256 ) ) != 0 ) PSA_ALG_SHA_256 ) ) != 0 )
{ {
mbedtls_printf( " failed\n ! " mbedtls_printf( " failed\n ! "
@ -2502,12 +2509,21 @@ int main( int argc, char *argv[] )
goto exit; goto exit;
} }
} }
#endif /* MBEDTLS_USE_PSA_CRYPTO */
key_cert_init2 = 2;
#endif /* MBEDTLS_ECDSA_C */
}
mbedtls_printf( " ok (key type: %s)\n", mbedtls_pk_get_name( &pkey2 ) ); if ( mbedtls_pk_get_type( &pkey2 ) == MBEDTLS_PK_ECKEY )
{
if( ( ret = mbedtls_pk_wrap_as_opaque( &pkey2, &key_slot2,
PSA_ALG_SHA_256 ) ) != 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 */
mbedtls_printf( " ok (key types: %s - %s)\n", mbedtls_pk_get_name( &pkey ), mbedtls_pk_get_name( &pkey2 ) );
#endif /* MBEDTLS_X509_CRT_PARSE_C */ #endif /* MBEDTLS_X509_CRT_PARSE_C */
#if defined(MBEDTLS_DHM_C) && defined(MBEDTLS_FS_IO) #if defined(MBEDTLS_DHM_C) && defined(MBEDTLS_FS_IO)
@ -3953,6 +3969,10 @@ exit:
mbedtls_pk_free( &pkey ); mbedtls_pk_free( &pkey );
mbedtls_x509_crt_free( &srvcert2 ); mbedtls_x509_crt_free( &srvcert2 );
mbedtls_pk_free( &pkey2 ); mbedtls_pk_free( &pkey2 );
#if defined(MBEDTLS_USE_PSA_CRYPTO)
psa_destroy_key( key_slot );
psa_destroy_key( key_slot2 );
#endif
#endif #endif
#if defined(MBEDTLS_SSL_ASYNC_PRIVATE) #if defined(MBEDTLS_SSL_ASYNC_PRIVATE)
for( i = 0; (size_t) i < ssl_async_keys.slots_used; i++ ) for( i = 0; (size_t) i < ssl_async_keys.slots_used; i++ )

4
tests/ssl-opt.sh
View file

@ -1455,7 +1455,7 @@ run_test "Opaque key for server authentication" \
key_file=data_files/server5.key" \ key_file=data_files/server5.key" \
0 \ 0 \
-c "Verifying peer X.509 certificate... ok" \ -c "Verifying peer X.509 certificate... ok" \
-s "key type: Opaque" \ -s "key types: RSA - Opaque" \
-S "error" \ -S "error" \
-C "error" -C "error"
@ -1471,7 +1471,7 @@ run_test "Opaque key for client/server authentication" \
0 \ 0 \
-c "key type: Opaque" \ -c "key type: Opaque" \
-c "Verifying peer X.509 certificate... ok" \ -c "Verifying peer X.509 certificate... ok" \
-s "key type: Opaque" \ -s "key types: RSA - Opaque" \
-s "Verifying peer X.509 certificate... ok" \ -s "Verifying peer X.509 certificate... ok" \
-S "error" \ -S "error" \
-C "error" -C "error"