Commit 505f74ca authored by Matt Caswell's avatar Matt Caswell
Browse files

Cascade no-dgram from no-sock in Configure not e_os.h 



e_os.h was defining OPENSSL_NO_DGRAM if OPENSSL_NO_SOCK was defined.
This causes link problems on Windows because the generated .def files
still contain the DGRAM symbols even though they have not been compiled.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 9fb80e3c

Configure

+1 −1
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ my @disable_cascades = ( 
    "ec"		=> [ "ecdsa", "ecdh" ],



    "dgram"		=> [ "dtls", "sctp" ],

    "sock"		=> [ "sctp" ],

    "sock"		=> [ "dgram" ],

    "dtls"		=> [ @dtls ],



    # SSL 3.0, (D)TLS 1.0 and TLS 1.1 require MD5 and SHA

e_os.h

+0 −4
Original line number Diff line number Diff line
@@ -392,10 +392,6 @@ extern FILE *_imp___iob; 


/*************/



# if defined(OPENSSL_NO_SOCK) && !defined(OPENSSL_NO_DGRAM)

#  define OPENSSL_NO_DGRAM

# endif



# ifdef USE_SOCKETS

#  ifdef OPENSSL_NO_SOCK

#  elif defined(WINDOWS) || defined(MSDOS)