|
1 Upstream patch that addresses |
|
2 |
|
3 https://github.com/pyca/cryptography/issues/2710 |
|
4 |
|
5 which is already fixed in cryptography 1.3 and above. |
|
6 |
|
7 commit 0639db99c916e61ac8ee2687c4a9d37c7c67ba76 |
|
8 Author: Alex Gaynor <[email protected]> |
|
9 Date: Sat Feb 6 13:39:16 2016 -0500 |
|
10 |
|
11 Fixes #2710 -- silence a deprecation warning. |
|
12 |
|
13 Use the new name and alias to the old one |
|
14 |
|
15 diff --git a/src/cryptography/x509/__init__.py b/src/cryptography/x509/__init__.py |
|
16 index a1deb7f..787f1a6 100644 |
|
17 --- a/src/cryptography/x509/__init__.py |
|
18 +++ b/src/cryptography/x509/__init__.py |
|
19 @@ -4,6 +4,7 @@ |
|
20 |
|
21 from __future__ import absolute_import, division, print_function |
|
22 |
|
23 +from cryptography import utils |
|
24 from cryptography.x509.base import ( |
|
25 Certificate, CertificateBuilder, CertificateRevocationList, |
|
26 CertificateRevocationListBuilder, |
|
27 @@ -30,12 +31,19 @@ from cryptography.x509.general_name import ( |
|
28 ) |
|
29 from cryptography.x509.name import Name, NameAttribute |
|
30 from cryptography.x509.oid import ( |
|
31 - AuthorityInformationAccessOID, CRLEntryExtensionOID, CRLExtensionOID, |
|
32 + AuthorityInformationAccessOID, CRLEntryExtensionOID, |
|
33 CertificatePoliciesOID, ExtendedKeyUsageOID, ExtensionOID, NameOID, |
|
34 ObjectIdentifier, SignatureAlgorithmOID, _SIG_OIDS_TO_HASH |
|
35 ) |
|
36 |
|
37 |
|
38 +CRLExtensionOID = utils.deprecated( |
|
39 + CRLEntryExtensionOID, |
|
40 + __name__, |
|
41 + "CRLExtensionOID has been renamed to CRLEntryExtensionOID", |
|
42 + utils.DeprecatedIn12 |
|
43 +) |
|
44 + |
|
45 OID_AUTHORITY_INFORMATION_ACCESS = ExtensionOID.AUTHORITY_INFORMATION_ACCESS |
|
46 OID_AUTHORITY_KEY_IDENTIFIER = ExtensionOID.AUTHORITY_KEY_IDENTIFIER |
|
47 OID_BASIC_CONSTRAINTS = ExtensionOID.BASIC_CONSTRAINTS |