yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Move ChangeLog entry to BugFix section.

* origin/pr/2368:
  Fix default port number information
This commit is contained in:
Jaeden Amero 2019-04-05 14:23:48 +01:00
commit bc5de0f12f
2 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -20,6 +20,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
* Server's RSA certificate in certs.c was SHA-1 signed. In the default * Server's RSA certificate in certs.c was SHA-1 signed. In the default

30
programs/ssl/ssl_mail_client.c
View file

@ -110,9 +110,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"
@ -129,17 +129,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"
#if defined(MBEDTLS_CHECK_PARAMS) #if defined(MBEDTLS_CHECK_PARAMS)
@ -324,7 +324,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;
} }
@ -336,7 +336,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;
} }