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

Merge remote-tracking branch 'public/pr/1799' into mbedtls-2.1

Browse Source
This commit is contained in:
Simon Butcher 2018-07-24 13:31:12 +01:00
commit 48776350b2
1 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
programs/pkey/key_app.c
View File

@ -99,7 +99,7 @@ int main( int argc, char *argv[] )
{ {
usage: usage:
mbedtls_printf( USAGE ); mbedtls_printf( USAGE );
goto exit; goto cleanup;
} }
opt.mode = DFL_MODE; opt.mode = DFL_MODE;
@ -149,13 +149,13 @@ int main( int argc, char *argv[] )
if( ( f = fopen( opt.password_file, "rb" ) ) == NULL ) if( ( f = fopen( opt.password_file, "rb" ) ) == NULL )
{ {
mbedtls_printf( " failed\n ! fopen returned NULL\n" ); mbedtls_printf( " failed\n ! fopen returned NULL\n" );
goto exit; goto cleanup;
} }
if( fgets( buf, sizeof(buf), f ) == NULL ) if( fgets( buf, sizeof(buf), f ) == NULL )
{ {
fclose( f ); fclose( f );
mbedtls_printf( "Error: fgets() failed to retrieve password\n" ); mbedtls_printf( "Error: fgets() failed to retrieve password\n" );
goto exit; goto cleanup;
} }
fclose( f ); fclose( f );
@ -176,7 +176,7 @@ int main( int argc, char *argv[] )
if( ret != 0 ) if( ret != 0 )
{ {
mbedtls_printf( " failed\n ! mbedtls_pk_parse_keyfile returned -0x%04x\n", -ret ); mbedtls_printf( " failed\n ! mbedtls_pk_parse_keyfile returned -0x%04x\n", -ret );
goto exit; goto cleanup;
} }
mbedtls_printf( " ok\n" ); mbedtls_printf( " ok\n" );
@ -189,14 +189,15 @@ int main( int argc, char *argv[] )
if( mbedtls_pk_get_type( &pk ) == MBEDTLS_PK_RSA ) if( mbedtls_pk_get_type( &pk ) == MBEDTLS_PK_RSA )
{ {
mbedtls_rsa_context *rsa = mbedtls_pk_rsa( pk ); mbedtls_rsa_context *rsa = mbedtls_pk_rsa( pk );
mbedtls_mpi_write_file( "N: ", &rsa->N, 16, NULL );
mbedtls_mpi_write_file( "E: ", &rsa->E, 16, NULL ); MBEDTLS_MPI_CHK( mbedtls_mpi_write_file( "N: ", &rsa->N, 16, NULL ) );
mbedtls_mpi_write_file( "D: ", &rsa->D, 16, NULL ); MBEDTLS_MPI_CHK( mbedtls_mpi_write_file( "E: ", &rsa->E, 16, NULL ) );
mbedtls_mpi_write_file( "P: ", &rsa->P, 16, NULL ); MBEDTLS_MPI_CHK( mbedtls_mpi_write_file( "D: ", &rsa->D, 16, NULL ) );
mbedtls_mpi_write_file( "Q: ", &rsa->Q, 16, NULL ); MBEDTLS_MPI_CHK( mbedtls_mpi_write_file( "P: ", &rsa->P, 16, NULL ) );
mbedtls_mpi_write_file( "DP: ", &rsa->DP, 16, NULL ); MBEDTLS_MPI_CHK( mbedtls_mpi_write_file( "Q: ", &rsa->Q, 16, NULL ) );
mbedtls_mpi_write_file( "DQ: ", &rsa->DQ, 16, NULL ); MBEDTLS_MPI_CHK( mbedtls_mpi_write_file( "DP: ", &rsa->DP, 16, NULL ) );
mbedtls_mpi_write_file( "QP: ", &rsa->QP, 16, NULL ); MBEDTLS_MPI_CHK( mbedtls_mpi_write_file( "DQ: ", &rsa->DQ, 16, NULL ) );
MBEDTLS_MPI_CHK( mbedtls_mpi_write_file( "QP: ", &rsa->QP, 16, NULL ) );
} }
else else
#endif #endif
@ -204,16 +205,16 @@ int main( int argc, char *argv[] )
if( mbedtls_pk_get_type( &pk ) == MBEDTLS_PK_ECKEY ) if( mbedtls_pk_get_type( &pk ) == MBEDTLS_PK_ECKEY )
{ {
mbedtls_ecp_keypair *ecp = mbedtls_pk_ec( pk ); mbedtls_ecp_keypair *ecp = mbedtls_pk_ec( pk );
mbedtls_mpi_write_file( "Q(X): ", &ecp->Q.X, 16, NULL ); MBEDTLS_MPI_CHK( mbedtls_mpi_write_file( "Q(X): ", &ecp->Q.X, 16, NULL ) );
mbedtls_mpi_write_file( "Q(Y): ", &ecp->Q.Y, 16, NULL ); MBEDTLS_MPI_CHK( mbedtls_mpi_write_file( "Q(Y): ", &ecp->Q.Y, 16, NULL ) );
mbedtls_mpi_write_file( "Q(Z): ", &ecp->Q.Z, 16, NULL ); MBEDTLS_MPI_CHK( mbedtls_mpi_write_file( "Q(Z): ", &ecp->Q.Z, 16, NULL ) );
mbedtls_mpi_write_file( "D : ", &ecp->d , 16, NULL ); MBEDTLS_MPI_CHK( mbedtls_mpi_write_file( "D : ", &ecp->d , 16, NULL ) );
} }
else else
#endif #endif
{ {
mbedtls_printf("Do not know how to print key information for this type\n" ); mbedtls_printf("Do not know how to print key information for this type\n" );
goto exit; goto cleanup;
} }
} }
else if( opt.mode == MODE_PUBLIC ) else if( opt.mode == MODE_PUBLIC )
@ -229,7 +230,7 @@ int main( int argc, char *argv[] )
if( ret != 0 ) if( ret != 0 )
{ {
mbedtls_printf( " failed\n ! mbedtls_pk_parse_public_keyfile returned -0x%04x\n", -ret ); mbedtls_printf( " failed\n ! mbedtls_pk_parse_public_keyfile returned -0x%04x\n", -ret );
goto exit; goto cleanup;
} }
mbedtls_printf( " ok\n" ); mbedtls_printf( " ok\n" );
@ -239,8 +240,8 @@ int main( int argc, char *argv[] )
if( mbedtls_pk_get_type( &pk ) == MBEDTLS_PK_RSA ) if( mbedtls_pk_get_type( &pk ) == MBEDTLS_PK_RSA )
{ {
mbedtls_rsa_context *rsa = mbedtls_pk_rsa( pk ); mbedtls_rsa_context *rsa = mbedtls_pk_rsa( pk );
mbedtls_mpi_write_file( "N: ", &rsa->N, 16, NULL ); MBEDTLS_MPI_CHK( mbedtls_mpi_write_file( "N: ", &rsa->N, 16, NULL ) );
mbedtls_mpi_write_file( "E: ", &rsa->E, 16, NULL ); MBEDTLS_MPI_CHK( mbedtls_mpi_write_file( "E: ", &rsa->E, 16, NULL ) );
} }
else else
#endif #endif
@ -248,25 +249,28 @@ int main( int argc, char *argv[] )
if( mbedtls_pk_get_type( &pk ) == MBEDTLS_PK_ECKEY ) if( mbedtls_pk_get_type( &pk ) == MBEDTLS_PK_ECKEY )
{ {
mbedtls_ecp_keypair *ecp = mbedtls_pk_ec( pk ); mbedtls_ecp_keypair *ecp = mbedtls_pk_ec( pk );
mbedtls_mpi_write_file( "Q(X): ", &ecp->Q.X, 16, NULL ); MBEDTLS_MPI_CHK( mbedtls_mpi_write_file( "Q(X): ", &ecp->Q.X, 16, NULL ) );
mbedtls_mpi_write_file( "Q(Y): ", &ecp->Q.Y, 16, NULL ); MBEDTLS_MPI_CHK( mbedtls_mpi_write_file( "Q(Y): ", &ecp->Q.Y, 16, NULL ) );
mbedtls_mpi_write_file( "Q(Z): ", &ecp->Q.Z, 16, NULL ); MBEDTLS_MPI_CHK( mbedtls_mpi_write_file( "Q(Z): ", &ecp->Q.Z, 16, NULL ) );
} }
else else
#endif #endif
{ {
mbedtls_printf("Do not know how to print key information for this type\n" ); mbedtls_printf("Do not know how to print key information for this type\n" );
goto exit; goto cleanup;
} }
} }
else else
goto usage; goto usage;
exit: cleanup:
#if defined(MBEDTLS_ERROR_C) #if defined(MBEDTLS_ERROR_C)
mbedtls_strerror( ret, buf, sizeof(buf) ); if( ret != 0 )
mbedtls_printf( " ! Last error was: %s\n", buf ); {
mbedtls_strerror( ret, buf, sizeof( buf ) );
mbedtls_printf( " ! Last error was: %s\n", buf );
}
#endif #endif
mbedtls_pk_free( &pk ); mbedtls_pk_free( &pk );