1
0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-29 11:41:15 +03:00

Merge remote-tracking branch 'origin/pr/2105' into development

Additional work done as part of merge:
    - Run ./tests/scripts/check-generated-files.sh and check in the
      resulting changes to programs/ssl/query_config.c
This commit is contained in:
Jaeden Amero
2019-02-22 10:03:27 +00:00
20 changed files with 3109 additions and 15 deletions

View File

@ -446,6 +446,10 @@ int main( void )
" in order from ssl3 to tls1_2\n" \
" default: all enabled\n" \
" force_ciphersuite=<name> default: all enabled\n" \
" query_config=<name> return 0 if the specified\n" \
" configuration macro is defined and 1\n" \
" otherwise. The expansion of the macro\n" \
" is printed if it is defined\n" \
" acceptable ciphersuite names:\n"
@ -543,6 +547,8 @@ struct options
int badmac_limit; /* Limit of records with bad MAC */
} opt;
int query_config( const char *config );
static void my_debug( void *ctx, int level,
const char *file, int line,
const char *str )
@ -1871,6 +1877,10 @@ int main( int argc, char *argv[] )
{
opt.sni = q;
}
else if( strcmp( p, "query_config" ) == 0 )
{
return query_config( q );
}
else
goto usage;
}