diff options
| author | Ayrx <terrycwk1994@gmail.com> | 2014-04-21 11:49:58 +0800 |
|---|---|---|
| committer | Ayrx <terrycwk1994@gmail.com> | 2014-04-22 12:12:41 +0800 |
| commit | 9eff2e55e216e10a3a60e664a14e14f6a24551c6 (patch) | |
| tree | ba57ce48ee4b02843bc32e669c3094e7679ceee1 | |
| parent | 458cfd5df6902f4ee427fa0ca0eb67a8031b204c (diff) | |
| download | cryptography-9eff2e55e216e10a3a60e664a14e14f6a24551c6.tar.gz cryptography-9eff2e55e216e10a3a60e664a14e14f6a24551c6.tar.bz2 cryptography-9eff2e55e216e10a3a60e664a14e14f6a24551c6.zip | |
Removed multibackend changes for another PR
| -rw-r--r-- | cryptography/hazmat/backends/multibackend.py | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/cryptography/hazmat/backends/multibackend.py b/cryptography/hazmat/backends/multibackend.py index 2d75fd11..903bcceb 100644 --- a/cryptography/hazmat/backends/multibackend.py +++ b/cryptography/hazmat/backends/multibackend.py @@ -16,13 +16,12 @@ from __future__ import absolute_import, division, print_function from cryptography import utils from cryptography.exceptions import UnsupportedAlgorithm, _Reasons from cryptography.hazmat.backends.interfaces import ( - CipherBackend, CMACBackend, DSABackend, HMACBackend, HashBackend, + CipherBackend, DSABackend, HMACBackend, HashBackend, PBKDF2HMACBackend, RSABackend ) @utils.register_interface(CipherBackend) -@utils.register_interface(CMACBackend) @utils.register_interface(HashBackend) @utils.register_interface(HMACBackend) @utils.register_interface(PBKDF2HMACBackend) @@ -157,11 +156,3 @@ class MultiBackend(object): return b.generate_dsa_private_key(parameters) raise UnsupportedAlgorithm("DSA is not supported by the backend", _Reasons.UNSUPPORTED_PUBLIC_KEY_ALGORITHM) - - def cmac_algorithm_supported(self, algorithm): - for b in self._filtered_backends(CMACBackend): - return b.cmac_algorithm_supported(algorithm) - - def create_cmac_ctx(self, algorithm): - for b in self._filtered_backends(CMACBackend): - return b.create_cmac_ctx(algorithm) |