diff options
| author | Thierry Bastian <thierryb@filewave.com> | 2018-04-05 16:15:53 +0200 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2018-04-05 09:15:53 -0500 |
| commit | cbdc9baafd4cc919abc7aed070d08d8ea847aa33 (patch) | |
| tree | 956d37647925f000718ad5b6cab4aa7205ba0597 /src/_cffi_src | |
| parent | d57c79e0434ee224c00bcfd5b28e958144a1722b (diff) | |
| download | cryptography-cbdc9baafd4cc919abc7aed070d08d8ea847aa33.tar.gz cryptography-cbdc9baafd4cc919abc7aed070d08d8ea847aa33.tar.bz2 cryptography-cbdc9baafd4cc919abc7aed070d08d8ea847aa33.zip | |
OpenSSL 1.0.2o has switched to winsock2 (#4184)
So here we need to make sure we don't simply include windows but only the parts that we want
Diffstat (limited to 'src/_cffi_src')
| -rw-r--r-- | src/_cffi_src/openssl/callbacks.py | 3 | ||||
| -rw-r--r-- | src/_cffi_src/openssl/cryptography.py | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/_cffi_src/openssl/callbacks.py b/src/_cffi_src/openssl/callbacks.py index cf2b2da5..e215ed4e 100644 --- a/src/_cffi_src/openssl/callbacks.py +++ b/src/_cffi_src/openssl/callbacks.py @@ -11,7 +11,10 @@ INCLUDES = """ #include <openssl/crypto.h> #ifdef _WIN32 +#define WIN32_LEAN_AND_MEAN #include <Windows.h> +#include <Wincrypt.h> +#include <Winsock2.h> #else #include <stdio.h> #include <stdlib.h> diff --git a/src/_cffi_src/openssl/cryptography.py b/src/_cffi_src/openssl/cryptography.py index 9095e3ab..4f9378d3 100644 --- a/src/_cffi_src/openssl/cryptography.py +++ b/src/_cffi_src/openssl/cryptography.py @@ -22,7 +22,10 @@ INCLUDES = """ #include <openssl/e_os2.h> #endif #if defined(_WIN32) +#define WIN32_LEAN_AND_MEAN #include <windows.h> +#include <Wincrypt.h> +#include <Winsock2.h> #endif #define CRYPTOGRAPHY_OPENSSL_102_OR_GREATER \ |