Update to 0.7.1:

0.7.1 - 2014-12-28
~~~~~~~~~~~~~~~~~~

* Fixed an issue preventing compilation on platforms where ``OPENSSL_NO_SSL3``
  was defined.

0.7 - 2014-12-17
~~~~~~~~~~~~~~~~

* Cryptography has been relicensed from the Apache Software License, Version
  2.0, to being available under *either* the Apache Software License, Version
  2.0, or the BSD license.
* Added key-rotation support to :doc:`Fernet </fernet>` with
  :class:`~cryptography.fernet.MultiFernet`.
* More bit-lengths are now support for ``p`` and ``q`` when loading DSA keys
  from numbers.
* Added :class:`~cryptography.hazmat.primitives.interfaces.MACContext` as a
  common interface for CMAC and HMAC and deprecated
  :class:`~cryptography.hazmat.primitives.interfaces.CMACContext`.
* Added support for encoding and decoding :rfc:`6979` signatures in
  :doc:`/hazmat/primitives/asymmetric/utils`.
* Added
  :func:`~cryptography.hazmat.primitives.serialization.load_ssh_public_key` to
  support the loading of OpenSSH public keys (:rfc:`4253`). Only RSA and DSA
  keys are currently supported.
* Added initial support for X.509 certificate parsing. See the
  :doc:`X.509 documentation</x509>` for more information.

9 files changed, 85 insertions, 59 deletions

diff --git a/security/py-cryptography/Makefile b/security/py-cryptography/Makefile
index a7125d5adbc..7ccbf5dcb69 100644
--- a/security/py-cryptography/Makefile
+++ b/security/py-cryptography/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2014/10/20 11:21:06 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2015/01/03 16:00:55 wiz Exp $
 
-DISTNAME=	cryptography-0.6.1
+DISTNAME=	cryptography-0.7.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	security python
 MASTER_SITES=	https://pypi.python.org/packages/source/c/cryptography/
@@ -8,7 +8,7 @@ MASTER_SITES=	https://pypi.python.org/packages/source/c/cryptography/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pypi.python.org/pypi/cryptography/
 COMMENT=	Cryptographic recipes and primitives for Python
-LICENSE=	apache-2.0
+LICENSE=	apache-2.0 OR modified-bsd
 
 DEPENDS+=	${PYPKGPREFIX}-cffi>=0.8:../../devel/py-cffi
 DEPENDS+=	${PYPKGPREFIX}-cparser>=2.10:../../devel/py-cparser
diff --git a/security/py-cryptography/PLIST b/security/py-cryptography/PLIST
index 79891713c9c..8475adf59aa 100644
--- a/security/py-cryptography/PLIST
+++ b/security/py-cryptography/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2014/10/20 11:21:06 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2015/01/03 16:00:55 wiz Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -12,7 +12,6 @@ ${PYSITELIB}/cryptography/__about__.pyo
 ${PYSITELIB}/cryptography/__init__.py
 ${PYSITELIB}/cryptography/__init__.pyc
 ${PYSITELIB}/cryptography/__init__.pyo
-${PYSITELIB}/cryptography/checkpkcs7padding.so
 ${PYSITELIB}/cryptography/constanttime.so
 ${PYSITELIB}/cryptography/cryptography.so
 ${PYSITELIB}/cryptography/exceptions.py
@@ -78,10 +77,15 @@ ${PYSITELIB}/cryptography/hazmat/backends/openssl/rsa.pyo
 ${PYSITELIB}/cryptography/hazmat/backends/openssl/utils.py
 ${PYSITELIB}/cryptography/hazmat/backends/openssl/utils.pyc
 ${PYSITELIB}/cryptography/hazmat/backends/openssl/utils.pyo
+${PYSITELIB}/cryptography/hazmat/backends/openssl/x509.py
+${PYSITELIB}/cryptography/hazmat/backends/openssl/x509.pyc
+${PYSITELIB}/cryptography/hazmat/backends/openssl/x509.pyo
 ${PYSITELIB}/cryptography/hazmat/bindings/__init__.py
 ${PYSITELIB}/cryptography/hazmat/bindings/__init__.pyc
 ${PYSITELIB}/cryptography/hazmat/bindings/__init__.pyo
