summaryrefslogtreecommitdiff
path: root/security/py-cryptography
diff options
context:
space:
mode:
authorwiz <wiz>2015-08-17 15:55:28 +0000
committerwiz <wiz>2015-08-17 15:55:28 +0000
commitdaecf61765d333e6567fc97f0728bacdc2fd27fa (patch)
treec16ae18b3c94ab84d352d11f0ea5bcd72a8bab57 /security/py-cryptography
parentd5865d5de9fa45e12089a6c0c9fffa25b0f372c0 (diff)
downloadpkgsrc-daecf61765d333e6567fc97f0728bacdc2fd27fa.tar.gz
Update to 1.0:
1.0 - 2015-08-12 ~~~~~~~~~~~~~~~~ * Switched to the new `cffi`_ ``set_source`` out-of-line API mode for compilation. This results in significantly faster imports and lowered memory consumption. Due to this change we no longer support PyPy releases older than 2.6 nor do we support any released version of PyPy3 (until a version supporting cffi 1.0 comes out). * Fix parsing of OpenSSH public keys that have spaces in comments. * Support serialization of certificate signing requests using the ``public_bytes`` method of :class:`~cryptography.x509.CertificateSigningRequest`. * Support serialization of certificates using the ``public_bytes`` method of :class:`~cryptography.x509.Certificate`. * Add ``get_provisioning_uri`` method to :class:`~cryptography.hazmat.primitives.twofactor.hotp.HOTP` and :class:`~cryptography.hazmat.primitives.twofactor.totp.TOTP` for generating provisioning URIs. * Add :class:`~cryptography.hazmat.primitives.kdf.concatkdf.ConcatKDFHash` and :class:`~cryptography.hazmat.primitives.kdf.concatkdf.ConcatKDFHMAC`. * Raise a ``TypeError`` when passing objects that are not text as the value to :class:`~cryptography.x509.NameAttribute`. * Add support for :class:`~cryptography.x509.OtherName` as a general name type. * Added new X.509 extension support in :class:`~cryptography.x509.Certificate` The following new extensions are now supported: * :class:`~cryptography.x509.OCSPNoCheck` * :class:`~cryptography.x509.InhibitAnyPolicy` * :class:`~cryptography.x509.IssuerAlternativeName` * :class:`~cryptography.x509.NameConstraints` * Extension support was added to :class:`~cryptography.x509.CertificateSigningRequest`. * Add support for creating signed certificates with :class:`~cryptography.x509.CertificateBuilder`. This includes support for the following extensions: * :class:`~cryptography.x509.BasicConstraints` * :class:`~cryptography.x509.SubjectAlternativeName` * :class:`~cryptography.x509.KeyUsage` * :class:`~cryptography.x509.ExtendedKeyUsage` * :class:`~cryptography.x509.SubjectKeyIdentifier` * :class:`~cryptography.x509.AuthorityKeyIdentifier` * :class:`~cryptography.x509.AuthorityInformationAccess` * :class:`~cryptography.x509.CRLDistributionPoints` * :class:`~cryptography.x509.InhibitAnyPolicy` * :class:`~cryptography.x509.IssuerAlternativeName` * :class:`~cryptography.x509.OCSPNoCheck` * Add support for creating certificate signing requests with :class:`~cryptography.x509.CertificateSigningRequestBuilder`. This includes support for the same extensions supported in the ``CertificateBuilder``. * Deprecate ``encode_rfc6979_signature`` and ``decode_rfc6979_signature`` in favor of :func:`~cryptography.hazmat.primitives.asymmetric.utils.encode_dss_signature` and :func:`~cryptography.hazmat.primitives.asymmetric.utils.decode_dss_signature`.
Diffstat (limited to 'security/py-cryptography')
-rw-r--r--security/py-cryptography/Makefile4
-rw-r--r--security/py-cryptography/PLIST177
-rw-r--r--security/py-cryptography/distinfo11
-rw-r--r--security/py-cryptography/patches/patch-src_cryptography_hazmat_bindings_utils.py32
-rw-r--r--security/py-cryptography/patches/patch-src_cryptography_hazmat_primitives_constant__time.py15
-rw-r--r--security/py-cryptography/patches/patch-src_cryptography_hazmat_primitives_padding.py15
6 files changed, 37 insertions, 217 deletions
diff --git a/security/py-cryptography/Makefile b/security/py-cryptography/Makefile
index 0c22c4ae0ae..6ff5f2cfdeb 100644
--- a/security/py-cryptography/Makefile
+++ b/security/py-cryptography/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2015/07/14 08:51:47 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2015/08/17 15:55:28 wiz Exp $
-DISTNAME= cryptography-0.9.3
+DISTNAME= cryptography-1.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
CATEGORIES= security python
MASTER_SITES= https://pypi.python.org/packages/source/c/cryptography/
diff --git a/security/py-cryptography/PLIST b/security/py-cryptography/PLIST
index b550b8c7034..b087c9a9c4c 100644
--- a/security/py-cryptography/PLIST
+++ b/security/py-cryptography/PLIST
@@ -1,10 +1,9 @@
-@comment $NetBSD: PLIST,v 1.10 2015/07/14 08:51:47 wiz Exp $
+@comment $NetBSD: PLIST,v 1.11 2015/08/17 15:55:28 wiz Exp $
${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
-${PYSITELIB}/${EGG_INFODIR}/pbr.json
${PYSITELIB}/${EGG_INFODIR}/requires.txt
${PYSITELIB}/${EGG_INFODIR}/top_level.txt
${PYSITELIB}/cryptography/__about__.py
@@ -13,8 +12,6 @@ ${PYSITELIB}/cryptography/__about__.pyo
${PYSITELIB}/cryptography/__init__.py
${PYSITELIB}/cryptography/__init__.pyc
${PYSITELIB}/cryptography/__init__.pyo
-${PYSITELIB}/cryptography/constanttime.so
-${PYSITELIB}/cryptography/cryptography.so
${PYSITELIB}/cryptography/exceptions.py
${PYSITELIB}/cryptography/exceptions.pyc
${PYSITELIB}/cryptography/exceptions.pyo
@@ -84,152 +81,24 @@ ${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/_constant_time.so
+${PYSITELIB}/cryptography/hazmat/bindings/_openssl.so
+${PYSITELIB}/cryptography/hazmat/bindings/_padding.so
${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/__init__.py
${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/__init__.pyc
${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/__init__.pyo
${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/binding.py
${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/binding.pyc
${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/binding.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/cf.py
-${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/cf.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/cf.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/common_cryptor.py
-${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/common_cryptor.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/common_cryptor.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/common_digest.py
-${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/common_digest.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/common_digest.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/common_hmac.py
-${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/common_hmac.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/common_hmac.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/common_key_derivation.py
-${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/common_key_derivation.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/common_key_derivation.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/common_symmetric_key_wrap.py
-${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/common_symmetric_key_wrap.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/common_symmetric_key_wrap.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/secimport.py
-${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/secimport.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/secimport.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/secitem.py
-${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/secitem.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/secitem.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/seckey.py
-${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/seckey.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/seckey.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/seckeychain.py
-${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/seckeychain.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/seckeychain.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/sectransform.py
-${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/sectransform.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/commoncrypto/sectransform.pyo
${PYSITELIB}/cryptography/hazmat/bindings/openssl/__init__.py
${PYSITELIB}/cryptography/hazmat/bindings/openssl/__init__.pyc
${PYSITELIB}/cryptography/hazmat/bindings/openssl/__init__.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/aes.py
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/aes.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/aes.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/asn1.py
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/asn1.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/asn1.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/bignum.py
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/bignum.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/bignum.pyo
+${PYSITELIB}/cryptography/hazmat/bindings/openssl/_conditional.py
+${PYSITELIB}/cryptography/hazmat/bindings/openssl/_conditional.pyc
+${PYSITELIB}/cryptography/hazmat/bindings/openssl/_conditional.pyo
${PYSITELIB}/cryptography/hazmat/bindings/openssl/binding.py
${PYSITELIB}/cryptography/hazmat/bindings/openssl/binding.pyc
${PYSITELIB}/cryptography/hazmat/bindings/openssl/binding.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/bio.py
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/bio.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/bio.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/cmac.py
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/cmac.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/cmac.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/cms.py
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/cms.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/cms.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/conf.py
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/conf.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/conf.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/crypto.py
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/crypto.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/crypto.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/dh.py
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/dh.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/dh.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/dsa.py
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/dsa.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/dsa.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/ec.py
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/ec.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/ec.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/ecdh.py
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/ecdh.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/ecdh.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/ecdsa.py
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/ecdsa.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/ecdsa.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/engine.py
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/engine.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/engine.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/err.py
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/err.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/err.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/evp.py
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/evp.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/evp.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/hmac.py
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/hmac.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/hmac.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/nid.py
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/nid.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/nid.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/objects.py
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/objects.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/objects.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/opensslv.py
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/opensslv.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/opensslv.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/osrandom_engine.py
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/osrandom_engine.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/osrandom_engine.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/pem.py
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/pem.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/pem.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/pkcs12.py
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/pkcs12.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/pkcs12.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/pkcs7.py
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/pkcs7.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/pkcs7.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/rand.py
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/rand.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/rand.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/rsa.py
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/rsa.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/rsa.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/src/osrandom_engine.c
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/src/osrandom_engine.h
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/ssl.py
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/ssl.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/ssl.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/x509.py
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/x509.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/x509.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/x509_vfy.py
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/x509_vfy.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/x509_vfy.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/x509name.py
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/x509name.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/x509name.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/x509v3.py
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/x509v3.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/openssl/x509v3.pyo
-${PYSITELIB}/cryptography/hazmat/bindings/utils.py
-${PYSITELIB}/cryptography/hazmat/bindings/utils.pyc
-${PYSITELIB}/cryptography/hazmat/bindings/utils.pyo
${PYSITELIB}/cryptography/hazmat/primitives/__init__.py
${PYSITELIB}/cryptography/hazmat/primitives/__init__.pyc
${PYSITELIB}/cryptography/hazmat/primitives/__init__.pyo
@@ -284,6 +153,9 @@ ${PYSITELIB}/cryptography/hazmat/primitives/interfaces/__init__.pyo
${PYSITELIB}/cryptography/hazmat/primitives/kdf/__init__.py
${PYSITELIB}/cryptography/hazmat/primitives/kdf/__init__.pyc
${PYSITELIB}/cryptography/hazmat/primitives/kdf/__init__.pyo
+${PYSITELIB}/cryptography/hazmat/primitives/kdf/concatkdf.py
+${PYSITELIB}/cryptography/hazmat/primitives/kdf/concatkdf.pyc
+${PYSITELIB}/cryptography/hazmat/primitives/kdf/concatkdf.pyo
${PYSITELIB}/cryptography/hazmat/primitives/kdf/hkdf.py
${PYSITELIB}/cryptography/hazmat/primitives/kdf/hkdf.pyc
${PYSITELIB}/cryptography/hazmat/primitives/kdf/hkdf.pyo
@@ -296,10 +168,6 @@ ${PYSITELIB}/cryptography/hazmat/primitives/padding.pyo
${PYSITELIB}/cryptography/hazmat/primitives/serialization.py
${PYSITELIB}/cryptography/hazmat/primitives/serialization.pyc
${PYSITELIB}/cryptography/hazmat/primitives/serialization.pyo
-${PYSITELIB}/cryptography/hazmat/primitives/src/constant_time.c
-${PYSITELIB}/cryptography/hazmat/primitives/src/constant_time.h
-${PYSITELIB}/cryptography/hazmat/primitives/src/padding.c
-${PYSITELIB}/cryptography/hazmat/primitives/src/padding.h
${PYSITELIB}/cryptography/hazmat/primitives/twofactor/__init__.py
${PYSITELIB}/cryptography/hazmat/primitives/twofactor/__init__.pyc
${PYSITELIB}/cryptography/hazmat/primitives/twofactor/__init__.pyo
@@ -309,10 +177,27 @@ ${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/hazmat/primitives/twofactor/utils.py
+${PYSITELIB}/cryptography/hazmat/primitives/twofactor/utils.pyc
+${PYSITELIB}/cryptography/hazmat/primitives/twofactor/utils.pyo
${PYSITELIB}/cryptography/utils.py
${PYSITELIB}/cryptography/utils.pyc
${PYSITELIB}/cryptography/utils.pyo
-${PYSITELIB}/cryptography/x509.py
-${PYSITELIB}/cryptography/x509.pyc
-${PYSITELIB}/cryptography/x509.pyo
+${PYSITELIB}/cryptography/x509/__init__.py
+${PYSITELIB}/cryptography/x509/__init__.pyc
+${PYSITELIB}/cryptography/x509/__init__.pyo
+${PYSITELIB}/cryptography/x509/base.py
+${PYSITELIB}/cryptography/x509/base.pyc
+${PYSITELIB}/cryptography/x509/base.pyo
+${PYSITELIB}/cryptography/x509/extensions.py
+${PYSITELIB}/cryptography/x509/extensions.pyc
+${PYSITELIB}/cryptography/x509/extensions.pyo
+${PYSITELIB}/cryptography/x509/general_name.py
+${PYSITELIB}/cryptography/x509/general_name.pyc
+${PYSITELIB}/cryptography/x509/general_name.pyo
+${PYSITELIB}/cryptography/x509/name.py
+${PYSITELIB}/cryptography/x509/name.pyc
+${PYSITELIB}/cryptography/x509/name.pyo
+${PYSITELIB}/cryptography/x509/oid.py
+${PYSITELIB}/cryptography/x509/oid.pyc
+${PYSITELIB}/cryptography/x509/oid.pyo
diff --git a/security/py-cryptography/distinfo b/security/py-cryptography/distinfo
index bf98c7619a2..85be035b652 100644
--- a/security/py-cryptography/distinfo
+++ b/security/py-cryptography/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.19 2015/07/14 08:51:47 wiz Exp $
+$NetBSD: distinfo,v 1.20 2015/08/17 15:55:28 wiz Exp $
-SHA1 (cryptography-0.9.3.tar.gz) = 812bfcb7045916a202754c8819a2962ff170fa7c
-RMD160 (cryptography-0.9.3.tar.gz) = 553ff95796e0a0341f76c65bd146456b390337ab
-Size (cryptography-0.9.3.tar.gz) = 303075 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) = 26320f2a5c8a756476e4e61a136adf79a2d3d3d1
+SHA1 (cryptography-1.0.tar.gz) = 53b79a748ac89c0a3bb5c50079959fffbb35efb6
+RMD160 (cryptography-1.0.tar.gz) = fa5a28709349b896bdb8d0b0747aec3cd65dd4d5
+Size (cryptography-1.0.tar.gz) = 331438 bytes
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
deleted file mode 100644
index e1cb525cbc2..00000000000
--- a/security/py-cryptography/patches/patch-src_cryptography_hazmat_bindings_utils.py
+++ /dev/null
@@ -1,32 +0,0 @@
-$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
deleted file mode 100644
index 6f753570dbd..00000000000
--- a/security/py-cryptography/patches/patch-src_cryptography_hazmat_primitives_constant__time.py
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
deleted file mode 100644
index 9f392fc8833..00000000000
--- a/security/py-cryptography/patches/patch-src_cryptography_hazmat_primitives_padding.py
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_cryptography_hazmat_primitives_padding.py,v 1.2 2015/03/15 21:10:16 wiz Exp $
-
-Fix soname so cffi doesn't invent one for each python version + platform.
-
---- src/cryptography/hazmat/primitives/padding.py.orig 2015-03-09 04:49:14.000000000 +0000
-+++ src/cryptography/hazmat/primitives/padding.py
-@@ -22,7 +22,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='padding')
- _lib = LazyLibrary(_ffi)
-
-