diff options
| author | David Reid <dreid@dreid.org> | 2014-05-28 14:44:58 -0700 |
|---|---|---|
| committer | David Reid <dreid@dreid.org> | 2014-06-03 10:05:38 -0700 |
| commit | 30cbba7a13e4352fae4949c0924768866de3d049 (patch) | |
| tree | 4c3cbeedf2b70611a944bfaeb94c6cb427080ac6 | |
| parent | 576a15393fd3efb1512926c5ce1884b602104539 (diff) | |
| download | cryptography-30cbba7a13e4352fae4949c0924768866de3d049.tar.gz cryptography-30cbba7a13e4352fae4949c0924768866de3d049.tar.bz2 cryptography-30cbba7a13e4352fae4949c0924768866de3d049.zip | |
Semantic conflict resolution anyone?
| -rw-r--r-- | tests/hazmat/backends/test_multibackend.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/hazmat/backends/test_multibackend.py b/tests/hazmat/backends/test_multibackend.py index d4c89be3..b399837d 100644 --- a/tests/hazmat/backends/test_multibackend.py +++ b/tests/hazmat/backends/test_multibackend.py @@ -111,7 +111,8 @@ class DummyRSABackend(object): pass def encrypt_rsa(self, public_key, plaintext, padding): - + pass + def load_rsa_numbers(self, numbers): pass |