diff options
| author | michael-hart <michael.hart1994@gmail.com> | 2014-09-26 00:32:25 +0100 |
|---|---|---|
| committer | michael-hart <michael.hart1994@gmail.com> | 2014-09-26 00:32:25 +0100 |
| commit | cd76c42245efd4dd4c779db28fde7de467493e13 (patch) | |
| tree | b9b6afc2d228fd5098c02dd077ab7ef7e914a00a /cryptography | |
| parent | a3204baf9bcfd2288d049c4f27e75c535b4397ed (diff) | |
| download | cryptography-cd76c42245efd4dd4c779db28fde7de467493e13.tar.gz cryptography-cd76c42245efd4dd4c779db28fde7de467493e13.tar.bz2 cryptography-cd76c42245efd4dd4c779db28fde7de467493e13.zip | |
Added all changes lost in merge reset
Diffstat (limited to 'cryptography')
| -rw-r--r-- | cryptography/hazmat/backends/interfaces.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cryptography/hazmat/backends/interfaces.py b/cryptography/hazmat/backends/interfaces.py index 187d7fc5..dc720ad3 100644 --- a/cryptography/hazmat/backends/interfaces.py +++ b/cryptography/hazmat/backends/interfaces.py @@ -282,7 +282,7 @@ class PEMSerializationBackend(object): """ @abc.abstractmethod - def load_pem_public_key(self, data, password): + def load_pem_public_key(self, data): """ Loads a public key from PEM encoded data. """ @@ -303,6 +303,6 @@ class PKCS8SerializationBackend(object): @abc.abstractmethod def load_pkcs8_pem_private_key(self, data, password): """ - Load a private key from PEM encoded data, using password if the data + Load a private key from PKCS8 encoded data, using password if the data is encrypted. """ |