Commit a7a14a23 authored by Ben Laurie's avatar Ben Laurie
Browse files

Fix no-dgram. 



Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
parent 7644a9ae

Configure

+4 −0
Original line number Diff line number Diff line
@@ -1197,6 +1197,10 @@ if (defined($disabled{"md5"}) || defined($disabled{"sha"}) 
	$disabled{"tls1"} = "forced";

	}



if (defined($disabled{"dgram"}))

	{

        $disabled{"dtls"} = "forced";

        }



if (defined($disabled{"ec"}) || defined($disabled{"dsa"})

    || defined($disabled{"dh"}) || defined($disabled{"stdio"}))

apps/s_server.c

+3 −2
Original line number Diff line number Diff line
@@ -257,9 +257,9 @@ static char *engine_id = NULL; 
#endif

static const char *session_id_prefix = NULL;



#ifndef OPENSSL_NO_DTLS

static int enable_timeouts = 0;

static long socket_mtu;

#ifndef OPENSSL_NO_DTLS

static int cert_chain = 0;

#endif

static int dtlslisten = 0;
@@ -2028,7 +2028,7 @@ static int sv_body(char *hostname, int s, int stype, unsigned char *context) 
        ret = -1;

        goto err;

    }



#ifndef OPENSSL_NO_DTLS

    if (stype == SOCK_DGRAM) {



        sbio = BIO_new_dgram(s, BIO_NOCLOSE);
@@ -2065,6 +2065,7 @@ static int sv_body(char *hostname, int s, int stype, unsigned char *context) 
        /* turn on cookie exchange */

        SSL_set_options(con, SSL_OP_COOKIE_EXCHANGE);

    } else

#endif

        sbio = BIO_new_socket(s, BIO_NOCLOSE);



    if (s_nbio_test) {