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

Merge remote-tracking branch 'public/pr/1627' into development

Browse Source
This commit is contained in:
Simon Butcher 2018-10-27 18:27:41 +01:00
commit ddc9e26b3b
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -26,6 +26,8 @@ Changes
* Close a test gap in (D)TLS between the client side and the server side: * Close a test gap in (D)TLS between the client side and the server side:
test the handling of large packets and small packets on the client side test the handling of large packets and small packets on the client side
in the same way as on the server side. in the same way as on the server side.
* Change the dtls_client and dtls_server samples to work by default over
IPv6 and optionally by a build option over IPv4.
= mbed TLS 2.13.1 branch released 2018-09-06 = mbed TLS 2.13.1 branch released 2018-09-06

11
programs/ssl/dtls_client.c
View File

@ -60,9 +60,18 @@ int main( void )
#include "mbedtls/certs.h" #include "mbedtls/certs.h"
#include "mbedtls/timing.h" #include "mbedtls/timing.h"
/* Uncomment out the following line to default to IPv4 and disable IPv6 */
//#define FORCE_IPV4
#define SERVER_PORT "4433" #define SERVER_PORT "4433"
#define SERVER_NAME "localhost" #define SERVER_NAME "localhost"
#define SERVER_ADDR "127.0.0.1" /* forces IPv4 */
#ifdef FORCE_IPV4
#define SERVER_ADDR "127.0.0.1" /* Forces IPv4 */
#else
#define SERVER_ADDR "::1"
#endif
#define MESSAGE "Echo this" #define MESSAGE "Echo this"
#define READ_TIMEOUT_MS 1000 #define READ_TIMEOUT_MS 1000

11
programs/ssl/dtls_server.c
View File

@ -34,6 +34,15 @@
#define mbedtls_time_t time_t #define mbedtls_time_t time_t
#endif #endif
/* Uncomment out the following line to default to IPv4 and disable IPv6 */
//#define FORCE_IPV4
#ifdef FORCE_IPV4
#define BIND_IP "0.0.0.0" /* Forces IPv4 */
#else
#define BIND_IP "::"
#endif
#if !defined(MBEDTLS_SSL_SRV_C) || !defined(MBEDTLS_SSL_PROTO_DTLS) || \ #if !defined(MBEDTLS_SSL_SRV_C) || !defined(MBEDTLS_SSL_PROTO_DTLS) || \
!defined(MBEDTLS_SSL_COOKIE_C) || !defined(MBEDTLS_NET_C) || \ !defined(MBEDTLS_SSL_COOKIE_C) || !defined(MBEDTLS_NET_C) || \
!defined(MBEDTLS_ENTROPY_C) || !defined(MBEDTLS_CTR_DRBG_C) || \ !defined(MBEDTLS_ENTROPY_C) || !defined(MBEDTLS_CTR_DRBG_C) || \
@ -170,7 +179,7 @@ int main( void )
printf( " . Bind on udp/*/4433 ..." ); printf( " . Bind on udp/*/4433 ..." );
fflush( stdout ); fflush( stdout );
if( ( ret = mbedtls_net_bind( &listen_fd, NULL, "4433", MBEDTLS_NET_PROTO_UDP ) ) != 0 ) if( ( ret = mbedtls_net_bind( &listen_fd, BIND_IP, "4433", MBEDTLS_NET_PROTO_UDP ) ) != 0 )
{ {
printf( " failed\n ! mbedtls_net_bind returned %d\n\n", ret ); printf( " failed\n ! mbedtls_net_bind returned %d\n\n", ret );
goto exit; goto exit;