Updated py-cryptography to 1.8.1.

1.8.1 - 2017-03-10
~~~~~~~~~~~~~~~~~~

* Fixed macOS wheels to properly link against 1.1.0 rather than 1.0.2.

1.8 - 2017-03-09
~~~~~~~~~~~~~~~~

* Added support for Python 3.6.
* Windows and macOS wheels now link against OpenSSL 1.1.0.
* macOS wheels are no longer universal. This change significantly shrinks the
  size of the wheels. Users on macOS 32-bit Python (if there are any) should
  migrate to 64-bit or build their own packages.
* Changed ASN.1 dependency from ``pyasn1`` to ``asn1crypto`` resulting in a
  general performance increase when encoding/decoding ASN.1 structures. Also,
  the ``pyasn1_modules`` test dependency is no longer required.
* Added support for
  :meth:`~cryptography.hazmat.primitives.ciphers.CipherContext.update_into` on
  :class:`~cryptography.hazmat.primitives.ciphers.CipherContext`.
* Added
  :meth:`~cryptography.hazmat.primitives.asymmetric.dh.DHPrivateKeyWithSerialization.private_bytes`
  to
  :class:`~cryptography.hazmat.primitives.asymmetric.dh.DHPrivateKeyWithSerialization`.
* Added
  :meth:`~cryptography.hazmat.primitives.asymmetric.dh.DHPublicKeyWithSerialization.public_bytes`
  to
  :class:`~cryptography.hazmat.primitives.asymmetric.dh.DHPublicKeyWithSerialization`.
* :func:`~cryptography.hazmat.primitives.serialization.load_pem_private_key`
  and
  :func:`~cryptography.hazmat.primitives.serialization.load_der_private_key`
  now require that ``password`` must be bytes if provided. Previously this
  was documented but not enforced.
* Added support for subgroup order in :doc:`/hazmat/primitives/asymmetric/dh`.

3 files changed, 10 insertions, 36 deletions

diff --git a/security/py-cryptography/Makefile b/security/py-cryptography/Makefile
index 53c1347bd7d..dc2ee17c10d 100644
--- a/security/py-cryptography/Makefile
+++ b/security/py-cryptography/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2017/01/28 11:15:07 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2017/03/13 09:42:25 wiz Exp $
 
-DISTNAME=	cryptography-1.7.2
+DISTNAME=	cryptography-1.8.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	security python
 MASTER_SITES=	${MASTER_SITE_PYPI:=c/cryptography/}
 
@@ -11,7 +10,7 @@ HOMEPAGE=	https://pypi.python.org/pypi/cryptography/
 COMMENT=	Cryptographic recipes and primitives for Python
 LICENSE=	apache-2.0 OR modified-bsd
 
-DEPENDS+=	${PYPKGPREFIX}-asn1-[0-9]*:../../security/py-asn1
+DEPENDS+=	${PYPKGPREFIX}-asn1crypto-[0-9]*:../../security/py-asn1crypto
 DEPENDS+=	${PYPKGPREFIX}-cffi>=1.8.2:../../devel/py-cffi
 DEPENDS+=	${PYPKGPREFIX}-cparser>=2.10:../../devel/py-cparser
 DEPENDS+=	${PYPKGPREFIX}-idna-[0-9]*:../../www/py-idna
@@ -23,7 +22,6 @@ BUILD_DEPENDS+=	${PYPKGPREFIX}-requests>=0.8:../../devel/py-requests
 BUILD_DEPENDS+=	${PYPKGPREFIX}-test>=0.8:../../devel/py-test
 BUILD_DEPENDS+=	${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
 BUILD_DEPENDS+=	${PYPKGPREFIX}-cryptography_vectors-[0-9]*:../../security/py-cryptography_vectors
-BUILD_DEPENDS+=	${PYPKGPREFIX}-asn1-modules-[0-9]*:../../security/py-asn1-modules
 
 .include "../../lang/python/pyversion.mk"
 
@@ -32,6 +30,8 @@ DEPENDS+=	${PYPKGPREFIX}-enum34-[0-9]*:../../devel/py-enum34
 DEPENDS+=	${PYPKGPREFIX}-ipaddress-[0-9]*:../../net/py-ipaddress
 .endif
 
+# two test failures in 1.8.1
+# https://github.com/pyca/cryptography/issues/3445
 do-test:
 	cd ${WRKSRC} && py.test-${PYVERSSUFFIX}
 
diff --git a/security/py-cryptography/distinfo b/security/py-cryptography/distinfo
index 025a97a0e55..8ce035f0551 100644
--- a/security/py-cryptography/distinfo
+++ b/security/py-cryptography/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.39 2017/01/28 11:15:07 wiz Exp $
+$NetBSD: distinfo,v 1.40 2017/03/13 09:42:25 wiz Exp $
 
-SHA1 (cryptography-1.7.2.tar.gz) = 2b5bc62fda71992633f83164b1a74c16a784acdf
-RMD160 (cryptography-1.7.2.tar.gz) = ca1bf254944ec846cfd0af124001601a3052bedf
-SHA512 (cryptography-1.7.2.tar.gz) = 8ddd119385064e1f8288ff318ec16f500b5c125a3811ccb306aeb2664fac495fcdd3cb5a7cbacd10156505c9526b9cdbd66860b35bbcd2f9a6bb285dd6cba8c5
-Size (cryptography-1.7.2.tar.gz) = 420867 bytes
-SHA1 (patch-src___cffi__src_openssl_callbacks.py) = 476517c3ed673a6dfe4f809622d8b8b034214528
+SHA1 (cryptography-1.8.1.tar.gz) = d15ffd42ca41260a61bc80cbeccf24e2dbf44253
+RMD160 (cryptography-1.8.1.tar.gz) = 674dd4bcdddb501e6f6907d0d874dd475f032af8
+SHA512 (cryptography-1.8.1.tar.gz) = 273c8ca4ad6c9d1151a8a731d148d02e619e14e37df25dc26030b0a90f895b88fbf4d3e320aec5ea7af4a8fcc58f720c61f48968f912c69156d4e0e794743345
+Size (cryptography-1.8.1.tar.gz) = 423560 bytes
diff --git a/security/py-cryptography/patches/patch-src___cffi__src_openssl_callbacks.py b/security/py-cryptography/patches/patch-src___cffi__src_openssl_callbacks.py
deleted file mode 100644
index 8ac910dc794..00000000000
--- a/security/py-cryptography/patches/patch-src___cffi__src_openssl_callbacks.py
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-src___cffi__src_openssl_callbacks.py,v 1.1 2017/01/28 11:15:07 wiz Exp $
-
-Use static callbacks with Python 3.x again #3350
-https://github.com/pyca/cryptography/pull/3350
-
---- src/_cffi_src/openssl/callbacks.py.orig	2017-01-27 15:10:32.000000000 +0000
-+++ src/_cffi_src/openssl/callbacks.py
-@@ -4,8 +4,6 @@
- 
- from __future__ import absolute_import, division, print_function
- 
--import sys
--
- import cffi
- 
- INCLUDES = """
-@@ -50,7 +48,7 @@ CUSTOMIZATIONS = """
- static const long Cryptography_STATIC_CALLBACKS = 1;
- """
- 
--if cffi.__version_info__ < (1, 4, 0) or sys.version_info >= (3, 5):
-+if cffi.__version_info__ < (1, 4, 0):
-     # backwards compatibility for old cffi version on PyPy
-     # and Python >=3.5 (https://github.com/pyca/cryptography/issues/2970)
-     TYPES = "static const long Cryptography_STATIC_CALLBACKS;"