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 a7b9ed5..367ede3 100755
--- a/Configure
+++ b/Configure
@@ -364,7 +364,7 @@
"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 0124e5e..f85b754 100644
--- a/e_os.h
+++ b/e_os.h
@@ -392,10 +392,6 @@
/*************/
-# 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)
