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:27 +0100 |
| commit | 801e8c1b88b77e9feb8ad57af166c4b52b15f22a (patch) | |
| tree | 0e5cabb33f221649e12de0a39fed9f2385d156d2 /tests/hazmat/backends/test_multibackend.py | |
| parent | b45731b94d7a50b4b4ca39e6a571fc5c19f509b4 (diff) | |
| download | cryptography-801e8c1b88b77e9feb8ad57af166c4b52b15f22a.tar.gz cryptography-801e8c1b88b77e9feb8ad57af166c4b52b15f22a.tar.bz2 cryptography-801e8c1b88b77e9feb8ad57af166c4b52b15f22a.zip | |
Added all changes lost in merge reset
Diffstat (limited to 'tests/hazmat/backends/test_multibackend.py')
| -rw-r--r-- | tests/hazmat/backends/test_multibackend.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/hazmat/backends/test_multibackend.py b/tests/hazmat/backends/test_multibackend.py index 655acc44..e4a05aae 100644 --- a/tests/hazmat/backends/test_multibackend.py +++ b/tests/hazmat/backends/test_multibackend.py @@ -217,6 +217,9 @@ class DummyPEMSerializationBackend(object): def load_pem_private_key(self, data, password): pass + def load_pem_public_key(self, data): + pass + class TestMultiBackend(object): def test_ciphers(self): @@ -532,7 +535,10 @@ class TestMultiBackend(object): backend = MultiBackend([DummyPEMSerializationBackend()]) backend.load_pem_private_key(b"keydata", None) + backend.load_pem_public_key(b"keydata") backend = MultiBackend([]) with raises_unsupported_algorithm(_Reasons.UNSUPPORTED_SERIALIZATION): backend.load_pem_private_key(b"keydata", None) + with raises_unsupported_algorithm(_Reasons.UNSUPPORTED_SERIALIZATION): + backend.load_pem_public_key(b"keydata") |