diff options
author | Alex Gaynor <alex.gaynor@gmail.com> | 2019-10-19 19:50:21 -0400 |
---|---|---|
committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2019-10-20 07:50:21 +0800 |
commit | dbe203a37b8956f4d194798859d41a421d02542e (patch) | |
tree | be8c418a0c5bff191a09cacef693a427bb209252 | |
parent | c453041ad2fc0e36592ea200618e7db50df65a9e (diff) | |
download | cryptography-dbe203a37b8956f4d194798859d41a421d02542e.tar.gz cryptography-dbe203a37b8956f4d194798859d41a421d02542e.tar.bz2 cryptography-dbe203a37b8956f4d194798859d41a421d02542e.zip |
Test against libressl 3.0 (#5031)
* Test against libressl 3.0
* Correctly type these ints
-rw-r--r-- | .travis.yml | 2 | ||||
-rw-r--r-- | src/_cffi_src/openssl/callbacks.py | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 5348f4c6..4992eb7e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,6 +67,8 @@ matrix: env: TOXENV=py37 LIBRESSL=2.8.3 - python: 3.7 env: TOXENV=py37 LIBRESSL=2.9.2 + - python: 3.8 + env: TOXENV=py38 LIBRESSL=3.0.2 - python: 2.7 services: docker diff --git a/src/_cffi_src/openssl/callbacks.py b/src/_cffi_src/openssl/callbacks.py index 75c62016..8ee01e0e 100644 --- a/src/_cffi_src/openssl/callbacks.py +++ b/src/_cffi_src/openssl/callbacks.py @@ -81,7 +81,7 @@ static inline void cryptography_mutex_unlock(Cryptography_mutex *mutex) { #endif -static unsigned int _ssl_locks_count = 0; +static int _ssl_locks_count = 0; static Cryptography_mutex *_ssl_locks = NULL; static void _ssl_thread_locking_function(int mode, int n, const char *file, @@ -101,7 +101,7 @@ static void _ssl_thread_locking_function(int mode, int n, const char *file, */ if ((_ssl_locks == NULL) || - (n < 0) || ((unsigned)n >= _ssl_locks_count)) { + (n < 0) || (n >= _ssl_locks_count)) { return; } |