Commit f08360a1 authored by Richard Levitte's avatar Richard Levitte
Browse files

Have BIO_get_conn_int_port use BIO_ctrl instead BIO_int_ctrl 



BIO_int_ctrl isn't made for the purpose BIO_get_conn_int_port used it
for.

This also changes BIO_C_GET_CONNECT to actually return the port
instead of assigning it to a pointer that was never returned back to
the caller.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(cherry picked from commit 2a60fccd)
parent 583f4bf7

crypto/bio/bio.h

+1 −1
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ struct bio_dgram_sctp_prinfo { 
# define BIO_get_conn_hostname(b)  BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,0)

# define BIO_get_conn_port(b)      BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,1)

# define BIO_get_conn_ip(b)               BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,2)

# define BIO_get_conn_int_port(b) BIO_int_ctrl(b,BIO_C_GET_CONNECT,3,0)

# define BIO_get_conn_int_port(b) BIO_ctrl(b,BIO_C_GET_CONNECT,3,0,NULL)



# define BIO_set_nbio(b,n)       BIO_ctrl(b,BIO_C_SET_NBIO,(n),NULL)

crypto/bio/bss_conn.c

+20 −11
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ static long conn_ctrl(BIO *b, int cmd, long num, void *ptr) 
{

    BIO *dbio;

    int *ip;

    const char **pptr;

    const char **pptr = NULL;

    long ret = 1;

    BIO_CONNECT *data;
@@ -442,19 +442,28 @@ static long conn_ctrl(BIO *b, int cmd, long num, void *ptr) 
    case BIO_C_GET_CONNECT:

        if (ptr != NULL) {

            pptr = (const char **)ptr;

        }



        if (b->init) {

            if (pptr != NULL) {

                ret = 1;

                if (num == 0) {

                    *pptr = data->param_hostname;



                } else if (num == 1) {

                    *pptr = data->param_port;

                } else if (num == 2) {

                    *pptr = (char *)&(data->ip[0]);

            } else if (num == 3) {

                *((int *)ptr) = data->port;

                } else {

                    ret = 0;

                }

            }

            if (num == 3) {

                ret = data->port;

            }

            if ((!b->init) || (ptr == NULL))

        } else {

            if (pptr != NULL)

                *pptr = "not initialized";

            ret = 1;

            ret = 0;

        }

        break;

    case BIO_C_SET_CONNECT: