diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-03-07 09:55:46 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-03-07 09:55:46 -0800 |
| commit | 0552be0ce2156f7517163d03ad98b7d66677d3cc (patch) | |
| tree | 5e219b7c20dd7b1af51930d9ca19400389b82837 | |
| parent | 85527e02fd432521636a55c87c2e626960b8b74f (diff) | |
| parent | c7a6f1dd0b521c3e89c74868fa1a9bfa20350e32 (diff) | |
| download | cryptography-0552be0ce2156f7517163d03ad98b7d66677d3cc.tar.gz cryptography-0552be0ce2156f7517163d03ad98b7d66677d3cc.tar.bz2 cryptography-0552be0ce2156f7517163d03ad98b7d66677d3cc.zip | |
Merge pull request #754 from reaperhulk/bio-macro
BIO macro switch for 0.9.8e support
| -rw-r--r-- | cryptography/hazmat/bindings/openssl/bio.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cryptography/hazmat/bindings/openssl/bio.py b/cryptography/hazmat/bindings/openssl/bio.py index 279ad223..28172689 100644 --- a/cryptography/hazmat/bindings/openssl/bio.py +++ b/cryptography/hazmat/bindings/openssl/bio.py @@ -105,7 +105,6 @@ BIO *BIO_push(BIO *, BIO *); BIO *BIO_pop(BIO *); BIO *BIO_next(BIO *); BIO *BIO_find_type(BIO *, int); -int BIO_method_type(const BIO *); BIO_METHOD *BIO_s_mem(void); BIO *BIO_new_mem_buf(void *, int); BIO_METHOD *BIO_s_file(void); @@ -168,6 +167,10 @@ long BIO_set_read_buffer_size(BIO *, long); long BIO_set_write_buffer_size(BIO *, long); long BIO_set_buffer_size(BIO *, long); long BIO_set_buffer_read_data(BIO *, void *, long); + +/* The following was a macro in 0.9.8e. Once we drop support for RHEL/CentOS 5 + we should move this back to FUNCTIONS. */ +int BIO_method_type(const BIO *); """ CUSTOMIZATIONS = """ |