From: Matt Caswell <matt@openssl.org>
Date: Wed, 20 Apr 2016 10:24:49 +0000 (+0100)
Subject: Cascade no-dgram from no-sock in Configure not e_os.h
X-Git-Tag: OpenSSL_1_1_0-pre6~1106
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=505f74ca34ea59f18ec980d1fd9150d8e348d1e3;p=oweals%2Fopenssl.git

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: Rich Salz <rsalz@openssl.org>
---

diff --git a/Configure b/Configure
index a7b9ed564f..367ede3648 100755
--- a/Configure
+++ b/Configure
@@ -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
diff --git a/e_os.h b/e_os.h
index 0124e5e67f..f85b754b12 100644
--- a/e_os.h
+++ b/e_os.h
@@ -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)