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 18:40:28 +0100 |
| commit | 254811fd619188610298485a66885784944c1de8 (patch) | |
| tree | 0e5cabb33f221649e12de0a39fed9f2385d156d2 /cryptography | |
| parent | 2ca899115b80dba47b65a8255bbbce1cce2ce238 (diff) | |
| download | cryptography-254811fd619188610298485a66885784944c1de8.tar.gz cryptography-254811fd619188610298485a66885784944c1de8.tar.bz2 cryptography-254811fd619188610298485a66885784944c1de8.zip | |
Added all changes lost in merge reset
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 f3d64820..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. """ |