mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-12-23 13:55:29 +00:00
Merge remote-tracking branch 'origin/pr/2499' into mbedtls-2.7
* origin/pr/2499: Fix default port number information
This commit is contained in:
commit
4ff2eb379c
|
@ -28,6 +28,8 @@ Bugfix
|
||||||
* Fix bugs in the AEAD test suite which would be exposed by ciphers which
|
* Fix bugs in the AEAD test suite which would be exposed by ciphers which
|
||||||
either used both encrypt and decrypt key schedules, or which perform padding.
|
either used both encrypt and decrypt key schedules, or which perform padding.
|
||||||
GCM and CCM were not affected. Fixed by Jack Lloyd.
|
GCM and CCM were not affected. Fixed by Jack Lloyd.
|
||||||
|
* Fix incorrect default port number in ssl_mail_client example's usage.
|
||||||
|
Found and fixed by irwir. #2337
|
||||||
|
|
||||||
Changes
|
Changes
|
||||||
* Return from various debugging routines immediately if the
|
* Return from various debugging routines immediately if the
|
||||||
|
|
|
@ -104,9 +104,9 @@ int main( void )
|
||||||
|
|
||||||
#if defined(MBEDTLS_BASE64_C)
|
#if defined(MBEDTLS_BASE64_C)
|
||||||
#define USAGE_AUTH \
|
#define USAGE_AUTH \
|
||||||
" authentication=%%d default: 0 (disabled)\n" \
|
" authentication=%%d default: 0 (disabled)\n" \
|
||||||
" user_name=%%s default: \"user\"\n" \
|
" user_name=%%s default: \"" DFL_USER_NAME "\"\n" \
|
||||||
" user_pwd=%%s default: \"password\"\n"
|
" user_pwd=%%s default: \"" DFL_USER_PWD "\"\n"
|
||||||
#else
|
#else
|
||||||
#define USAGE_AUTH \
|
#define USAGE_AUTH \
|
||||||
" authentication options disabled. (Require MBEDTLS_BASE64_C)\n"
|
" authentication options disabled. (Require MBEDTLS_BASE64_C)\n"
|
||||||
|
@ -123,17 +123,17 @@ int main( void )
|
||||||
#endif /* MBEDTLS_FS_IO */
|
#endif /* MBEDTLS_FS_IO */
|
||||||
|
|
||||||
#define USAGE \
|
#define USAGE \
|
||||||
"\n usage: ssl_mail_client param=<>...\n" \
|
"\n usage: ssl_mail_client param=<>...\n" \
|
||||||
"\n acceptable parameters:\n" \
|
"\n acceptable parameters:\n" \
|
||||||
" server_name=%%s default: localhost\n" \
|
" server_name=%%s default: " DFL_SERVER_NAME "\n" \
|
||||||
" server_port=%%d default: 4433\n" \
|
" server_port=%%d default: " DFL_SERVER_PORT "\n" \
|
||||||
" debug_level=%%d default: 0 (disabled)\n" \
|
" debug_level=%%d default: 0 (disabled)\n" \
|
||||||
" mode=%%d default: 0 (SSL/TLS) (1 for STARTTLS)\n" \
|
" mode=%%d default: 0 (SSL/TLS) (1 for STARTTLS)\n" \
|
||||||
USAGE_AUTH \
|
USAGE_AUTH \
|
||||||
" mail_from=%%s default: \"\"\n" \
|
" mail_from=%%s default: \"\"\n" \
|
||||||
" mail_to=%%s default: \"\"\n" \
|
" mail_to=%%s default: \"\"\n" \
|
||||||
USAGE_IO \
|
USAGE_IO \
|
||||||
" force_ciphersuite=<name> default: all enabled\n"\
|
" force_ciphersuite=<name> default: all enabled\n" \
|
||||||
" acceptable ciphersuite names:\n"
|
" acceptable ciphersuite names:\n"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -306,7 +306,7 @@ static int write_and_get_response( mbedtls_net_context *sock_fd, unsigned char *
|
||||||
mbedtls_printf("\n%s", buf);
|
mbedtls_printf("\n%s", buf);
|
||||||
if( len && ( ret = mbedtls_net_send( sock_fd, buf, len ) ) <= 0 )
|
if( len && ( ret = mbedtls_net_send( sock_fd, buf, len ) ) <= 0 )
|
||||||
{
|
{
|
||||||
mbedtls_printf( " failed\n ! mbedtls_ssl_write returned %d\n\n", ret );
|
mbedtls_printf( " failed\n ! mbedtls_net_send returned %d\n\n", ret );
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -318,7 +318,7 @@ static int write_and_get_response( mbedtls_net_context *sock_fd, unsigned char *
|
||||||
|
|
||||||
if( ret <= 0 )
|
if( ret <= 0 )
|
||||||
{
|
{
|
||||||
mbedtls_printf( "failed\n ! read returned %d\n\n", ret );
|
mbedtls_printf( "failed\n ! mbedtls_net_recv returned %d\n\n", ret );
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue