yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-03-24 22:15:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adapt cert_write example program to work with new CRT structure

Browse source
This commit is contained in:
Hanno Becker 2019-02-26 18:47:11 +00:00
parent 2bcc7640f8
commit d8eab343d2
1 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
programs/x509/cert_write.c
View file

@ -524,6 +524,8 @@ int main( int argc, char *argv[] )
// //
if( !opt.selfsign && strlen( opt.issuer_crt ) ) if( !opt.selfsign && strlen( opt.issuer_crt ) )
{ {
mbedtls_x509_name *subject;
/* /*
* 1.0.a. Load the certificates * 1.0.a. Load the certificates
*/ */
@ -538,8 +540,17 @@ int main( int argc, char *argv[] )
goto exit; goto exit;
} }
ret = mbedtls_x509_crt_get_subject( &issuer_crt, &subject );
if( ret != 0 )
{
mbedtls_strerror( ret, buf, 1024 );
mbedtls_printf( " failed\n ! mbedtls_x509_crt_get_subject "
"returned -0x%04x - %s\n\n", -ret, buf );
goto exit;
}
ret = mbedtls_x509_dn_gets( issuer_name, sizeof(issuer_name), ret = mbedtls_x509_dn_gets( issuer_name, sizeof(issuer_name),
&issuer_crt.subject ); subject );
if( ret < 0 ) if( ret < 0 )
{ {
mbedtls_strerror( ret, buf, 1024 ); mbedtls_strerror( ret, buf, 1024 );
@ -550,6 +561,8 @@ int main( int argc, char *argv[] )
opt.issuer_name = issuer_name; opt.issuer_name = issuer_name;
mbedtls_x509_name_free( subject );
mbedtls_printf( " ok\n" ); mbedtls_printf( " ok\n" );
} }
@ -627,12 +640,24 @@ int main( int argc, char *argv[] )
// //
if( strlen( opt.issuer_crt ) ) if( strlen( opt.issuer_crt ) )
{ {
if( mbedtls_pk_check_pair( &issuer_crt.pk, issuer_key ) != 0 ) mbedtls_pk_context pk;
ret = mbedtls_x509_crt_get_pk( &issuer_crt, &pk );
if( ret != 0 )
{
mbedtls_strerror( ret, buf, 1024 );
mbedtls_printf( " failed\n ! mbedtls_x509_crt_get_pk "
"returned -0x%04x - %s\n\n", -ret, buf );
goto exit;
}
if( mbedtls_pk_check_pair( &pk, issuer_key ) != 0 )
{ {
mbedtls_printf( " failed\n ! issuer_key does not match " mbedtls_printf( " failed\n ! issuer_key does not match "
"issuer certificate\n\n" ); "issuer certificate\n\n" );
goto exit; goto exit;
} }
mbedtls_pk_free( &pk );
} }
mbedtls_printf( " ok\n" ); mbedtls_printf( " ok\n" );