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

Improve output on bad cmd line args in programs/x509/cert_write

Browse Source
This commit is contained in:
Hanno Becker 2017-10-03 14:56:04 +01:00
parent bc7cbbacd8
commit cdba5cdcb9
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
programs/x509/cert_write.c
View File

@ -323,6 +323,7 @@ int main( int argc, char *argv[] )
if( opt.authority_identifier != 0 && if( opt.authority_identifier != 0 &&
opt.authority_identifier != 1 ) opt.authority_identifier != 1 )
{ {
mbedtls_printf( "Invalid argument for option %s\n", p );
goto usage; goto usage;
} }
} }
@ -332,6 +333,7 @@ int main( int argc, char *argv[] )
if( opt.subject_identifier != 0 && if( opt.subject_identifier != 0 &&
opt.subject_identifier != 1 ) opt.subject_identifier != 1 )
{ {
mbedtls_printf( "Invalid argument for option %s\n", p );
goto usage; goto usage;
} }
} }
@ -341,6 +343,7 @@ int main( int argc, char *argv[] )
if( opt.basic_constraints != 0 && if( opt.basic_constraints != 0 &&
opt.basic_constraints != 1 ) opt.basic_constraints != 1 )
{ {
mbedtls_printf( "Invalid argument for option %s\n", p );
goto usage; goto usage;
} }
} }
@ -355,33 +358,48 @@ int main( int argc, char *argv[] )
else if( strcmp( q, "MD5" ) == 0 ) else if( strcmp( q, "MD5" ) == 0 )
opt.md = MBEDTLS_MD_MD5; opt.md = MBEDTLS_MD_MD5;
else else
{
mbedtls_printf( "Invalid argument for option %s\n", p );
goto usage; goto usage;
} }
}
else if( strcmp( p, "version" ) == 0 ) else if( strcmp( p, "version" ) == 0 )
{ {
opt.version = atoi( q ); opt.version = atoi( q );
if( opt.version < 1 || opt.version > 3 ) if( opt.version < 1 || opt.version > 3 )
{
mbedtls_printf( "Invalid argument for option %s\n", p );
goto usage; goto usage;
}
opt.version--; opt.version--;
} }
else if( strcmp( p, "selfsign" ) == 0 ) else if( strcmp( p, "selfsign" ) == 0 )
{ {
opt.selfsign = atoi( q ); opt.selfsign = atoi( q );
if( opt.selfsign < 0 || opt.selfsign > 1 ) if( opt.selfsign < 0 || opt.selfsign > 1 )
{
mbedtls_printf( "Invalid argument for option %s\n", p );
goto usage; goto usage;
} }
}
else if( strcmp( p, "is_ca" ) == 0 ) else if( strcmp( p, "is_ca" ) == 0 )
{ {
opt.is_ca = atoi( q ); opt.is_ca = atoi( q );
if( opt.is_ca < 0 || opt.is_ca > 1 ) if( opt.is_ca < 0 || opt.is_ca > 1 )
{
mbedtls_printf( "Invalid argument for option %s\n", p );
goto usage; goto usage;
} }
}
else if( strcmp( p, "max_pathlen" ) == 0 ) else if( strcmp( p, "max_pathlen" ) == 0 )
{ {
opt.max_pathlen = atoi( q ); opt.max_pathlen = atoi( q );
if( opt.max_pathlen < -1 || opt.max_pathlen > 127 ) if( opt.max_pathlen < -1 || opt.max_pathlen > 127 )
{
mbedtls_printf( "Invalid argument for option %s\n", p );
goto usage; goto usage;
} }
}
else if( strcmp( p, "key_usage" ) == 0 ) else if( strcmp( p, "key_usage" ) == 0 )
{ {
while( q != NULL ) while( q != NULL )
@ -404,7 +422,10 @@ int main( int argc, char *argv[] )
else if( strcmp( q, "crl_sign" ) == 0 ) else if( strcmp( q, "crl_sign" ) == 0 )
opt.key_usage |= MBEDTLS_X509_KU_CRL_SIGN; opt.key_usage |= MBEDTLS_X509_KU_CRL_SIGN;
else else
{
mbedtls_printf( "Invalid argument for option %s\n", p );
goto usage; goto usage;
}
q = r; q = r;
} }
@ -431,7 +452,10 @@ int main( int argc, char *argv[] )
else if( strcmp( q, "object_signing_ca" ) == 0 ) else if( strcmp( q, "object_signing_ca" ) == 0 )
opt.ns_cert_type |= MBEDTLS_X509_NS_CERT_TYPE_OBJECT_SIGNING_CA; opt.ns_cert_type |= MBEDTLS_X509_NS_CERT_TYPE_OBJECT_SIGNING_CA;
else else
{
mbedtls_printf( "Invalid argument for option %s\n", p );
goto usage; goto usage;
}
q = r; q = r;
} }