Commit 5114d822 authored by Matt Caswell's avatar Matt Caswell
Browse files

Add a BIO_lookup_ex() function 



The existing BIO_lookup() wraps a call to getaddrinfo and provides an
abstracted capability to lookup addresses based on socket type and family.
However it provides no ability to lookup based on protocol. Normally,
when dealing with TCP/UDP this is not required. However getaddrinfo (at
least on linux) never returns SCTP addresses unless you specifically ask
for them in the protocol field. Therefore BIO_lookup_ex() is added which
provides the protocol field.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3286)
parent b3c42fc2

crypto/bio/b_addr.c

+22 −10
Original line number Diff line number Diff line
@@ -609,6 +609,13 @@ DEFINE_RUN_ONCE_STATIC(do_bio_lookup_init) 
    return bio_lookup_lock != NULL;

}



int BIO_lookup(const char *host, const char *service,

               enum BIO_lookup_type lookup_type,

               int family, int socktype, BIO_ADDRINFO **res)

{

    return BIO_lookup_ex(host, service, lookup_type, family, socktype, 0, res);

}



/*-

 * BIO_lookup - look up the node and service you want to connect to.

 * @node: the node you want to connect to.
@@ -618,6 +625,10 @@ DEFINE_RUN_ONCE_STATIC(do_bio_lookup_init) 
 *  AF_INET, AF_INET6 or AF_UNIX.

 * @socktype: The socket type you want to use.  Can be SOCK_STREAM, SOCK_DGRAM

 *  or 0 for all.

 * @protocol: The protocol to use, e.g. IPPROTO_TCP or IPPROTO_UDP or 0 for all.

 *            Note that some platforms may not return IPPROTO_SCTP without

 *            explicitly requesting it (i.e. IPPROTO_SCTP may not be returned

 *            with 0 for the protocol)

 * @res: Storage place for the resulting list of returned addresses

 *

 * This will do a lookup of the node and service that you want to connect to.
@@ -627,9 +638,9 @@ DEFINE_RUN_ONCE_STATIC(do_bio_lookup_init) 
 *

 * The return value is 1 on success or 0 in case of error.

 */

int BIO_lookup(const char *host, const char *service,

int BIO_lookup_ex(const char *host, const char *service,

                  enum BIO_lookup_type lookup_type,

               int family, int socktype, BIO_ADDRINFO **res)

                  int family, int socktype, int protocol, BIO_ADDRINFO **res)

