openssl
/
openssl
mirror of https://github.com/openssl/openssl
1
0
Fork 0
Code Issues Releases Wiki Activity

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>
This commit is contained in:
Matt Caswell 2016-04-20 11:24:49 +01:00
parent 9fb80e3ceb
commit 505f74ca34
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Configure
View File

@ -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

4
e_os.h
View File

@ -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)