From 4dab551698f68a327d738a6262378e9b80f0be14 Mon Sep 17 00:00:00 2001 From: aitap Date: Fri, 13 Jan 2017 13:22:31 +0400 Subject: [PATCH 1/4] mbedtls_net_accept: client_ip can be NULL This is currently used in example programs, but not explicitly documented. --- include/mbedtls/net_sockets.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/mbedtls/net_sockets.h b/include/mbedtls/net_sockets.h index de335526f..f09f8bf3b 100644 --- a/include/mbedtls/net_sockets.h +++ b/include/mbedtls/net_sockets.h @@ -117,9 +117,10 @@ int mbedtls_net_bind( mbedtls_net_context *ctx, const char *bind_ip, const char * * \param bind_ctx Relevant socket * \param client_ctx Will contain the connected client socket - * \param client_ip Will contain the client IP address + * \param client_ip Will contain the client IP address, can be NULL * \param buf_size Size of the client_ip buffer - * \param ip_len Will receive the size of the client IP written + * \param ip_len Will receive the size of the client IP written, + * can be NULL if client_ip == NULL * * \return 0 if successful, or * MBEDTLS_ERR_NET_ACCEPT_FAILED, or From 5cb1f09ab46ea19e1df78af86fbb19f3de6f8ef4 Mon Sep 17 00:00:00 2001 From: Ivan Krylov Date: Sat, 24 Mar 2018 18:48:04 +0300 Subject: [PATCH 2/4] slight rewording requested by reviewer (#758) --- include/mbedtls/net_sockets.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/mbedtls/net_sockets.h b/include/mbedtls/net_sockets.h index f09f8bf3b..38ec91b2e 100644 --- a/include/mbedtls/net_sockets.h +++ b/include/mbedtls/net_sockets.h @@ -120,7 +120,7 @@ int mbedtls_net_bind( mbedtls_net_context *ctx, const char *bind_ip, const char * \param client_ip Will contain the client IP address, can be NULL * \param buf_size Size of the client_ip buffer * \param ip_len Will receive the size of the client IP written, - * can be NULL if client_ip == NULL + * can be NULL if client_ip is null * * \return 0 if successful, or * MBEDTLS_ERR_NET_ACCEPT_FAILED, or From e4f2736b42656bc62e3e48faf79f91140ab83ce8 Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Mon, 26 Mar 2018 12:29:30 +0200 Subject: [PATCH 3/4] Add ChangeLog entry --- ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index 0a857ba76..634e29cdc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ mbed TLS ChangeLog (Sorted per branch, date) += mbed TLS x.x.x branch released xxxx-xx-xx + +Changes + * Improve the documentation of mbedtls_net_accept(). Contributed by aitap. + = mbed TLS 2.4.1 branch released 2016-12-13 Changes From 065ecf587f3bf1fc59df46e4e1c1adb01074c1b8 Mon Sep 17 00:00:00 2001 From: Ivan Krylov Date: Wed, 28 Mar 2018 16:19:18 +0300 Subject: [PATCH 4/4] Changelog: use my real name (#758) --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 634e29cdc..70094e06b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,7 +3,7 @@ mbed TLS ChangeLog (Sorted per branch, date) = mbed TLS x.x.x branch released xxxx-xx-xx Changes - * Improve the documentation of mbedtls_net_accept(). Contributed by aitap. + * Improve the documentation of mbedtls_net_accept(). Contributed by Ivan Krylov. = mbed TLS 2.4.1 branch released 2016-12-13