From 656d4b3c748638ec024dc6182994c96d1f9522d9 Mon Sep 17 00:00:00 2001 From: Tom Cosgrove Date: Fri, 8 Dec 2023 21:51:15 +0000 Subject: [PATCH] Avoid use of `ip_len` as it clashes with a macro in AIX system headers Fixes #8624 Signed-off-by: Tom Cosgrove --- include/mbedtls/net_sockets.h | 4 ++-- library/net_sockets.c | 14 +++++++------- programs/x509/cert_req.c | 6 +++--- programs/x509/cert_write.c | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/mbedtls/net_sockets.h b/include/mbedtls/net_sockets.h index 026f627ce..85c11971d 100644 --- a/include/mbedtls/net_sockets.h +++ b/include/mbedtls/net_sockets.h @@ -143,7 +143,7 @@ int mbedtls_net_bind(mbedtls_net_context *ctx, const char *bind_ip, const char * * \param client_ctx Will contain the connected client socket * \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 cip_len Will receive the size of the client IP written, * can be NULL if client_ip is null * * \return 0 if successful, or @@ -156,7 +156,7 @@ int mbedtls_net_bind(mbedtls_net_context *ctx, const char *bind_ip, const char * */ int mbedtls_net_accept(mbedtls_net_context *bind_ctx, mbedtls_net_context *client_ctx, - void *client_ip, size_t buf_size, size_t *ip_len); + void *client_ip, size_t buf_size, size_t *cip_len); /** * \brief Check and wait for the context to be ready for read/write diff --git a/library/net_sockets.c b/library/net_sockets.c index 2b120c551..edec5876a 100644 --- a/library/net_sockets.c +++ b/library/net_sockets.c @@ -316,7 +316,7 @@ static int net_would_block(const mbedtls_net_context *ctx) */ int mbedtls_net_accept(mbedtls_net_context *bind_ctx, mbedtls_net_context *client_ctx, - void *client_ip, size_t buf_size, size_t *ip_len) + void *client_ip, size_t buf_size, size_t *cip_len) { int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; int type; @@ -399,22 +399,22 @@ int mbedtls_net_accept(mbedtls_net_context *bind_ctx, if (client_ip != NULL) { if (client_addr.ss_family == AF_INET) { struct sockaddr_in *addr4 = (struct sockaddr_in *) &client_addr; - *ip_len = sizeof(addr4->sin_addr.s_addr); + *cip_len = sizeof(addr4->sin_addr.s_addr); - if (buf_size < *ip_len) { + if (buf_size < *cip_len) { return MBEDTLS_ERR_NET_BUFFER_TOO_SMALL; } - memcpy(client_ip, &addr4->sin_addr.s_addr, *ip_len); + memcpy(client_ip, &addr4->sin_addr.s_addr, *cip_len); } else { struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *) &client_addr; - *ip_len = sizeof(addr6->sin6_addr.s6_addr); + *cip_len = sizeof(addr6->sin6_addr.s6_addr); - if (buf_size < *ip_len) { + if (buf_size < *cip_len) { return MBEDTLS_ERR_NET_BUFFER_TOO_SMALL; } - memcpy(client_ip, &addr6->sin6_addr.s6_addr, *ip_len); + memcpy(client_ip, &addr6->sin6_addr.s6_addr, *cip_len); } } diff --git a/programs/x509/cert_req.c b/programs/x509/cert_req.c index 072441bef..6ae43a9d9 100644 --- a/programs/x509/cert_req.c +++ b/programs/x509/cert_req.c @@ -261,10 +261,10 @@ usage: } else if (strcmp(q, "DNS") == 0) { cur->node.type = MBEDTLS_X509_SAN_DNS_NAME; } else if (strcmp(q, "IP") == 0) { - size_t ip_len = 0; + size_t ip_addr_len = 0; cur->node.type = MBEDTLS_X509_SAN_IP_ADDRESS; - ip_len = mbedtls_x509_crt_parse_cn_inet_pton(subtype_value, ip); - if (ip_len == 0) { + ip_addr_len = mbedtls_x509_crt_parse_cn_inet_pton(subtype_value, ip); + if (ip_addr_len == 0) { mbedtls_printf("mbedtls_x509_crt_parse_cn_inet_pton failed to parse %s\n", subtype_value); goto exit; diff --git a/programs/x509/cert_write.c b/programs/x509/cert_write.c index 8395f746f..bf25c4cbd 100644 --- a/programs/x509/cert_write.c +++ b/programs/x509/cert_write.c @@ -583,10 +583,10 @@ usage: } else if (strcmp(q, "DNS") == 0) { cur->node.type = MBEDTLS_X509_SAN_DNS_NAME; } else if (strcmp(q, "IP") == 0) { - size_t ip_len = 0; + size_t ip_addr_len = 0; cur->node.type = MBEDTLS_X509_SAN_IP_ADDRESS; - ip_len = mbedtls_x509_crt_parse_cn_inet_pton(subtype_value, ip); - if (ip_len == 0) { + ip_addr_len = mbedtls_x509_crt_parse_cn_inet_pton(subtype_value, ip); + if (ip_addr_len == 0) { mbedtls_printf("mbedtls_x509_crt_parse_cn_inet_pton failed to parse %s\n", subtype_value); goto exit;