Commit f863ad0c authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix no-sock on Windows 



Link errors were occurring on Windows because the header files were not
correctly guarding some functions with OPENSSL_NO_SOCK

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 2469e76b

apps/ocsp.c

+10 −5
Original line number Diff line number Diff line
@@ -1027,13 +1027,13 @@ static char **lookup_serial(CA_DB *db, ASN1_INTEGER *ser) 


static BIO *init_responder(const char *port)

{

    BIO *acbio = NULL, *bufbio = NULL;



# ifdef OPENSSL_NO_SOCK

    BIO_printf(bio_err,

               "Error setting up accept BIO - sockets not supported.\n");

    return NULL;

# endif

# else

    BIO *acbio = NULL, *bufbio = NULL;



    bufbio = BIO_new(BIO_f_buffer());

    if (bufbio == NULL)

        goto err;
@@ -1060,9 +1060,10 @@ static BIO *init_responder(const char *port) 
    BIO_free_all(acbio);

    BIO_free(bufbio);

    return NULL;

# endif

}





# ifndef OPENSSL_NO_SOCK

/*

 * Decode %xx URL-decoding in-place. Ignores mal-formed sequences.

 */
@@ -1086,9 +1087,13 @@ static int urldecode(char *p) 
    *out = '\0';

    return (int)(out - save);

}

# endif



static int do_responder(OCSP_REQUEST **preq, BIO **pcbio, BIO *acbio)

{

# ifdef OPENSSL_NO_SOCK

    return 0;

# else

    int len;

    OCSP_REQUEST *req = NULL;

    char inbuf[2048], reqbuf[2048];
@@ -1169,7 +1174,7 @@ static int do_responder(OCSP_REQUEST **preq, BIO **pcbio, BIO *acbio) 
    *preq = req;



    return 1;



# endif

}



static int send_ocsp_response(BIO *cbio, OCSP_RESPONSE *resp)

include/openssl/bio.h

+50 −40
Original line number Diff line number Diff line
@@ -400,6 +400,9 @@ struct bio_dgram_sctp_prinfo { 
# define BIO_set_app_data(s,arg)         BIO_set_ex_data(s,0,arg)

# define BIO_get_app_data(s)             BIO_get_ex_data(s,0)



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



# ifndef OPENSSL_NO_SOCK

/* IP families we support, for BIO_s_connect() and BIO_s_accept() */

/* Note: the underlying operating system may not support some of them */

#  define BIO_FAMILY_IPV4                         4
@@ -417,8 +420,6 @@ struct bio_dgram_sctp_prinfo { 
#  define BIO_get_conn_ip_family(b)     BIO_ctrl(b,BIO_C_GET_CONNECT,3,NULL)

#  define BIO_set_conn_mode(b,n)        BIO_ctrl(b,BIO_C_SET_CONNECT_MODE,(n),NULL)



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



/* BIO_s_accept() */

#  define BIO_set_accept_name(b,name)   BIO_ctrl(b,BIO_C_SET_ACCEPT,0,(char *)name)

#  define BIO_set_accept_port(b,port)   BIO_ctrl(b,BIO_C_SET_ACCEPT,1,(char *)port)
@@ -442,6 +443,8 @@ struct bio_dgram_sctp_prinfo { 
/* BIO_s_accept() and BIO_s_connect() */

#  define BIO_do_connect(b)       BIO_do_handshake(b)

#  define BIO_do_accept(b)        BIO_do_handshake(b)

# endif /* OPENSSL_NO_SOCK */



# define BIO_do_handshake(b)     BIO_ctrl(b,BIO_C_DO_STATE_MACHINE,0,NULL)



/* BIO_s_datagram(), BIO_s_fd(), BIO_s_socket(), BIO_s_accept() and BIO_s_connect() */
@@ -624,9 +627,11 @@ long BIO_debug_callback(BIO *bio, int cmd, const char *argp, int argi, 
const BIO_METHOD *BIO_s_mem(void);

const BIO_METHOD *BIO_s_secmem(void);

BIO *BIO_new_mem_buf(const void *buf, int len);

# ifndef OPENSSL_NO_SOCK

const BIO_METHOD *BIO_s_socket(void);

const BIO_METHOD *BIO_s_connect(void);

const BIO_METHOD *BIO_s_accept(void);

# endif

const BIO_METHOD *BIO_s_fd(void);

const BIO_METHOD *BIO_s_log(void);

const BIO_METHOD *BIO_s_bio(void);
@@ -653,8 +658,10 @@ int BIO_dgram_sctp_msg_waiting(BIO *b); 
#  endif

# endif



# ifndef OPENSSL_NO_SOCK

int BIO_sock_should_retry(int i);

int BIO_sock_non_fatal_error(int error);

# endif



int BIO_fd_should_retry(int i);

int BIO_fd_non_fatal_error(int error);
@@ -671,6 +678,7 @@ int BIO_dump_indent_fp(FILE *fp, const char *s, int len, int indent); 
int BIO_hex_string(BIO *out, int indent, int width, unsigned char *data,

                   int datalen);



# ifndef OPENSSL_NO_SOCK

BIO_ADDR *BIO_ADDR_new(void);

int BIO_ADDR_rawmake(BIO_ADDR *ap, int family,

                     const void *where, size_t wherelen, unsigned short port);
@@ -738,9 +746,11 @@ int BIO_accept_ex(int accept_sock, BIO_ADDR *addr, int options); 
int BIO_closesocket(int sock);



BIO *BIO_new_socket(int sock, int close_flag);

BIO *BIO_new_fd(int fd, int close_flag);

BIO *BIO_new_connect(const char *host_port);

BIO *BIO_new_accept(const char *host_port);

# endif /* OPENSSL_NO_SOCK*/



BIO *BIO_new_fd(int fd, int close_flag);



int BIO_new_bio_pair(BIO **bio1, size_t writebuf1,

                     BIO **bio2, size_t writebuf2);

util/libcrypto.num

+42 −42

File changed.

Preview size limit exceeded, changes collapsed.