diff options
| author | michael-hart <michael.hart1994@gmail.com> | 2014-09-23 23:10:32 +0100 |
|---|---|---|
| committer | michael-hart <michael.hart1994@gmail.com> | 2014-09-26 18:40:27 +0100 |
| commit | 2ca899115b80dba47b65a8255bbbce1cce2ce238 (patch) | |
| tree | ad628532f0bcefc258a88ce3c383dddce53a9e37 /cryptography | |
| parent | fe2cd085cffe05fbdec02164a93de7812acb44dd (diff) | |
| download | cryptography-2ca899115b80dba47b65a8255bbbce1cce2ce238.tar.gz cryptography-2ca899115b80dba47b65a8255bbbce1cce2ce238.tar.bz2 cryptography-2ca899115b80dba47b65a8255bbbce1cce2ce238.zip | |
Part 1 of rebase, with corrections for pep8
Diffstat (limited to 'cryptography')
| -rw-r--r-- | cryptography/hazmat/backends/interfaces.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cryptography/hazmat/backends/interfaces.py b/cryptography/hazmat/backends/interfaces.py index dc720ad3..f3d64820 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): + def load_pem_public_key(self, data, password): """ Loads a public key from PEM encoded data. """ |