diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2013-12-28 17:27:33 -0800 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2013-12-28 17:27:33 -0800 |
| commit | 5adecf8e597ea72b8759e79e12d569fdbfe5f55f (patch) | |
| tree | 5709e6c154486e57baca3a4e0401113568e91546 | |
| parent | 3f806cd86aa9490834846676219385102ccd40f6 (diff) | |
| parent | 6d43f5bde0efa27e784223aae18ca12f6ed1e11c (diff) | |
| download | cryptography-5adecf8e597ea72b8759e79e12d569fdbfe5f55f.tar.gz cryptography-5adecf8e597ea72b8759e79e12d569fdbfe5f55f.tar.bz2 cryptography-5adecf8e597ea72b8759e79e12d569fdbfe5f55f.zip | |
Merge pull request #370 from alex/wider-types
Make some types wider to be warning free on OS X
| -rw-r--r-- | cryptography/hazmat/backends/openssl/bio.py | 8 | ||||
| -rw-r--r-- | cryptography/hazmat/backends/openssl/ssl.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cryptography/hazmat/backends/openssl/bio.py b/cryptography/hazmat/backends/openssl/bio.py index 264a2410..279ad223 100644 --- a/cryptography/hazmat/backends/openssl/bio.py +++ b/cryptography/hazmat/backends/openssl/bio.py @@ -143,10 +143,10 @@ long BIO_set_mem_buf(BIO *, BUF_MEM *, int); long BIO_get_mem_ptr(BIO *, BUF_MEM **); long BIO_set_fp(BIO *, FILE *, int); long BIO_get_fp(BIO *, FILE **); -int BIO_read_filename(BIO *, char *); -int BIO_write_filename(BIO *, char *); -int BIO_append_filename(BIO *, char *); -int BIO_rw_filename(BIO *, char *); +long BIO_read_filename(BIO *, char *); +long BIO_write_filename(BIO *, char *); +long BIO_append_filename(BIO *, char *); +long BIO_rw_filename(BIO *, char *); int BIO_should_read(BIO *); int BIO_should_write(BIO *); int BIO_should_io_special(BIO *); diff --git a/cryptography/hazmat/backends/openssl/ssl.py b/cryptography/hazmat/backends/openssl/ssl.py index fc7ccf37..2b1fb4a3 100644 --- a/cryptography/hazmat/backends/openssl/ssl.py +++ b/cryptography/hazmat/backends/openssl/ssl.py @@ -213,7 +213,7 @@ long SSL_get_options(SSL *); int SSL_want_read(const SSL *); int SSL_want_write(const SSL *); -int SSL_total_renegotiations(SSL *); +long SSL_total_renegotiations(SSL *); long SSL_CTX_set_options(SSL_CTX *, long); long SSL_CTX_get_options(SSL_CTX *); |