diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2020-04-05 21:00:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-05 20:00:55 -0500 |
| commit | 3b2102af549c1095d5478bb1243ee4cf76b9762b (patch) | |
| tree | 3bfb4c6e1dc5f56566a4428803698923c77bc9bf /src | |
| parent | e94a9f493b208b83982ff2378272879e74829f4f (diff) | |
| download | cryptography-3b2102af549c1095d5478bb1243ee4cf76b9762b.tar.gz cryptography-3b2102af549c1095d5478bb1243ee4cf76b9762b.tar.bz2 cryptography-3b2102af549c1095d5478bb1243ee4cf76b9762b.zip | |
Removed deprecated behavior in AKI.from_issuer_subject_key_identifier (#5182)
Diffstat (limited to 'src')
| -rw-r--r-- | src/cryptography/utils.py | 1 | ||||
| -rw-r--r-- | src/cryptography/x509/extensions.py | 16 |
2 files changed, 1 insertions, 16 deletions
diff --git a/src/cryptography/utils.py b/src/cryptography/utils.py index 698b492d..ff4f81d2 100644 --- a/src/cryptography/utils.py +++ b/src/cryptography/utils.py @@ -22,7 +22,6 @@ class CryptographyDeprecationWarning(UserWarning): # cycle ends. PersistentlyDeprecated2017 = CryptographyDeprecationWarning PersistentlyDeprecated2019 = CryptographyDeprecationWarning -DeprecatedIn27 = CryptographyDeprecationWarning def _check_bytes(name, value): diff --git a/src/cryptography/x509/extensions.py b/src/cryptography/x509/extensions.py index ad90e9b7..1b96ffd7 100644 --- a/src/cryptography/x509/extensions.py +++ b/src/cryptography/x509/extensions.py @@ -8,7 +8,6 @@ import abc import datetime import hashlib import ipaddress -import warnings from enum import Enum import six @@ -213,21 +212,8 @@ class AuthorityKeyIdentifier(object): @classmethod def from_issuer_subject_key_identifier(cls, ski): - if isinstance(ski, SubjectKeyIdentifier): - digest = ski.digest - else: - digest = ski.value.digest - warnings.warn( - "Extension objects are deprecated as arguments to " - "from_issuer_subject_key_identifier and support will be " - "removed soon. Please migrate to passing a " - "SubjectKeyIdentifier directly.", - utils.DeprecatedIn27, - stacklevel=2, - ) - return cls( - key_identifier=digest, + key_identifier=ski.digest, authority_cert_issuer=None, authority_cert_serial_number=None ) |