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.py12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/cryptography/hazmat/primitives/serialization.py b/src/cryptography/hazmat/primitives/serialization.py
index 992fd42f..bd09e6e3 100644
--- a/src/cryptography/hazmat/primitives/serialization.py
+++ b/src/cryptography/hazmat/primitives/serialization.py
@@ -24,6 +24,10 @@ def load_pem_public_key(data, backend):
return backend.load_pem_public_key(data)
+def load_pem_parameters(data, backend):
+ return backend.load_pem_parameters(data)
+
+
def load_der_private_key(data, password, backend):
return backend.load_der_private_key(data, password)
@@ -32,6 +36,10 @@ def load_der_public_key(data, backend):
return backend.load_der_public_key(data)
+def load_der_parameters(data, backend):
+ return backend.load_der_parameters(data)
+
+
def load_ssh_public_key(data, backend):
key_parts = data.split(b' ', 2)
@@ -178,6 +186,10 @@ class PublicFormat(Enum):
OpenSSH = "OpenSSH"
+class ParameterFormat(Enum):
+ PKCS3 = "PKCS3"
+
+
@six.add_metaclass(abc.ABCMeta)
class KeySerializationEncryption(object):
pass