diff options
| author | Victor Shyba <victor1984@riseup.net> | 2016-12-07 01:24:53 -0300 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2016-12-12 09:17:52 -0200 |
| commit | b3fcc5c5bddc73475596c4fe74e3402f0d5c021a (patch) | |
| tree | 4bc267958b05c0fc21caed24131ee606c22ae861 /testing/tests/benchmarks | |
| parent | 349a49d2be011a428023a4ece14001fda57e65c4 (diff) | |
[feature] Add retro compat on secrets.py ciphers
Integrated the secrets's JSON key that specifies ciphers into _crypto
and added optional GCM. Also added a test to check if both cipher types
can be imported.
Resolves: #8680
Signed-off-by: Victor Shyba <victor1984@riseup.net>
Diffstat (limited to 'testing/tests/benchmarks')
| -rw-r--r-- | testing/tests/benchmarks/test_crypto.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/testing/tests/benchmarks/test_crypto.py b/testing/tests/benchmarks/test_crypto.py index 631ac041..8ee9b899 100644 --- a/testing/tests/benchmarks/test_crypto.py +++ b/testing/tests/benchmarks/test_crypto.py @@ -66,8 +66,8 @@ def create_raw_decryption(size): @pytest.mark.benchmark(group="test_crypto_raw_decrypt") def test_raw_decrypt(benchmark, payload): key = payload(32) - iv, tag, ciphertext = _crypto.encrypt_sym(payload(size), key) - benchmark(_crypto.decrypt_sym, ciphertext, key, iv, tag) + iv, ciphertext = _crypto.encrypt_sym(payload(size), key) + benchmark(_crypto.decrypt_sym, ciphertext, key, iv) return test_raw_decrypt |