diff options
Diffstat (limited to 'src/OpenSSL/crypto.py')
-rw-r--r-- | src/OpenSSL/crypto.py | 71 |
1 files changed, 0 insertions, 71 deletions
diff --git a/src/OpenSSL/crypto.py b/src/OpenSSL/crypto.py index b8d636f..5a734cc 100644 --- a/src/OpenSSL/crypto.py +++ b/src/OpenSSL/crypto.py @@ -11,7 +11,6 @@ from six import ( from cryptography import x509 from cryptography.hazmat.primitives.asymmetric import dsa, rsa -from cryptography.utils import deprecated from OpenSSL._util import ( ffi as _ffi, @@ -367,13 +366,6 @@ class PKey(object): return _lib.EVP_PKEY_bits(self._pkey) -PKeyType = deprecated( - PKey, __name__, - "PKeyType has been deprecated, use PKey instead", - DeprecationWarning -) - - class _EllipticCurve(object): """ A representation of a supported elliptic curve. @@ -706,13 +698,6 @@ class X509Name(object): return result -X509NameType = deprecated( - X509Name, __name__, - "X509NameType has been deprecated, use X509Name instead", - DeprecationWarning -) - - class X509Extension(object): """ An X.509 v3 certificate extension. @@ -864,13 +849,6 @@ class X509Extension(object): return _ffi.buffer(char_result, result_length)[:] -X509ExtensionType = deprecated( - X509Extension, __name__, - "X509ExtensionType has been deprecated, use X509Extension instead", - DeprecationWarning -) - - class X509Req(object): """ An X.509 certificate signing requests. @@ -1070,13 +1048,6 @@ class X509Req(object): return result -X509ReqType = deprecated( - X509Req, __name__, - "X509ReqType has been deprecated, use X509Req instead", - DeprecationWarning -) - - class X509(object): """ An X.509 certificate. @@ -1543,13 +1514,6 @@ class X509(object): return ext -X509Type = deprecated( - X509, __name__, - "X509Type has been deprecated, use X509 instead", - DeprecationWarning -) - - class X509StoreFlags(object): """ Flags for X509 verification, used to change the behavior of @@ -1684,13 +1648,6 @@ class X509Store(object): _openssl_assert(_lib.X509_STORE_set1_param(self._store, param) != 0) -X509StoreType = deprecated( - X509Store, __name__, - "X509StoreType has been deprecated, use X509Store instead", - DeprecationWarning -) - - class X509StoreContextError(Exception): """ An exception raised when an error occurred while verifying a certificate @@ -2338,13 +2295,6 @@ class CRL(object): return dump_crl(type, self) -CRLType = deprecated( - CRL, __name__, - "CRLType has been deprecated, use CRL instead", - DeprecationWarning -) - - class PKCS7(object): def type_is_signed(self): """ @@ -2389,13 +2339,6 @@ class PKCS7(object): return _ffi.string(string_type) -PKCS7Type = deprecated( - PKCS7, __name__, - "PKCS7Type has been deprecated, use PKCS7 instead", - DeprecationWarning -) - - class PKCS12(object): """ A PKCS #12 archive. @@ -2570,13 +2513,6 @@ class PKCS12(object): return _bio_to_string(bio) -PKCS12Type = deprecated( - PKCS12, __name__, - "PKCS12Type has been deprecated, use PKCS12 instead", - DeprecationWarning -) - - class NetscapeSPKI(object): """ A Netscape SPKI object. @@ -2667,13 +2603,6 @@ class NetscapeSPKI(object): _openssl_assert(set_result == 1) -NetscapeSPKIType = deprecated( - NetscapeSPKI, __name__, - "NetscapeSPKIType has been deprecated, use NetscapeSPKI instead", - DeprecationWarning -) - - class _PassphraseHelper(object): def __init__(self, type, passphrase, more_args=False, truncate=False): if type != FILETYPE_PEM and passphrase is not None: |