[Python-modules-commits] [python-cryptography] 01/06: Import python-cryptography_2.1.4.orig.tar.gz

[Tristan Seligmann]

This is an automated email from the git hooks/post-receive script.

mithrandi pushed a commit to branch master
in repository python-cryptography.

commit 21713e952d5f46fb6b43f253606e9dd2e99fd2b7
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Mon Dec 11 13:47:37 2017 +0200

    Import python-cryptography_2.1.4.orig.tar.gz
---
 CHANGELOG.rst                          | 7 +++++++
 PKG-INFO                               | 2 +-
 setup.py                               | 2 +-
 src/_cffi_src/openssl/x509.py          | 5 +++++
 src/cryptography.egg-info/PKG-INFO     | 2 +-
 src/cryptography.egg-info/requires.txt | 2 +-
 src/cryptography/__about__.py          | 2 +-
 7 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index cf68365..7654477 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,13 @@ Changelog
 =========
 
 
+.. _v2-1-4:
+
+2.1.4 - 2017-11-29
+~~~~~~~~~~~~~~~~~~
+
+* Added ``X509_up_ref`` for an upcoming ``pyOpenSSL`` release.
+
 .. _v2-1-3:
 
 2.1.3 - 2017-11-02
diff --git a/PKG-INFO b/PKG-INFO
index 65c830a..ccc20ea 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: cryptography
-Version: 2.1.3
+Version: 2.1.4
 Summary: cryptography is a package which provides cryptographic recipes and primitives to Python developers.
 Home-page: https://github.com/pyca/cryptography
 Author: The cryptography developers
diff --git a/setup.py b/setup.py
index 82c4bf5..c79106f 100644
--- a/setup.py
+++ b/setup.py
@@ -45,7 +45,7 @@ else:
     setup_requirements.append("cffi>=1.7")
 
 test_requirements = [
-    "pytest>=3.2.1",
+    "pytest>=3.2.1,!=3.3.0",
     "pretend",
     "iso8601",
     "pytz",
diff --git a/src/_cffi_src/openssl/x509.py b/src/_cffi_src/openssl/x509.py
index e7619dd..394c37c 100644
--- a/src/_cffi_src/openssl/x509.py
+++ b/src/_cffi_src/openssl/x509.py
@@ -83,6 +83,7 @@ X509 *X509_new(void);
 void X509_free(X509 *);
 X509 *X509_dup(X509 *);
 int X509_cmp(const X509 *, const X509 *);
+int X509_up_ref(X509 *);
 
 int X509_print_ex(BIO *, X509 *, unsigned long, unsigned long);
 
@@ -382,6 +383,10 @@ X509_REVOKED *Cryptography_X509_REVOKED_dup(X509_REVOKED *rev) {
    opaquing. */
 #if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110
 
+int X509_up_ref(X509 *x) {
+   return CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);
+}
+
 const X509_ALGOR *X509_get0_tbs_sigalg(const X509 *x)
 {
     return x->cert_info->signature;
diff --git a/src/cryptography.egg-info/PKG-INFO b/src/cryptography.egg-info/PKG-INFO
index 65c830a..ccc20ea 100644
--- a/src/cryptography.egg-info/PKG-INFO
+++ b/src/cryptography.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: cryptography
-Version: 2.1.3
+Version: 2.1.4
 Summary: cryptography is a package which provides cryptographic recipes and primitives to Python developers.
 Home-page: https://github.com/pyca/cryptography
 Author: The cryptography developers
diff --git a/src/cryptography.egg-info/requires.txt b/src/cryptography.egg-info/requires.txt
index cc6eb22..eb72c90 100644
--- a/src/cryptography.egg-info/requires.txt
+++ b/src/cryptography.egg-info/requires.txt
@@ -23,7 +23,7 @@ flake8-import-order
 pep8-naming
 
 [test]
-pytest>=3.2.1
+pytest!=3.3.0,>=3.2.1
 pretend
 iso8601
 pytz
diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py
index b0df097..d754a07 100644
--- a/src/cryptography/__about__.py
+++ b/src/cryptography/__about__.py
@@ -14,7 +14,7 @@ __summary__ = ("cryptography is a package which provides cryptographic recipes"
                " and primitives to Python developers.")
 __uri__ = "https://github.com/pyca/cryptography"
 
-__version__ = "2.1.3"
+__version__ = "2.1.4"
 
 __author__ = "The cryptography developers"
 __email__ = "cryptography-dev at python.org"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-cryptography.git