[Python-modules-commits] [python-cryptography] 01/06: Import python-cryptography_1.3.4.orig.tar.gz
Tristan Seligmann
mithrandi at moszumanska.debian.org
Fri Jun 3 14:06:29 UTC 2016
This is an automated email from the git hooks/post-receive script.
mithrandi pushed a commit to branch master
in repository python-cryptography.
commit 6583b7f463b92cd610549c5eb1c5f6792a4e6e8e
Author: Tristan Seligmann <mithrandi at debian.org>
Date: Fri Jun 3 15:20:04 2016 +0200
Import python-cryptography_1.3.4.orig.tar.gz
---
CHANGELOG.rst | 19 +++++++++++++++++++
PKG-INFO | 2 +-
setup.py | 4 ++--
src/_cffi_src/build_openssl.py | 9 ++++++++-
src/_cffi_src/openssl/x509.py | 15 +++++++++++++++
src/cryptography.egg-info/PKG-INFO | 2 +-
src/cryptography.egg-info/requires.txt | 4 ++--
src/cryptography/__about__.py | 2 +-
8 files changed, 49 insertions(+), 8 deletions(-)
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index a549dc7..c30a137 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,25 @@
Changelog
=========
+1.3.4 - 2016-06-03
+~~~~~~~~~~~~~~~~~~
+
+* Added another OpenSSL function to the bindings to support an upcoming
+ ``pyOpenSSL`` release.
+
+1.3.3 - 2016-06-02
+~~~~~~~~~~~~~~~~~~
+
+* Added two new OpenSSL functions to the bindings to support an upcoming
+ ``pyOpenSSL`` release.
+
+1.3.2 - 2016-05-04
+~~~~~~~~~~~~~~~~~~
+
+* Updated Windows and OS X wheels to be compiled against OpenSSL 1.0.2h.
+* Fixed an issue preventing ``cryptography`` from compiling against
+ LibreSSL 2.3.x.
+
1.3.1 - 2016-03-21
~~~~~~~~~~~~~~~~~~
diff --git a/PKG-INFO b/PKG-INFO
index 304c225..64378e5 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: cryptography
-Version: 1.3.1
+Version: 1.3.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 88dfd7d..de737e0 100644
--- a/setup.py
+++ b/setup.py
@@ -311,7 +311,7 @@ setup(
tests_require=test_requirements,
extras_require={
"test": test_requirements,
- "docs-test": [
+ "docstest": [
"doc8",
"pyenchant",
"readme_renderer",
@@ -319,7 +319,7 @@ setup(
"sphinx_rtd_theme",
"sphinxcontrib-spelling",
],
- "pep8-test": [
+ "pep8test": [
"flake8",
"flake8-import-order",
"pep8-naming",
diff --git a/src/_cffi_src/build_openssl.py b/src/_cffi_src/build_openssl.py
index 2ff28d7..14ba5b3 100644
--- a/src/_cffi_src/build_openssl.py
+++ b/src/_cffi_src/build_openssl.py
@@ -38,8 +38,15 @@ def _osx_libraries(build_static):
_PRE_INCLUDE = """
+#include <openssl/opensslv.h>
+/*
+ LibreSSL removed e_os2.h from the public headers so we'll only include it
+ if we're using vanilla OpenSSL.
+*/
+#if !defined(LIBRESSL_VERSION_NUMBER)
#include <openssl/e_os2.h>
-#if defined(OPENSSL_SYS_WINDOWS)
+#endif
+#if defined(_WIN32)
#include <windows.h>
#endif
"""
diff --git a/src/_cffi_src/openssl/x509.py b/src/_cffi_src/openssl/x509.py
index b0ff984..05c7ec0 100644
--- a/src/_cffi_src/openssl/x509.py
+++ b/src/_cffi_src/openssl/x509.py
@@ -188,6 +188,7 @@ int X509_REVOKED_get_ext_count(X509_REVOKED *);
X509_EXTENSION *X509_REVOKED_get_ext(X509_REVOKED *, int);
int X509_REVOKED_add_ext(X509_REVOKED *, X509_EXTENSION*, int);
int X509_REVOKED_add1_ext_i2d(X509_REVOKED *, int, void *, int, unsigned long);
+X509_EXTENSION *X509_REVOKED_delete_ext(X509_REVOKED *, int);
int X509_REVOKED_set_revocationDate(X509_REVOKED *, ASN1_TIME *);
@@ -281,6 +282,8 @@ int i2d_X509_REQ_INFO(X509_REQ_INFO *, unsigned char **);
/* new in 1.0.2 */
int i2d_re_X509_tbs(X509 *, unsigned char **);
void X509_get0_signature(ASN1_BIT_STRING **, X509_ALGOR **, X509 *);
+int X509_get_signature_nid(const X509 *);
+X509_ALGOR *X509_get0_tbs_sigalg(X509 *);
long X509_get_version(X509 *);
@@ -377,6 +380,12 @@ void X509_get0_signature(ASN1_BIT_STRING **psig, X509_ALGOR **palg,
if (palg)
*palg = x->sig_alg;
}
+
+int X509_get_signature_nid(const X509 *x)
+{
+ return OBJ_obj2nid(x->sig_alg->algorithm);
+}
+
#endif
/* Added in 1.0.2 but we need it in all versions now due to the great
opaquing. */
@@ -421,6 +430,12 @@ X509_REVOKED *Cryptography_X509_REVOKED_dup(X509_REVOKED *rev) {
/* Added in 1.1.0 but we need it in all versions now due to the great
opaquing. */
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+
+X509_ALGOR *X509_get0_tbs_sigalg(X509 *x)
+{
+ return x->cert_info->signature;
+}
+
/* from x509/x509_req.c */
void X509_REQ_get0_signature(ASN1_BIT_STRING **psig, X509_ALGOR **palg,
X509_REQ *req)
diff --git a/src/cryptography.egg-info/PKG-INFO b/src/cryptography.egg-info/PKG-INFO
index 304c225..64378e5 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: 1.3.1
+Version: 1.3.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 fa02b4f..5f8ca61 100644
--- a/src/cryptography.egg-info/requires.txt
+++ b/src/cryptography.egg-info/requires.txt
@@ -6,7 +6,7 @@ enum34
ipaddress
cffi>=1.4.1
-[docs-test]
+[docstest]
doc8
pyenchant
readme_renderer
@@ -14,7 +14,7 @@ sphinx
sphinx_rtd_theme
sphinxcontrib-spelling
-[pep8-test]
+[pep8test]
flake8
flake8-import-order
pep8-naming
diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py
index 26ef95f..635beca 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__ = "1.3.1"
+__version__ = "1.3.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
More information about the Python-modules-commits
mailing list