Skip to content

Commit a8c3454

Browse files
committed
test: speedup bip324_cipher.py unit test
Executing the unit tests for the bip324_cipher.py module currently takes quite long (>60 seconds on my notebook). Most time here is spent in empty plaintext/ciphertext encryption/decryption loops: .... for _ in range(msg_idx): enc_aead.encrypt(b"", b"") ... for _ in range(msg_idx): enc_aead.decrypt(b"", bytes(16)) ... Their sole purpose is increasing the FSChaCha20Poly1305 packet counters in order to trigger rekeying, i.e. the actual encryption/decryption is not relevant, as the result is thrown away. This commit speeds up the tests by supporting to pass "None" as plaintext/ciphertext, indicating to the routines that no actual encryption/decryption should be done. master branch: $ python3 -m unittest ./test/functional/test_framework/crypto/bip324_cipher.py .. ---------------------------------------------------------------------- Ran 2 tests in 64.658s PR branch: $ python3 -m unittest ./test/functional/test_framework/crypto/bip324_cipher.py .. ---------------------------------------------------------------------- Ran 2 tests in 0.822s
1 parent 9eeee7c commit a8c3454

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

test/functional/test_framework/crypto/bip324_cipher.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ def pad16(x):
2525

2626
def aead_chacha20_poly1305_encrypt(key, nonce, aad, plaintext):
2727
"""Encrypt a plaintext using ChaCha20Poly1305."""
28+
if plaintext is None:
29+
return None
2830
ret = bytearray()
2931
msg_len = len(plaintext)
3032
for i in range((msg_len + 63) // 64):
@@ -42,7 +44,7 @@ def aead_chacha20_poly1305_encrypt(key, nonce, aad, plaintext):
4244

4345
def aead_chacha20_poly1305_decrypt(key, nonce, aad, ciphertext):
4446
"""Decrypt a ChaCha20Poly1305 ciphertext."""
45-
if len(ciphertext) < 16:
47+
if ciphertext is None or len(ciphertext) < 16:
4648
return None
4749
msg_len = len(ciphertext) - 16
4850
poly1305 = Poly1305(chacha20_block(key, nonce, 0)[:32])
@@ -191,11 +193,11 @@ def test_fschacha20poly1305aead(self):
191193
dec_aead = FSChaCha20Poly1305(key)
192194

193195
for _ in range(msg_idx):
194-
enc_aead.encrypt(b"", b"")
196+
enc_aead.encrypt(b"", None)
195197
ciphertext = enc_aead.encrypt(aad, plain)
196198
self.assertEqual(hex_cipher, ciphertext.hex())
197199

198200
for _ in range(msg_idx):
199-
dec_aead.decrypt(b"", bytes(16))
201+
dec_aead.decrypt(b"", None)
200202
plaintext = dec_aead.decrypt(aad, ciphertext)
201203
self.assertEqual(plain, plaintext)

0 commit comments

Comments
 (0)