7083N/AUpstream patch that addresses

7083N/A

7083N/A https://github.com/pyca/cryptography/issues/2710

7083N/A

7083N/Awhich is already fixed in cryptography 1.3 and above.

7083N/A

7083N/Acommit 0639db99c916e61ac8ee2687c4a9d37c7c67ba76

7083N/AAuthor: Alex Gaynor <alex.gaynor@gmail.com>

7083N/ADate: Sat Feb 6 13:39:16 2016 -0500

7083N/A

7083N/A Fixes #2710 -- silence a deprecation warning.

7083N/A

7083N/A Use the new name and alias to the old one

7083N/A

7083N/Adiff --git a/src/cryptography/x509/__init__.py b/src/cryptography/x509/__init__.py

7083N/Aindex a1deb7f..787f1a6 100644

7083N/A--- a/src/cryptography/x509/__init__.py

7083N/A+++ b/src/cryptography/x509/__init__.py

7083N/A@@ -4,6 +4,7 @@

7083N/A

7083N/A from __future__ import absolute_import, division, print_function

7083N/A

7083N/A+from cryptography import utils

7083N/A from cryptography.x509.base import (

7083N/A Certificate, CertificateBuilder, CertificateRevocationList,

7083N/A CertificateRevocationListBuilder,

7083N/A@@ -30,12 +31,19 @@ from cryptography.x509.general_name import (

7083N/A )

7083N/A from cryptography.x509.name import Name, NameAttribute

7083N/A from cryptography.x509.oid import (

7083N/A- AuthorityInformationAccessOID, CRLEntryExtensionOID, CRLExtensionOID,

7083N/A+ AuthorityInformationAccessOID, CRLEntryExtensionOID,

7083N/A CertificatePoliciesOID, ExtendedKeyUsageOID, ExtensionOID, NameOID,

7083N/A ObjectIdentifier, SignatureAlgorithmOID, _SIG_OIDS_TO_HASH

7083N/A )

7083N/A

7083N/A

7083N/A+CRLExtensionOID = utils.deprecated(

7083N/A+ CRLEntryExtensionOID,

7083N/A+ __name__,

7083N/A+ "CRLExtensionOID has been renamed to CRLEntryExtensionOID",

7083N/A+ utils.DeprecatedIn12

7083N/A+)

7083N/A+

7083N/A OID_AUTHORITY_INFORMATION_ACCESS = ExtensionOID.AUTHORITY_INFORMATION_ACCESS

7083N/A OID_AUTHORITY_KEY_IDENTIFIER = ExtensionOID.AUTHORITY_KEY_IDENTIFIER

7083N/A OID_BASIC_CONSTRAINTS = ExtensionOID.BASIC_CONSTRAINTS