diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-03-09 21:14:50 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2016-03-09 21:14:50 -0500 |
| commit | fbb7e1334ef8e74d0fda19d48f78c6439f79c9a2 (patch) | |
| tree | b2901cdeb6bbb0dd371b7afe617110237fb50a61 | |
| parent | e2dc8891f149d4e45dc39b18146e5fa84e3a12f4 (diff) | |
| parent | 47b0c6e7d657409964c4b0186bb95ebe927b541f (diff) | |
| download | cryptography-fbb7e1334ef8e74d0fda19d48f78c6439f79c9a2.tar.gz cryptography-fbb7e1334ef8e74d0fda19d48f78c6439f79c9a2.tar.bz2 cryptography-fbb7e1334ef8e74d0fda19d48f78c6439f79c9a2.zip | |
Merge pull request #2796 from reaperhulk/110-patch-17
remove RAND_pseudo_bytes + make EGD conditional for 1.1.0
| -rw-r--r-- | src/_cffi_src/openssl/rand.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/_cffi_src/openssl/rand.py b/src/_cffi_src/openssl/rand.py index 91e1a396..0a94d705 100644 --- a/src/_cffi_src/openssl/rand.py +++ b/src/_cffi_src/openssl/rand.py @@ -22,7 +22,6 @@ int RAND_load_file(const char *, long); int RAND_write_file(const char *); void RAND_cleanup(void); int RAND_bytes(unsigned char *, int); -int RAND_pseudo_bytes(unsigned char *, int); """ MACROS = """ @@ -32,7 +31,7 @@ int RAND_query_egd_bytes(const char *, unsigned char *, int); """ CUSTOMIZATIONS = """ -#if defined(LIBRESSL_VERSION_NUMBER) +#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER >= 0x10100000L static const long Cryptography_HAS_EGD = 0; int (*RAND_egd)(const char *) = NULL; int (*RAND_egd_bytes)(const char *, int) = NULL; |