aboutsummaryrefslogtreecommitdiffstats
path: root/src/cryptography/hazmat/primitives/serialization.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/cryptography/hazmat/primitives/serialization.py')
-rw-r--r--src/cryptography/hazmat/primitives/serialization.py26
1 files changed, 0 insertions, 26 deletions
diff --git a/src/cryptography/hazmat/primitives/serialization.py b/src/cryptography/hazmat/primitives/serialization.py
index f080ea86..083f17e5 100644
--- a/src/cryptography/hazmat/primitives/serialization.py
+++ b/src/cryptography/hazmat/primitives/serialization.py
@@ -6,9 +6,7 @@ from __future__ import absolute_import, division, print_function
import base64
import struct
-import warnings
-from cryptography import utils
from cryptography.exceptions import UnsupportedAlgorithm
from cryptography.hazmat.primitives.asymmetric.dsa import (
DSAParameterNumbers, DSAPublicNumbers
@@ -16,30 +14,6 @@ from cryptography.hazmat.primitives.asymmetric.dsa import (
from cryptography.hazmat.primitives.asymmetric.rsa import RSAPublicNumbers
-def load_pem_traditional_openssl_private_key(data, password, backend):
- warnings.warn(
- "load_pem_traditional_openssl_private_key is deprecated and will be "
- "removed in a future version, use load_pem_private_key instead.",
- utils.DeprecatedIn06,
- stacklevel=2
- )
-
- return backend.load_traditional_openssl_pem_private_key(
- data, password
- )
-
-
-def load_pem_pkcs8_private_key(data, password, backend):
- warnings.warn(
- "load_pem_pkcs8_private_key is deprecated and will be removed in a "
- "future version, use load_pem_private_key instead.",
- utils.DeprecatedIn06,
- stacklevel=2
- )
-
- return backend.load_pkcs8_pem_private_key(data, password)
-
-
def load_pem_private_key(data, password, backend):
return backend.load_pem_private_key(data, password)