commit 51a05d665ebc7d11fadb739923dbbfee9bc587cc
author Alexander Gaynor <alex.gaynor@gmail.com> Sat Jul 19 10:55:22 2014 -0700
committer Alexander Gaynor <alex.gaynor@gmail.com> Sat Jul 19 10:55:22 2014 -0700
tree 0f8095127630c1767ff7325dcdc75936f35610cb
parent 2bf11cdc18d244fdf1620120cfb56f1b529e0c7d
parent ad116e26d102651ab6dc2752ae21afb92b72ad6f

Merge branch 'master' into pem-loading-backend

cryptography/hazmat/backends/interfaces.py

diff --git a/cryptography/hazmat/backends/interfaces.py b/cryptography/hazmat/backends/interfaces.py
index 75d9af6..3761e25 100644
--- a/cryptography/hazmat/backends/interfaces.py
+++ b/cryptography/hazmat/backends/interfaces.py
@@ -273,6 +273,16 @@
 
 
 @six.add_metaclass(abc.ABCMeta)
+class PEMSerializationBackend(object):
+    @abc.abstractmethod
+    def load_pem_private_key(self, data, password):
+        """
+        Loads a private key from PEM encoded data, using the provided password
+        if the data is encrypted.
+        """
+
+
+@six.add_metaclass(abc.ABCMeta)
 class TraditionalOpenSSLSerializationBackend(object):
     @abc.abstractmethod
     def load_traditional_openssl_pem_private_key(self, data, password):