mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-18 13:44:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Exclude IPv6 code using OPENSSL_USE_IPV6 instead of AF_INET6

Browse Source 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18250)
This commit is contained in:
Max Bachmann 2022-05-05 09:56:10 +02:00 committed by Pauli
parent eab9dbbdd1
commit 836bb0890d
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crypto/bio/bio_addr.c
View File

@ -95,7 +95,7 @@ int BIO_ADDR_make(BIO_ADDR *ap, const struct sockaddr *sa)
memcpy(&(ap->s_in), sa, sizeof(struct sockaddr_in));
return 1;
}
#ifdef AF_INET6
#if OPENSSL_USE_IPV6
if (sa->sa_family == AF_INET6) {
memcpy(&(ap->s_in6), sa, sizeof(struct sockaddr_in6));
return 1;
@ -134,7 +134,7 @@ int BIO_ADDR_rawmake(BIO_ADDR *ap, int family,
ap->s_in.sin_addr = *(struct in_addr *)where;
return 1;
}
#ifdef AF_INET6
#if OPENSSL_USE_IPV6
if (family == AF_INET6) {
if (wherelen != sizeof(struct in6_addr))
return 0;
@ -163,7 +163,7 @@ int BIO_ADDR_rawaddress(const BIO_ADDR *ap, void *p, size_t *l)
len = sizeof(ap->s_in.sin_addr);
addrptr = &ap->s_in.sin_addr;
}
#ifdef AF_INET6
#if OPENSSL_USE_IPV6
else if (ap->sa.sa_family == AF_INET6) {
len = sizeof(ap->s_in6.sin6_addr);
addrptr = &ap->s_in6.sin6_addr;
@ -192,7 +192,7 @@ unsigned short BIO_ADDR_rawport(const BIO_ADDR *ap)
{
if (ap->sa.sa_family == AF_INET)
return ap->s_in.sin_port;
#ifdef AF_INET6
#if OPENSSL_USE_IPV6
if (ap->sa.sa_family == AF_INET6)
return ap->s_in6.sin6_port;
#endif
@ -346,7 +346,7 @@ socklen_t BIO_ADDR_sockaddr_size(const BIO_ADDR *ap)
{
if (ap->sa.sa_family == AF_INET)
return sizeof(ap->s_in);
#ifdef AF_INET6
#if OPENSSL_USE_IPV6
if (ap->sa.sa_family == AF_INET6)
return sizeof(ap->s_in6);
#endif
@ -668,7 +668,7 @@ int BIO_lookup_ex(const char *host, const char *service, int lookup_type,
switch (family) {
case AF_INET:
#ifdef AF_INET6
#if OPENSSL_USE_IPV6
case AF_INET6:
#endif
#ifdef AF_UNIX

2
crypto/bio/bio_local.h
View File

@ -73,7 +73,7 @@ struct bio_addrinfo_st {
union bio_addr_st {
struct sockaddr sa;
# ifdef AF_INET6
# if OPENSSL_USE_IPV6
struct sockaddr_in6 s_in6;
# endif
struct sockaddr_in s_in;

4
crypto/bio/bss_acpt.c
View File

@ -188,7 +188,7 @@ static int acpt_state(BIO *b, BIO_ACCEPT *c)
* at least the "else" part will always be
* compiled.
*/
#ifdef AF_INET6
#if OPENSSL_USE_IPV6
family = AF_INET6;
} else {
#endif
@ -501,7 +501,7 @@ static long acpt_ctrl(BIO *b, int cmd, long num, void *ptr)
*pp = data->cache_peer_serv;
} else if (num == 4) {
switch (BIO_ADDRINFO_family(data->addr_iter)) {
#ifdef AF_INET6
#if OPENSSL_USE_IPV6
case AF_INET6:
ret = BIO_FAMILY_IPV6;
break;

4
crypto/bio/bss_conn.c
View File

@ -108,7 +108,7 @@ static int conn_state(BIO *b, BIO_CONNECT *c)
* at least the "else" part will always be
* compiled.
*/
#ifdef AF_INET6
#if OPENSSL_USE_IPV6
family = AF_INET6;
} else {
#endif
@ -421,7 +421,7 @@ static long conn_ctrl(BIO *b, int cmd, long num, void *ptr)
*pptr = (const char *)BIO_ADDRINFO_address(data->addr_iter);
} else if (num == 3) {
switch (BIO_ADDRINFO_family(data->addr_iter)) {
# ifdef AF_INET6
# if OPENSSL_USE_IPV6
case AF_INET6:
ret = BIO_FAMILY_IPV6;
break;