components/python/cryptography/patches/01-deprecation-fix.patch
author Laszlo Peter <laszlo.peter@oracle.com>
Wed, 07 Sep 2016 14:47:15 -0700
changeset 6858 0f8601e37dad
permissions -rw-r--r--
PSARC 2016/455 OpenStack service updates for Mitaka 24488026 Update OpenStack to the Mitaka release (umbrella)
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
6858
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
     1
Upstream patch that addresses
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
     2
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
     3
	https://github.com/pyca/cryptography/issues/2710
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
     4
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
     5
which is already fixed in cryptography 1.3 and above.
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
     6
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
     7
commit 0639db99c916e61ac8ee2687c4a9d37c7c67ba76
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
     8
Author: Alex Gaynor <[email protected]>
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
     9
Date:   Sat Feb 6 13:39:16 2016 -0500
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    10
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    11
    Fixes #2710 -- silence a deprecation warning.
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    12
    
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    13
    Use the new name and alias to the old one
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    14
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    15
diff --git a/src/cryptography/x509/__init__.py b/src/cryptography/x509/__init__.py
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    16
index a1deb7f..787f1a6 100644
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    17
--- a/src/cryptography/x509/__init__.py
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    18
+++ b/src/cryptography/x509/__init__.py
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    19
@@ -4,6 +4,7 @@
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    20
 
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    21
 from __future__ import absolute_import, division, print_function
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    22
 
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    23
+from cryptography import utils
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    24
 from cryptography.x509.base import (
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    25
     Certificate, CertificateBuilder, CertificateRevocationList,
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    26
     CertificateRevocationListBuilder,
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    27
@@ -30,12 +31,19 @@ from cryptography.x509.general_name import (
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    28
 )
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    29
 from cryptography.x509.name import Name, NameAttribute
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    30
 from cryptography.x509.oid import (
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    31
-    AuthorityInformationAccessOID, CRLEntryExtensionOID, CRLExtensionOID,
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    32
+    AuthorityInformationAccessOID, CRLEntryExtensionOID,
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    33
     CertificatePoliciesOID, ExtendedKeyUsageOID, ExtensionOID, NameOID,
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    34
     ObjectIdentifier, SignatureAlgorithmOID, _SIG_OIDS_TO_HASH
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    35
 )
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    36
 
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    37
 
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    38
+CRLExtensionOID = utils.deprecated(
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    39
+    CRLEntryExtensionOID,
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    40
+    __name__,
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    41
+    "CRLExtensionOID has been renamed to CRLEntryExtensionOID",
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    42
+    utils.DeprecatedIn12
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    43
+)
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    44
+
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    45
 OID_AUTHORITY_INFORMATION_ACCESS = ExtensionOID.AUTHORITY_INFORMATION_ACCESS
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    46
 OID_AUTHORITY_KEY_IDENTIFIER = ExtensionOID.AUTHORITY_KEY_IDENTIFIER
0f8601e37dad PSARC 2016/455 OpenStack service updates for Mitaka
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    47
 OID_BASIC_CONSTRAINTS = ExtensionOID.BASIC_CONSTRAINTS