+${PYSITELIB}/cryptography/hazmat/bindings/__pycache__/constanttime.c
 ${PYSITELIB}/cryptography/hazmat/bindings/__pycache__/cryptography.hazmat.bindings.openssl.x509_vfy.c
+${PYSITELIB}/cryptography/hazmat/bindings/__pycache__/padding.c
 ${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/__init__.py
 ${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/__init__.pyc
 ${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/__init__.pyo
@@ -223,8 +227,6 @@ ${PYSITELIB}/cryptography/hazmat/bindings/utils.pyo
 ${PYSITELIB}/cryptography/hazmat/primitives/__init__.py
 ${PYSITELIB}/cryptography/hazmat/primitives/__init__.pyc
 ${PYSITELIB}/cryptography/hazmat/primitives/__init__.pyo
-${PYSITELIB}/cryptography/hazmat/primitives/__pycache__/checkpkcs7padding.c
-${PYSITELIB}/cryptography/hazmat/primitives/__pycache__/constanttime.c
 ${PYSITELIB}/cryptography/hazmat/primitives/asymmetric/__init__.py
 ${PYSITELIB}/cryptography/hazmat/primitives/asymmetric/__init__.pyc
 ${PYSITELIB}/cryptography/hazmat/primitives/asymmetric/__init__.pyo
@@ -240,6 +242,9 @@ ${PYSITELIB}/cryptography/hazmat/primitives/asymmetric/padding.pyo
 ${PYSITELIB}/cryptography/hazmat/primitives/asymmetric/rsa.py
 ${PYSITELIB}/cryptography/hazmat/primitives/asymmetric/rsa.pyc
 ${PYSITELIB}/cryptography/hazmat/primitives/asymmetric/rsa.pyo
+${PYSITELIB}/cryptography/hazmat/primitives/asymmetric/utils.py
+${PYSITELIB}/cryptography/hazmat/primitives/asymmetric/utils.pyc
+${PYSITELIB}/cryptography/hazmat/primitives/asymmetric/utils.pyo
 ${PYSITELIB}/cryptography/hazmat/primitives/ciphers/__init__.py
 ${PYSITELIB}/cryptography/hazmat/primitives/ciphers/__init__.pyc
 ${PYSITELIB}/cryptography/hazmat/primitives/ciphers/__init__.pyo
@@ -293,6 +298,10 @@ ${PYSITELIB}/cryptography/hazmat/primitives/twofactor/hotp.pyo
 ${PYSITELIB}/cryptography/hazmat/primitives/twofactor/totp.py
 ${PYSITELIB}/cryptography/hazmat/primitives/twofactor/totp.pyc
 ${PYSITELIB}/cryptography/hazmat/primitives/twofactor/totp.pyo
+${PYSITELIB}/cryptography/padding.so
 ${PYSITELIB}/cryptography/utils.py
 ${PYSITELIB}/cryptography/utils.pyc
 ${PYSITELIB}/cryptography/utils.pyo
+${PYSITELIB}/cryptography/x509.py
+${PYSITELIB}/cryptography/x509.pyc
+${PYSITELIB}/cryptography/x509.pyo
diff --git a/security/py-cryptography/distinfo b/security/py-cryptography/distinfo
index 590a7430d77..9b89eb12ff0 100644
--- a/security/py-cryptography/distinfo
+++ b/security/py-cryptography/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2014/10/20 11:21:06 wiz Exp $
+$NetBSD: distinfo,v 1.11 2015/01/03 16:00:55 wiz Exp $
 
-SHA1 (cryptography-0.6.1.tar.gz) = ebebd789e70a9106095a693a031fd3f2f1a44026
-RMD160 (cryptography-0.6.1.tar.gz) = f0bb192e7c3a90bb1a88dcbc1705b336b7071d30
-Size (cryptography-0.6.1.tar.gz) = 236721 bytes
-SHA1 (patch-cryptography_hazmat_bindings_utils.py) = 4f4f53262efac03ea2b93c1338fed00aef4dc9cc
-SHA1 (patch-cryptography_hazmat_primitives_constant__time.py) = 2af2bed42ba2d8a3eca3898abf17715066664f82
-SHA1 (patch-cryptography_hazmat_primitives_padding.py) = f840dbde2109dee89632bf4bc5b893521971d640
+SHA1 (cryptography-0.7.1.tar.gz) = 02f7d6b197e6424498e83587d59e3ba2ada6c379
+RMD160 (cryptography-0.7.1.tar.gz) = fc272e0f192573e74846bf81b45845d885d41c24
+Size (cryptography-0.7.1.tar.gz) = 247309 bytes
+SHA1 (patch-src_cryptography_hazmat_bindings_utils.py) = 1dbe88db3f1af4dd1b5836d9f353223d532d79bb
+SHA1 (patch-src_cryptography_hazmat_primitives_constant__time.py) = dae1d27d76589a0f1f4236e4b8a311bb44c43185
+SHA1 (patch-src_cryptography_hazmat_primitives_padding.py) = 994ee7d82ad59b9e3d28eaf4b192c17820d13323
diff --git a/security/py-cryptography/patches/patch-cryptography_hazmat_bindings_utils.py b/security/py-cryptography/patches/patch-cryptography_hazmat_bindings_utils.py
deleted file mode 100644
index 39eb575d28f..00000000000
--- a/security/py-cryptography/patches/patch-cryptography_hazmat_bindings_utils.py
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-cryptography_hazmat_bindings_utils.py,v 1.2 2014/05/06 10:30:54 wiz Exp $
-
-Fix soname so cffi doesn't invent one for each python version + platform.
-
---- cryptography/hazmat/bindings/utils.py.orig	2014-05-03 14:19:18.000000000 +0000
-+++ cryptography/hazmat/bindings/utils.py
-@@ -73,7 +73,7 @@ def build_ffi(module_prefix, modules, pr
-     )
-     lib = ffi.verify(
-         source=source,
--        modulename=_create_modulename(cdef_sources, source, sys.version),
-+        modulename=module_name,
-         libraries=libraries,
-         ext_package="cryptography",
-         extra_compile_args=extra_compile_args,
diff --git a/security/py-cryptography/patches/patch-cryptography_hazmat_primitives_constant__time.py b/security/py-cryptography/patches/patch-cryptography_hazmat_primitives_constant__time.py
deleted file mode 100644
index 377b51f0fb4..00000000000
--- a/security/py-cryptography/patches/patch-cryptography_hazmat_primitives_constant__time.py
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-cryptography_hazmat_primitives_constant__time.py,v 1.2 2014/05/06 10:30:54 wiz Exp $
-
-Fix soname so cffi doesn't invent one for each python version + platform.
-
---- cryptography/hazmat/primitives/constant_time.py.orig	2014-05-03 14:19:18.000000000 +0000
-+++ cryptography/hazmat/primitives/constant_time.py
-@@ -51,7 +51,7 @@ _ffi = cffi.FFI()
- _ffi.cdef(TYPES)
- _lib = _ffi.verify(
-     source=FUNCTIONS,
--    modulename=_create_modulename([TYPES], FUNCTIONS, sys.version),
-+    modulename="constanttime",
-     ext_package="cryptography",
- )
- 
diff --git a/security/py-cryptography/patches/patch-cryptography_hazmat_primitives_padding.py b/security/py-cryptography/patches/patch-cryptography_hazmat_primitives_padding.py
deleted file mode 100644
index efbd51e8445..00000000000
--- a/security/py-cryptography/patches/patch-cryptography_hazmat_primitives_padding.py
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-cryptography_hazmat_primitives_padding.py,v 1.2 2014/05/06 10:30:54 wiz Exp $
-
-Fix soname so cffi doesn't invent one for each python version + platform.
-
---- cryptography/hazmat/primitives/padding.py.orig	2014-05-03 14:19:18.000000000 +0000
-+++ cryptography/hazmat/primitives/padding.py
-@@ -71,7 +71,7 @@ _ffi = cffi.FFI()
- _ffi.cdef(TYPES)
- _lib = _ffi.verify(
-     source=FUNCTIONS,
--    modulename=_create_modulename([TYPES], FUNCTIONS, sys.version),
-+    modulename="checkpkcs7padding",
-     ext_package="cryptography",
- )
- 
diff --git a/security/py-cryptography/patches/patch-src_cryptography_hazmat_bindings_utils.py b/security/py-cryptography/patches/patch-src_cryptography_hazmat_bindings_utils.py
new file mode 100644
index 00000000000..e1cb525cbc2
--- /dev/null
+++ b/security/py-cryptography/patches/patch-src_cryptography_hazmat_bindings_utils.py
@@ -0,0 +1,32 @@
+$NetBSD: patch-src_cryptography_hazmat_bindings_utils.py,v 1.1 2015/01/03 16:00:55 wiz Exp $
+
+Fix soname so cffi doesn't invent one for each python version + platform.
+
+--- src/cryptography/hazmat/bindings/utils.py.orig	2014-12-29 01:46:47.000000000 +0000
++++ src/cryptography/hazmat/bindings/utils.py
+@@ -93,6 +93,7 @@ def build_ffi_for_binding(module_prefix,
+         cdef_source="\n".join(types + functions + macros),
+         verify_source=verify_source,
+         libraries=libraries,
++        module_name=module_name,
+         extra_compile_args=extra_compile_args,
+         extra_link_args=extra_link_args,
+     )
+@@ -100,7 +101,7 @@ def build_ffi_for_binding(module_prefix,
+     return ffi
+ 
+ 
+-def build_ffi(cdef_source, verify_source, libraries=[], extra_compile_args=[],
++def build_ffi(cdef_source, verify_source, module_name, libraries=[], extra_compile_args=[],
+               extra_link_args=[]):
+     ffi = FFI()
+     ffi.cdef(cdef_source)
+@@ -109,7 +110,7 @@ def build_ffi(cdef_source, verify_source
+         ffi,
+         verify_source,
+         tmpdir='',
+-        modulename=_create_modulename(cdef_source, verify_source, sys.version),
++        modulename=module_name,
+         libraries=libraries,
+         ext_package="cryptography",
+         extra_compile_args=extra_compile_args,
diff --git a/security/py-cryptography/patches/patch-src_cryptography_hazmat_primitives_constant__time.py b/security/py-cryptography/patches/patch-src_cryptography_hazmat_primitives_constant__time.py
new file mode 100644
index 00000000000..6f753570dbd
--- /dev/null
+++ b/security/py-cryptography/patches/patch-src_cryptography_hazmat_primitives_constant__time.py
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_cryptography_hazmat_primitives_constant__time.py,v 1.1 2015/01/03 16:00:55 wiz Exp $
+
+Fix soname so cffi doesn't invent one for each python version + platform.
+
+--- src/cryptography/hazmat/primitives/constant_time.py.orig	2014-12-29 01:46:47.000000000 +0000
++++ src/cryptography/hazmat/primitives/constant_time.py
+@@ -17,7 +17,7 @@ with open(os.path.join(os.path.dirname(_
+     FUNCTIONS = f.read()
+ 
+ 
+-_ffi = build_ffi(cdef_source=TYPES, verify_source=FUNCTIONS)
++_ffi = build_ffi(cdef_source=TYPES, verify_source=FUNCTIONS, module_name='constanttime')
+ _lib = LazyLibrary(_ffi)
+ 
+ 
diff --git a/security/py-cryptography/patches/patch-src_cryptography_hazmat_primitives_padding.py b/security/py-cryptography/patches/patch-src_cryptography_hazmat_primitives_padding.py
new file mode 100644
index 00000000000..17e2ae3ded3
--- /dev/null
+++ b/security/py-cryptography/patches/patch-src_cryptography_hazmat_primitives_padding.py
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_cryptography_hazmat_primitives_padding.py,v 1.1 2015/01/03 16:00:55 wiz Exp $
+
+Fix soname so cffi doesn't invent one for each python version + platform.
+
+--- src/cryptography/hazmat/primitives/padding.py.orig	2014-12-29 01:46:47.000000000 +0000
++++ src/cryptography/hazmat/primitives/padding.py
+@@ -55,7 +55,7 @@ uint8_t Cryptography_check_pkcs7_padding
+ """
+ 
+ 
+-_ffi = build_ffi(cdef_source=TYPES, verify_source=FUNCTIONS)
++_ffi = build_ffi(cdef_source=TYPES, verify_source=FUNCTIONS, module_name='padding')
+ _lib = LazyLibrary(_ffi)
+ 
+