17.1.0:

Backward-incompatible changes:
- Removed the deprecated OpenSSL.rand.egd() function.
  Applications should prefer os.urandom() for random number generation.
- Removed the deprecated default digest argument to OpenSSL.crypto.CRL.export().
  Callers must now always pass an explicit digest.
- Fixed a bug with ASN1_TIME casting in X509.set_notBefore(),
  X509.set_notAfter(), Revoked.set_rev_date(), Revoked.set_nextUpdate(),
  and Revoked.set_lastUpdate(). You must now pass times in the form
  YYYYMMDDhhmmssZ. YYYYMMDDhhmmss+hhmm and YYYYMMDDhhmmss-hhmm
  will no longer work.

Deprecations:
- Deprecated the legacy "Type" aliases: ContextType, ConnectionType, PKeyType, X509NameType, X509ExtensionType, X509ReqType, X509Type, X509StoreType, CRLType, PKCS7Type, PKCS12Type, NetscapeSPKIType.
  The names without the "Type"-suffix should be used instead.

Changes:
- Added OpenSSL.crypto.X509.from_cryptography() and OpenSSL.crypto.X509.to_cryptography() for converting X.509 certificate to and from pyca/cryptography objects.
- Added OpenSSL.crypto.X509Req.from_cryptography(), OpenSSL.crypto.X509Req.to_cryptography(), OpenSSL.crypto.CRL.from_cryptography(), and OpenSSL.crypto.CRL.to_cryptography() for converting X.509 CSRs and CRLs to and from pyca/cryptography objects.
- Added OpenSSL.debug that allows to get an overview of used library versions (including linked OpenSSL) and other useful runtime information using python -m OpenSSL.debug.
- Added a fallback path to Context.set_default_verify_paths() to accommodate the upcoming release of cryptography manylinux1 wheels.

3 files changed, 22 insertions, 15 deletions

diff --git a/security/py-OpenSSL/Makefile b/security/py-OpenSSL/Makefile
index 7a729f54ef6..f99dae79752 100644
--- a/security/py-OpenSSL/Makefile
+++ b/security/py-OpenSSL/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.42 2017/07/03 11:07:59 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2017/07/03 19:37:52 adam Exp $
 
-DISTNAME=	pyOpenSSL-17.0.0
+DISTNAME=	pyOpenSSL-17.1.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
 CATEGORIES=	security python
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyOpenSSL/}
@@ -15,10 +15,14 @@ DEPENDS+=	${PYPKGPREFIX}-six>=1.5.2:../../lang/py-six
 # TEST_DEPENDS
 BUILD_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 
-# https://github.com/pyca/pyopenssl/issues/596
-# https://github.com/pyca/pyopenssl/issues/650
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "Darwin"
+do-test:
+	cd ${WRKSRC} && PYTHONPATH=src py.test-${PYVERSSUFFIX} -v -k "not test_verify_with_time and not test_set_default_verify_paths and not test_set_verify_callback_exception"
+.else
 do-test:
 	cd ${WRKSRC} && PYTHONPATH=src py.test-${PYVERSSUFFIX} -v -k "not load_privatekey_passphrase_exception and not test_load_privatekey_wrongPassphraseCallback and not test_load_privatekey_passphraseCallback and not test_load_privatekey_passphrase_wrong_return_type and not test_load_privatekey_passphrase_callback_length and not test_dump_privatekey_passphrase_callback and not test_dump_privatekey_passphrase_exception and not test_dump_privatekey_passphraseCallbackLength and not test_set_passwd_cb and not test_passwd_callback_exception and not test_passwd_callback_false and not test_passwd_callback_non_string and not test_passwd_callback_too_long and not test_set_info_callback and not test_load_verify_bytes_cafile and not test_load_verify_unicode_cafile and not test_load_verify_directory_bytes_capath and not test_load_verify_directory_unicode_capath and not test_set_default_verify_paths and not test_set_verify_callback_connection_argument and not test_no_servername and not test_servername and not test_npn_success and not test_npn_client_fail and not test_npn_select_error and not test_npn_advertise_error and not test_alpn_success and not test_alpn_set_on_connection and not test_alpn_server_fail and not test_alpn_callback_exception and not test_get_peer_cert_chain and not test_memory_connect and not test_outgoing_overflow and not test_set_empty_ca_list and not test_set_one_ca_list and not test_set_multiple_ca_list and not test_reset_ca_list and not test_mutated_ca_list and not test_one_add_client and not test_multiple_add_client_ca and not test_set_and_add_client_ca and not test_set_after_add_client_ca and not test_client_negotiates_without_server and not test_client_receives_servers_data and not test_callbacks_are_invoked_with_connections and not test_opaque_data_is_passed_through and not test_server_returns_empty_string and not test_client_returns_false_terminates_handshake and not test_exceptions_in_client_bubble_up and not test_exceptions_in_server_bubble_up and not test_server_must_return_bytes"
