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