diff options
| author | Jonas Schnelli <dev@jonasschnelli.ch> | 2019-05-10 09:26:02 +0200 |
|---|---|---|
| committer | Jonas Schnelli <dev@jonasschnelli.ch> | 2019-05-10 09:26:23 +0200 |
| commit | 695141bf7a3203ff9e6dc09b7d17c998c63920e6 (patch) | |
| tree | c45279700b91cc0b0cee210bb634c72202d01087 /src/Makefile.bench.include | |
| parent | 79046d574980c4660f7600d11b3ca6e3729eb5e3 (diff) | |
| parent | 2dfe2751713c814aea53b5a7563eb74ad1baea00 (diff) | |
Merge #15512: Add ChaCha20 encryption option (XOR)
2dfe27517 Add ChaCha20 bench (Jonas Schnelli)
2bc2b8b49 Add ChaCha20 encryption option (XOR) (Jonas Schnelli)
Pull request description:
The current ChaCha20 implementation does not support message encryption (it can only output the keystream which is sufficient for the RNG).
This PR adds the actual XORing of the `plaintext` with the `keystream` in order to return the desired `ciphertext`.
Required for v2 message transport protocol.
ACKs for commit 2dfe27:
jnewbery:
Looks good. utACK 2dfe2751713c814aea53b5a7563eb74ad1baea00.
jnewbery:
utACK 2dfe2751713c814aea53b5a7563eb74ad1baea00
sipa:
utACK 2dfe2751713c814aea53b5a7563eb74ad1baea00
ryanofsky:
utACK 2dfe2751713c814aea53b5a7563eb74ad1baea00. Changes since last review are just renaming the Crypt method, adding comments, and simplifying the benchmark.
Tree-SHA512: 84bb234da2ca9fdc44bc29a786d9dd215520f81245270c1aef801ef66b6091b7793e2eb38ad6dbb084925245065c5dce9e5582f2d0fa220ab3e182d43412d5b5
Diffstat (limited to 'src/Makefile.bench.include')
| -rw-r--r-- | src/Makefile.bench.include | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Makefile.bench.include b/src/Makefile.bench.include index ae7eb19ceb..ef8a207841 100644 --- a/src/Makefile.bench.include +++ b/src/Makefile.bench.include @@ -21,6 +21,7 @@ bench_bench_bitcoin_SOURCES = \ bench/duplicate_inputs.cpp \ bench/examples.cpp \ bench/rollingbloom.cpp \ + bench/chacha20.cpp \ bench/crypto_hash.cpp \ bench/ccoins_caching.cpp \ bench/gcs_filter.cpp \ |