{

    int ret = 0;                 /* Assume failure */
@@ -646,7 +657,7 @@ int BIO_lookup(const char *host, const char *service, 
#endif

        break;

    default:

        BIOerr(BIO_F_BIO_LOOKUP, BIO_R_UNSUPPORTED_PROTOCOL_FAMILY);

        BIOerr(BIO_F_BIO_LOOKUP_EX, BIO_R_UNSUPPORTED_PROTOCOL_FAMILY);

        return 0;

    }
@@ -655,7 +666,7 @@ int BIO_lookup(const char *host, const char *service, 
        if (addrinfo_wrap(family, socktype, host, strlen(host), 0, res))

            return 1;

        else

            BIOerr(BIO_F_BIO_LOOKUP, ERR_R_MALLOC_FAILURE);

            BIOerr(BIO_F_BIO_LOOKUP_EX, ERR_R_MALLOC_FAILURE);

        return 0;

    }

#endif
@@ -672,6 +683,7 @@ int BIO_lookup(const char *host, const char *service, 


        hints.ai_family = family;

        hints.ai_socktype = socktype;

        hints.ai_protocol = protocol;



        if (lookup_type == BIO_LOOKUP_SERVER)

            hints.ai_flags |= AI_PASSIVE;
@@ -683,14 +695,14 @@ int BIO_lookup(const char *host, const char *service, 
# ifdef EAI_SYSTEM

        case EAI_SYSTEM:

            SYSerr(SYS_F_GETADDRINFO, get_last_socket_error());

            BIOerr(BIO_F_BIO_LOOKUP, ERR_R_SYS_LIB);

            BIOerr(BIO_F_BIO_LOOKUP_EX, ERR_R_SYS_LIB);

            break;

# endif

        case 0:

            ret = 1;             /* Success */

            break;

        default:

            BIOerr(BIO_F_BIO_LOOKUP, ERR_R_SYS_LIB);

            BIOerr(BIO_F_BIO_LOOKUP_EX, ERR_R_SYS_LIB);

            ERR_add_error_data(1, gai_strerror(gai_ret));

            break;

        }
@@ -732,7 +744,7 @@ int BIO_lookup(const char *host, const char *service, 
#endif



        if (!RUN_ONCE(&bio_lookup_init, do_bio_lookup_init)) {

            BIOerr(BIO_F_BIO_LOOKUP, ERR_R_MALLOC_FAILURE);

            BIOerr(BIO_F_BIO_LOOKUP_EX, ERR_R_MALLOC_FAILURE);

            ret = 0;

            goto err;

        }
@@ -824,7 +836,7 @@ int BIO_lookup(const char *host, const char *service, 
                    goto err;

                }

            } else {

                BIOerr(BIO_F_BIO_LOOKUP, BIO_R_MALFORMED_HOST_OR_SERVICE);

                BIOerr(BIO_F_BIO_LOOKUP_EX, BIO_R_MALFORMED_HOST_OR_SERVICE);

                goto err;

            }

        }
@@ -866,7 +878,7 @@ int BIO_lookup(const char *host, const char *service, 
             addrinfo_malloc_err:

                BIO_ADDRINFO_free(*res);

                *res = NULL;

                BIOerr(BIO_F_BIO_LOOKUP, ERR_R_MALLOC_FAILURE);

                BIOerr(BIO_F_BIO_LOOKUP_EX, ERR_R_MALLOC_FAILURE);

                ret = 0;

                goto err;

            }

crypto/bio/bio_err.c

+2 −1
Original line number Diff line number Diff line 
/*

 * Generated by util/mkerr.pl DO NOT EDIT

 * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.

 * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the OpenSSL license (the "License").  You may not use

 * this file except in compliance with the License.  You can obtain a copy
@@ -33,6 +33,7 @@ static ERR_STRING_DATA BIO_str_functs[] = { 
    {ERR_FUNC(BIO_F_BIO_GET_PORT), "BIO_get_port"},

    {ERR_FUNC(BIO_F_BIO_LISTEN), "BIO_listen"},

    {ERR_FUNC(BIO_F_BIO_LOOKUP), "BIO_lookup"},

    {ERR_FUNC(BIO_F_BIO_LOOKUP_EX), "BIO_lookup_ex"},

    {ERR_FUNC(BIO_F_BIO_MAKE_PAIR), "bio_make_pair"},

    {ERR_FUNC(BIO_F_BIO_NEW), "BIO_new"},

    {ERR_FUNC(BIO_F_BIO_NEW_FILE), "BIO_new_file"},

include/openssl/bio.h

+4 −0
Original line number Diff line number Diff line
@@ -667,6 +667,9 @@ enum BIO_lookup_type { 
int BIO_lookup(const char *host, const char *service,

               enum BIO_lookup_type lookup_type,

               int family, int socktype, BIO_ADDRINFO **res);

int BIO_lookup_ex(const char *host, const char *service,

                  enum BIO_lookup_type lookup_type,

                  int family, int socktype, int protocol, BIO_ADDRINFO **res);

int BIO_sock_error(int sock);

int BIO_socket_ioctl(int fd, long type, void *arg);

int BIO_socket_nbio(int fd, int mode);
@@ -805,6 +808,7 @@ int ERR_load_BIO_strings(void); 
# define BIO_F_BIO_GET_PORT                               107

# define BIO_F_BIO_LISTEN                                 139

# define BIO_F_BIO_LOOKUP                                 135

# define BIO_F_BIO_LOOKUP_EX                              143

# define BIO_F_BIO_MAKE_PAIR                              121

# define BIO_F_BIO_NEW                                    108

# define BIO_F_BIO_NEW_FILE                               109

util/libcrypto.num

+1 −0
Original line number Diff line number Diff line
@@ -4271,3 +4271,4 @@ UINT32_it 4214 1_1_0f EXIST:EXPORT_VAR_AS_FUNCTION 
ZINT64_it                               4215	1_1_0f	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:

ZINT64_it                               4215	1_1_0f	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:

CRYPTO_mem_leaks_cb                     4216	1_1_1	EXIST::FUNCTION:CRYPTO_MDEBUG

BIO_lookup_ex                           4217	1_1_1	EXIST::FUNCTION:SOCK