diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2011-03-25 22:17:57 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2011-03-25 22:17:57 -0400 |
| commit | 7301d8c77a05b9280e8cc82cfcc0139c0da16f45 (patch) | |
| tree | 052947d54eb8b101e23f8273651c88d4dcd32a12 /OpenSSL/crypto | |
| parent | 3fedcc3dc0bdec265e6fc590392ada4ddfad27b7 (diff) | |
| download | pyopenssl-7301d8c77a05b9280e8cc82cfcc0139c0da16f45.tar.gz | |
Fix for #742885
Diffstat (limited to 'OpenSSL/crypto')
| -rw-r--r-- | OpenSSL/crypto/crypto.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/OpenSSL/crypto/crypto.h b/OpenSSL/crypto/crypto.h index 8c803a8..adb6509 100644 --- a/OpenSSL/crypto/crypto.h +++ b/OpenSSL/crypto/crypto.h @@ -14,6 +14,19 @@ #define PyOpenSSL_CRYPTO_H_ #include <Python.h> +/* Work around a bug in OpenSSL 1.0.0 which is caused by winsock.h being + included (from dtls1.h) too late by the OpenSSL header files, overriding + the fixes (in ossl_typ.h) for symbol clashes caused by this OS header + file. + + In order to have those fixes still take effect, we include winsock.h + here, prior to including any OpenSSL header files. + + */ +#ifdef _WIN32 +# include "winsock.h" +#endif + #include "x509.h" #include "x509name.h" #include "netscape_spki.h" |