Skip to content

Commit

Permalink
delete the internal kangarootwelve bindings
Browse files Browse the repository at this point in the history
My kangarootwelve_xkcp crate was originally derived from these bindings,
but today it's better maintained and easier to build. This also improves
the performance of the very long K12 benchmark.
  • Loading branch information
oconnor663 committed Dec 8, 2022
1 parent ef1e7ba commit 0a4f1c2
Show file tree
Hide file tree
Showing 33 changed files with 6 additions and 7,196 deletions.
4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,16 @@ edition = "2018"
# only controls whether blake2b_simd and blake2s_simd build with no_std.
default = ["std"]
std = ["blake2b_simd/std", "blake2s_simd/std"]
# only for benchmarks
kangarootwelve = ["kangarootwelve_xkcp"]

[dependencies]
arrayvec = "0.7.0"
blake2b_simd = { path = "./blake2b", default-features = false }
blake2s_simd = { path = "./blake2s", default-features = false }
blake2-avx2-sneves = { path = "benches/blake2-avx2-sneves", optional = true }
hex = "0.3.2"
kangarootwelve = { path = "benches/kangarootwelve", optional = true }
kangarootwelve_xkcp = { version = "0.1.5", optional = true }
lazy_static = "1.3.0"
libsodium-ffi = { version = "0.1.17", optional = true }
openssl = { version = "0.10.23", optional = true }
Expand Down
6 changes: 3 additions & 3 deletions benches/bench.rs
Original file line number Diff line number Diff line change
Expand Up @@ -361,20 +361,20 @@ fn bench_long_sneves_blake2sp(b: &mut Bencher) {
#[bench]
fn bench_verylong_kangarootwelve(b: &mut Bencher) {
let mut input = RandomInput::new(b, VERYLONG);
b.iter(|| kangarootwelve::kangarootwelve(input.get()));
b.iter(|| kangarootwelve_xkcp::hash(input.get()));
}

#[cfg(feature = "kangarootwelve")]
#[bench]
fn bench_long_kangarootwelve(b: &mut Bencher) {
let mut input = RandomInput::new(b, LONG);
b.iter(|| kangarootwelve::kangarootwelve(input.get()));
b.iter(|| kangarootwelve_xkcp::hash(input.get()));
}

#[cfg(feature = "kangarootwelve")]
#[bench]
fn bench_onebyte_kangarootwelve(b: &mut Bencher) {
b.iter(|| kangarootwelve::kangarootwelve(b"x"));
b.iter(|| kangarootwelve_xkcp::hash(b"x"));
}

#[cfg(feature = "libsodium-ffi")]
Expand Down
4 changes: 0 additions & 4 deletions benches/kangarootwelve/.gitignore

This file was deleted.

12 changes: 0 additions & 12 deletions benches/kangarootwelve/Cargo.toml

This file was deleted.

15 changes: 0 additions & 15 deletions benches/kangarootwelve/K12/Makefile

This file was deleted.

78 changes: 0 additions & 78 deletions benches/kangarootwelve/K12/Makefile.build

This file was deleted.

58 changes: 0 additions & 58 deletions benches/kangarootwelve/K12/README.markdown

This file was deleted.

30 changes: 0 additions & 30 deletions benches/kangarootwelve/K12/lib/Inplace32BI/KeccakP-1600-SnP.h

This file was deleted.

Loading

0 comments on commit 0a4f1c2

Please sign in to comment.