diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-03-02 11:52:18 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-03-02 11:52:18 -0600 |
| commit | 5ad1ea820430083b2d92b0a2d93de2c4316bbe1b (patch) | |
| tree | b6b124fb1b17e0b421a01608b935cfa766ba800d /src/_cffi_src/openssl/bio.py | |
| parent | 85f28d7230098d64faf2555b4872bcee1d0ca0f3 (diff) | |
| parent | 9f4d78488698d0eaaacce3398930398c982221af (diff) | |
| download | cryptography-5ad1ea820430083b2d92b0a2d93de2c4316bbe1b.tar.gz cryptography-5ad1ea820430083b2d92b0a2d93de2c4316bbe1b.tar.bz2 cryptography-5ad1ea820430083b2d92b0a2d93de2c4316bbe1b.zip | |
Merge pull request #2755 from alex/forward-port
Forward port the 1.2.3 changes
Diffstat (limited to 'src/_cffi_src/openssl/bio.py')
| -rw-r--r-- | src/_cffi_src/openssl/bio.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/_cffi_src/openssl/bio.py b/src/_cffi_src/openssl/bio.py index ac866831..6439e63a 100644 --- a/src/_cffi_src/openssl/bio.py +++ b/src/_cffi_src/openssl/bio.py @@ -99,7 +99,6 @@ BIO *BIO_pop(BIO *); BIO *BIO_next(BIO *); BIO *BIO_find_type(BIO *, int); BIO_METHOD *BIO_s_mem(void); -BIO *BIO_new_mem_buf(void *, int); BIO_METHOD *BIO_s_file(void); BIO *BIO_new_file(const char *, const char *); BIO *BIO_new_fp(FILE *, int); @@ -127,6 +126,8 @@ BIO_METHOD *BIO_f_buffer(void); """ MACROS = """ +/* BIO_new_mem_buf became const void * in 1.0.2g */ +BIO *BIO_new_mem_buf(void *, int); long BIO_set_fd(BIO *, long, int); long BIO_get_fd(BIO *, char *); long BIO_set_mem_eof_return(BIO *, int); |