[Python-modules-commits] [python-cryptography] 01/04: Import python-cryptography_1.1.1.orig.tar.gz
Tristan Seligmann
mithrandi at moszumanska.debian.org
Tue Nov 24 21:04:26 UTC 2015
This is an automated email from the git hooks/post-receive script.
mithrandi pushed a commit to branch master
in repository python-cryptography.
commit a2ea6f94eb8f22581f9af60750bc07401f251051
Author: Tristan Seligmann <mithrandi at debian.org>
Date: Tue Nov 24 22:52:25 2015 +0200
Import python-cryptography_1.1.1.orig.tar.gz
---
CHANGELOG.rst | 9 +++++++++
PKG-INFO | 2 +-
src/_cffi_src/openssl/cms.py | 11 +++++++++++
src/_cffi_src/openssl/crypto.py | 1 -
src/_cffi_src/openssl/x509_vfy.py | 4 ++--
src/cryptography.egg-info/PKG-INFO | 2 +-
src/cryptography/__about__.py | 2 +-
src/cryptography/hazmat/bindings/openssl/_conditional.py | 5 +++++
src/cryptography/hazmat/bindings/openssl/binding.py | 2 +-
9 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 9518a3d..19bfad0 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,15 @@
Changelog
=========
+1.1.1 - 2015-11-19
+~~~~~~~~~~~~~~~~~~
+
+* Fixed several small bugs related to compiling the OpenSSL bindings with
+ unusual OpenSSL configurations.
+* Resolved an issue where, depending on the method of installation and
+ which Python interpreter they were using, users on El Capitan (OS X 10.11)
+ may have seen an ``InternalError`` on import.
+
1.1 - 2015-10-28
~~~~~~~~~~~~~~~~
diff --git a/PKG-INFO b/PKG-INFO
index 55ef53d..a5813ba 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: cryptography
-Version: 1.1
+Version: 1.1.1
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/_cffi_src/openssl/cms.py b/src/_cffi_src/openssl/cms.py
index f0da82d..fef7325 100644
--- a/src/_cffi_src/openssl/cms.py
+++ b/src/_cffi_src/openssl/cms.py
@@ -17,6 +17,7 @@ INCLUDES = """
TYPES = """
static const long Cryptography_HAS_CMS;
+static const long Cryptography_HAS_CMS_BIO_FUNCTIONS;
typedef ... CMS_ContentInfo;
typedef ... CMS_SignerInfo;
@@ -71,8 +72,18 @@ CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *, X509 *, EVP_PKEY *,
CUSTOMIZATIONS = """
#if !defined(OPENSSL_NO_CMS) && OPENSSL_VERSION_NUMBER >= 0x0090808fL
static const long Cryptography_HAS_CMS = 1;
+#if OPENSSL_VERSION_NUMBER < 0x10000000L
+static const long Cryptography_HAS_CMS_BIO_FUNCTIONS = 0;
+/* These functions were added in 1.0.0 */
+BIO *(*BIO_new_CMS)(BIO *, CMS_ContentInfo *) = NULL;
+int (*i2d_CMS_bio_stream)(BIO *, CMS_ContentInfo *, BIO *, int) = NULL;
+int (*PEM_write_bio_CMS_stream)(BIO *, CMS_ContentInfo *, BIO *, int) = NULL;
+#else
+static const long Cryptography_HAS_CMS_BIO_FUNCTIONS = 1;
+#endif
#else
static const long Cryptography_HAS_CMS = 0;
+static const long Cryptography_HAS_CMS_BIO_FUNCTIONS = 0;
typedef void CMS_ContentInfo;
typedef void CMS_SignerInfo;
typedef void CMS_CertificateChoices;
diff --git a/src/_cffi_src/openssl/crypto.py b/src/_cffi_src/openssl/crypto.py
index c66bbe3..3c04541 100644
--- a/src/_cffi_src/openssl/crypto.py
+++ b/src/_cffi_src/openssl/crypto.py
@@ -49,7 +49,6 @@ void OPENSSL_free(void *);
MACROS = """
void CRYPTO_add(int *, int, int);
void CRYPTO_malloc_init(void);
-void CRYPTO_malloc_debug_init(void);
"""
CUSTOMIZATIONS = """
diff --git a/src/_cffi_src/openssl/x509_vfy.py b/src/_cffi_src/openssl/x509_vfy.py
index 2f640b1..abc4c43 100644
--- a/src/_cffi_src/openssl/x509_vfy.py
+++ b/src/_cffi_src/openssl/x509_vfy.py
@@ -209,7 +209,7 @@ int X509_VERIFY_PARAM_set1_ip_asc(X509_VERIFY_PARAM *, const char *);
CUSTOMIZATIONS = """
/* OpenSSL 1.0.2+ verification error codes */
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER >= 0x10002002L && !defined(LIBRESSL_VERSION_NUMBER)
static const long Cryptography_HAS_102_VERIFICATION_ERROR_CODES = 1;
#else
static const long Cryptography_HAS_102_VERIFICATION_ERROR_CODES = 0;
@@ -225,7 +225,7 @@ static const long X509_V_ERR_IP_ADDRESS_MISMATCH = 0;
#endif
/* OpenSSL 1.0.2+ verification parameters */
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER >= 0x10002002L && !defined(LIBRESSL_VERSION_NUMBER)
static const long Cryptography_HAS_102_VERIFICATION_PARAMS = 1;
#else
static const long Cryptography_HAS_102_VERIFICATION_PARAMS = 0;
diff --git a/src/cryptography.egg-info/PKG-INFO b/src/cryptography.egg-info/PKG-INFO
index 55ef53d..a5813ba 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.1
+Version: 1.1.1
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/__about__.py b/src/cryptography/__about__.py
index 013ca3a..02e50ac 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.1"
+__version__ = "1.1.1"
__author__ = "The cryptography developers"
__email__ = "cryptography-dev at python.org"
diff --git a/src/cryptography/hazmat/bindings/openssl/_conditional.py b/src/cryptography/hazmat/bindings/openssl/_conditional.py
index 670710b..f0ad1d5 100644
--- a/src/cryptography/hazmat/bindings/openssl/_conditional.py
+++ b/src/cryptography/hazmat/bindings/openssl/_conditional.py
@@ -52,6 +52,11 @@ CONDITIONAL_NAMES = {
"CMS_USE_KEYID",
"CMS_DEBUG_DECRYPT",
],
+ "Cryptography_HAS_CMS_BIO_FUNCTIONS": [
+ "BIO_new_CMS",
+ "i2d_CMS_bio_stream",
+ "PEM_write_bio_CMS_stream",
+ ],
"Cryptography_HAS_EC": [
"OPENSSL_EC_NAMED_CURVE",
"EC_GROUP_new",
diff --git a/src/cryptography/hazmat/bindings/openssl/binding.py b/src/cryptography/hazmat/bindings/openssl/binding.py
index a750cd6..07b6b9a 100644
--- a/src/cryptography/hazmat/bindings/openssl/binding.py
+++ b/src/cryptography/hazmat/bindings/openssl/binding.py
@@ -39,7 +39,7 @@ def _openssl_assert(lib, ok):
raise InternalError(
"Unknown OpenSSL error. Please file an issue at https://github.com"
"/pyca/cryptography/issues with information on how to reproduce "
- "this.",
+ "this. ({0!r})".format(errors),
errors
)
--
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