diff options
| author | Jim Shaver <dcypherd@gmail.com> | 2015-05-05 10:33:18 -0400 |
|---|---|---|
| committer | Jim Shaver <dcypherd@gmail.com> | 2015-05-05 10:33:18 -0400 |
| commit | e461dad70146e2edda3f0dedbdf88b34acae872f (patch) | |
| tree | cb266519b229413eec08b813da77c3cdc3b98136 | |
| parent | 677402f29a3d64cc0f2a7697378ad4a2b9f4ab43 (diff) | |
| parent | 8b71990171e36d0e2153c736905aabcfa3e36a9b (diff) | |
| download | pyopenssl-e461dad70146e2edda3f0dedbdf88b34acae872f.tar.gz | |
Merge branch 'master' of github.com:pyca/pyopenssl into examplespython3
| -rw-r--r-- | .travis.yml | 34 | ||||
| -rw-r--r-- | OpenSSL/crypto.py | 1 | ||||
| -rw-r--r-- | tox.ini | 4 |
3 files changed, 17 insertions, 22 deletions
diff --git a/.travis.yml b/.travis.yml index c244622..9c91b2f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,25 +18,20 @@ matrix: env: TOXENV=py34 - python: "pypy" env: TOXENV=pypy + # Also run the tests against cryptography master. - python: "2.6" - env: - CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py26 + env: TOXENV=py26-cryptographyMaster - python: "2.7" - env: - CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py27 + env: TOXENV=py27-cryptographyMaster - python: "3.2" - env: - CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py32 + env: TOXENV=py32-cryptographyMaster - python: "3.3" - env: - CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py33 + env: TOXENV=py33-cryptographyMaster - python: "3.4" - env: - CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py34 + env: TOXENV=py34-cryptographyMaster - python: "pypy" - env: - CRYPTOGRAPHY_GIT_MASTER=true TOXENV=pypy + env: TOXENV=pypy-cryptographyMaster # Also run at least a little bit against an older version of OpenSSL. - python: "2.7" @@ -57,17 +52,14 @@ matrix: - language: generic os: osx env: TOXENV=py27 - - env: CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py26 - - env: CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py27 - - env: CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py32 - - env: CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py33 - - env: CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py34 - - env: CRYPTOGRAPHY_GIT_MASTER=true TOXENV=pypy + - env: TOXENV=py26-cryptographyMaster + - env: TOXENV=py27-cryptographyMaster + - env: TOXENV=py32-cryptographyMaster + - env: TOXENV=py33-cryptographyMaster + - env: TOXENV=py34-cryptographyMaster + - env: TOXENV=pypy-cryptographyMaster - env: OPENSSL=0.9.8 TOXENV=py27 -before_install: - - if [ -n "$CRYPTOGRAPHY_GIT_MASTER" ]; then pip install git+https://github.com/pyca/cryptography.git;fi - install: - | if [[ "$(uname -s)" == 'Darwin' ]]; then diff --git a/OpenSSL/crypto.py b/OpenSSL/crypto.py index c7bdabc..5743795 100644 --- a/OpenSSL/crypto.py +++ b/OpenSSL/crypto.py @@ -684,6 +684,7 @@ class X509Extension(object): "GENERAL_NAMES*", method.d2i(_ffi.NULL, payloadptr, length)) + names = _ffi.gc(names, _lib.GENERAL_NAMES_free) parts = [] for i in range(_lib.sk_GENERAL_NAME_num(names)): name = _lib.sk_GENERAL_NAME_value(names, i) @@ -1,15 +1,17 @@ [tox] -envlist = pypy,py26,py27,py32,py33,py34 +envlist = {pypy,py26,py27,py32,py33,py34}{,-cryptographyMaster} [testenv] deps = setuptools>=7.0 # older setuptools pollute CWD with egg files of dependencies coverage + cryptographyMaster: git+https://github.com/pyca/cryptography.git setenv = # Do not allowed the executing environment to pollute the test environment # with extra packages. PYTHONPATH= commands = python -c "import OpenSSL.SSL; print(OpenSSL.SSL.SSLeay_version(OpenSSL.SSL.SSLEAY_VERSION))" + python -c "import cryptography; print(cryptography.__version__)" coverage run --branch --source=OpenSSL setup.py test coverage report -m |