+.endif
 
 .include "../../lang/python/egg.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/security/py-OpenSSL/PLIST b/security/py-OpenSSL/PLIST
index 213e5f574d5..d9449b99932 100644
--- a/security/py-OpenSSL/PLIST
+++ b/security/py-OpenSSL/PLIST
@@ -1,4 +1,9 @@
-@comment $NetBSD: PLIST,v 1.12 2016/04/20 16:05:57 leot Exp $
+@comment $NetBSD: PLIST,v 1.13 2017/07/03 19:37:52 adam Exp $
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/OpenSSL/SSL.py
 ${PYSITELIB}/OpenSSL/SSL.pyc
 ${PYSITELIB}/OpenSSL/SSL.pyo
@@ -11,6 +16,9 @@ ${PYSITELIB}/OpenSSL/_util.pyo
 ${PYSITELIB}/OpenSSL/crypto.py
 ${PYSITELIB}/OpenSSL/crypto.pyc
 ${PYSITELIB}/OpenSSL/crypto.pyo
+${PYSITELIB}/OpenSSL/debug.py
+${PYSITELIB}/OpenSSL/debug.pyc
+${PYSITELIB}/OpenSSL/debug.pyo
 ${PYSITELIB}/OpenSSL/rand.py
 ${PYSITELIB}/OpenSSL/rand.pyc
 ${PYSITELIB}/OpenSSL/rand.pyo
@@ -20,8 +28,3 @@ ${PYSITELIB}/OpenSSL/tsafe.pyo
 ${PYSITELIB}/OpenSSL/version.py
 ${PYSITELIB}/OpenSSL/version.pyc
 ${PYSITELIB}/OpenSSL/version.pyo
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
diff --git a/security/py-OpenSSL/distinfo b/security/py-OpenSSL/distinfo
index c95a165e246..53217ff57da 100644
--- a/security/py-OpenSSL/distinfo
+++ b/security/py-OpenSSL/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.14 2017/05/09 16:49:07 adam Exp $
+$NetBSD: distinfo,v 1.15 2017/07/03 19:37:52 adam Exp $
 
-SHA1 (pyOpenSSL-17.0.0.tar.gz) = c782f9da1845bdf80212d23e253ab46ffab9ed3b
-RMD160 (pyOpenSSL-17.0.0.tar.gz) = d0bc9de9f695ace84205d4cff761be086d66e63e
-SHA512 (pyOpenSSL-17.0.0.tar.gz) = 819be95f920a70b40ae48ed6740bd1d8cd3bf2fc080f682db8978946929994cb87ac467e220267dcdafc40aa7ed2cce51a334a49b06c1e2665d295157181ddad
-Size (pyOpenSSL-17.0.0.tar.gz) = 167121 bytes
+SHA1 (pyOpenSSL-17.1.0.tar.gz) = 84691af678965c6936b9927071269a54dbc961de
+RMD160 (pyOpenSSL-17.1.0.tar.gz) = 6417659d9c0d74026c4d1be6e816671ed008da88
+SHA512 (pyOpenSSL-17.1.0.tar.gz) = 1ede4e3426005174b1a782902c9ea28b7dc2aa845a8dbb99b290069cda27985eba009b600389b7f40cdc36fcf45b66ebfe96aa9b0d136c574a83f6d035b73672
+Size (pyOpenSSL-17.1.0.tar.gz) = 170669 bytes
 SHA1 (patch-tests_memdbg.py) = 0cca9c930a8f6065205ed28ec6d2551b45f4d606