Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rustfmt, CI check #52

Merged
merged 4 commits into from
May 25, 2024
Merged

rustfmt, CI check #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ef10b1e
Remove empty [dependencies] section
dhardy May 24, 2024
7f8096f
Reformat
dhardy May 24, 2024
90aced7
rustfmt::skip
dhardy May 24, 2024
9da9b2a
Add Clippy, rustfmt checks
dhardy May 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions .github/workflows/workspace.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Workspace

on:
pull_request:
paths-ignore:
- README.md
- "benches/**"
push:
branches: master
paths-ignore:
- README.md
- "benches/**"

jobs:
clippy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
with:
toolchain: 1.78.0
components: clippy
- run: cargo clippy --all --all-targets -- -D warnings

rustfmt:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
with:
toolchain: stable
components: rustfmt
- run: cargo fmt --all -- --check
2 changes: 0 additions & 2 deletions benches/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ edition = "2021"
rust-version = "1.61"
publish = false

[dependencies]

[dev-dependencies]
criterion = "0.5.0"
criterion-cycles-per-byte = "0.6"
Expand Down
142 changes: 70 additions & 72 deletions rand_hc/src/hc128.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,40 +150,40 @@ impl BlockRngCore for Hc128Core {

if self.counter1024 & 512 == 0 {
// P block
results[0] = self.step_p(cc+0, cc+1, ee+13, ee+6, ee+4);
results[1] = self.step_p(cc+1, cc+2, ee+14, ee+7, ee+5);
results[2] = self.step_p(cc+2, cc+3, ee+15, ee+8, ee+6);
results[3] = self.step_p(cc+3, cc+4, cc+0, ee+9, ee+7);
results[4] = self.step_p(cc+4, cc+5, cc+1, ee+10, ee+8);
results[5] = self.step_p(cc+5, cc+6, cc+2, ee+11, ee+9);
results[6] = self.step_p(cc+6, cc+7, cc+3, ee+12, ee+10);
results[7] = self.step_p(cc+7, cc+8, cc+4, ee+13, ee+11);
results[8] = self.step_p(cc+8, cc+9, cc+5, ee+14, ee+12);
results[9] = self.step_p(cc+9, cc+10, cc+6, ee+15, ee+13);
results[10] = self.step_p(cc+10, cc+11, cc+7, cc+0, ee+14);
results[11] = self.step_p(cc+11, cc+12, cc+8, cc+1, ee+15);
results[12] = self.step_p(cc+12, cc+13, cc+9, cc+2, cc+0);
results[13] = self.step_p(cc+13, cc+14, cc+10, cc+3, cc+1);
results[14] = self.step_p(cc+14, cc+15, cc+11, cc+4, cc+2);
results[15] = self.step_p(cc+15, dd+0, cc+12, cc+5, cc+3);
results[0] = self.step_p(cc + 0, cc + 1, ee + 13, ee + 6, ee + 4);
results[1] = self.step_p(cc + 1, cc + 2, ee + 14, ee + 7, ee + 5);
results[2] = self.step_p(cc + 2, cc + 3, ee + 15, ee + 8, ee + 6);
results[3] = self.step_p(cc + 3, cc + 4, cc + 0, ee + 9, ee + 7);
results[4] = self.step_p(cc + 4, cc + 5, cc + 1, ee + 10, ee + 8);
results[5] = self.step_p(cc + 5, cc + 6, cc + 2, ee + 11, ee + 9);
results[6] = self.step_p(cc + 6, cc + 7, cc + 3, ee + 12, ee + 10);
results[7] = self.step_p(cc + 7, cc + 8, cc + 4, ee + 13, ee + 11);
results[8] = self.step_p(cc + 8, cc + 9, cc + 5, ee + 14, ee + 12);
results[9] = self.step_p(cc + 9, cc + 10, cc + 6, ee + 15, ee + 13);
results[10] = self.step_p(cc + 10, cc + 11, cc + 7, cc + 0, ee + 14);
results[11] = self.step_p(cc + 11, cc + 12, cc + 8, cc + 1, ee + 15);
results[12] = self.step_p(cc + 12, cc + 13, cc + 9, cc + 2, cc + 0);
results[13] = self.step_p(cc + 13, cc + 14, cc + 10, cc + 3, cc + 1);
results[14] = self.step_p(cc + 14, cc + 15, cc + 11, cc + 4, cc + 2);
results[15] = self.step_p(cc + 15, dd + 0, cc + 12, cc + 5, cc + 3);
} else {
// Q block
results[0] = self.step_q(cc+0, cc+1, ee+13, ee+6, ee+4);
results[1] = self.step_q(cc+1, cc+2, ee+14, ee+7, ee+5);
results[2] = self.step_q(cc+2, cc+3, ee+15, ee+8, ee+6);
results[3] = self.step_q(cc+3, cc+4, cc+0, ee+9, ee+7);
results[4] = self.step_q(cc+4, cc+5, cc+1, ee+10, ee+8);
results[5] = self.step_q(cc+5, cc+6, cc+2, ee+11, ee+9);
results[6] = self.step_q(cc+6, cc+7, cc+3, ee+12, ee+10);
results[7] = self.step_q(cc+7, cc+8, cc+4, ee+13, ee+11);
results[8] = self.step_q(cc+8, cc+9, cc+5, ee+14, ee+12);
results[9] = self.step_q(cc+9, cc+10, cc+6, ee+15, ee+13);
results[10] = self.step_q(cc+10, cc+11, cc+7, cc+0, ee+14);
results[11] = self.step_q(cc+11, cc+12, cc+8, cc+1, ee+15);
results[12] = self.step_q(cc+12, cc+13, cc+9, cc+2, cc+0);
results[13] = self.step_q(cc+13, cc+14, cc+10, cc+3, cc+1);
results[14] = self.step_q(cc+14, cc+15, cc+11, cc+4, cc+2);
results[15] = self.step_q(cc+15, dd+0, cc+12, cc+5, cc+3);
results[0] = self.step_q(cc + 0, cc + 1, ee + 13, ee + 6, ee + 4);
results[1] = self.step_q(cc + 1, cc + 2, ee + 14, ee + 7, ee + 5);
results[2] = self.step_q(cc + 2, cc + 3, ee + 15, ee + 8, ee + 6);
results[3] = self.step_q(cc + 3, cc + 4, cc + 0, ee + 9, ee + 7);
results[4] = self.step_q(cc + 4, cc + 5, cc + 1, ee + 10, ee + 8);
results[5] = self.step_q(cc + 5, cc + 6, cc + 2, ee + 11, ee + 9);
results[6] = self.step_q(cc + 6, cc + 7, cc + 3, ee + 12, ee + 10);
results[7] = self.step_q(cc + 7, cc + 8, cc + 4, ee + 13, ee + 11);
results[8] = self.step_q(cc + 8, cc + 9, cc + 5, ee + 14, ee + 12);
results[9] = self.step_q(cc + 9, cc + 10, cc + 6, ee + 15, ee + 13);
results[10] = self.step_q(cc + 10, cc + 11, cc + 7, cc + 0, ee + 14);
results[11] = self.step_q(cc + 11, cc + 12, cc + 8, cc + 1, ee + 15);
results[12] = self.step_q(cc + 12, cc + 13, cc + 9, cc + 2, cc + 0);
results[13] = self.step_q(cc + 13, cc + 14, cc + 10, cc + 3, cc + 1);
results[14] = self.step_q(cc + 14, cc + 15, cc + 11, cc + 4, cc + 2);
results[15] = self.step_q(cc + 15, dd + 0, cc + 12, cc + 5, cc + 3);
}
self.counter1024 = self.counter1024.wrapping_add(16);
}
Expand All @@ -197,9 +197,7 @@ impl Hc128Core {
let temp0 = p[i511].rotate_right(23);
let temp1 = p[i3].rotate_right(10);
let temp2 = p[i10].rotate_right(8);
p[i] = p[i]
.wrapping_add(temp2)
.wrapping_add(temp0 ^ temp1);
p[i] = p[i].wrapping_add(temp2).wrapping_add(temp0 ^ temp1);
let temp3 = {
// The h1 function in HC-128
let a = p[i12] as u8;
Expand All @@ -218,10 +216,7 @@ impl Hc128Core {
let temp0 = q[i511].rotate_left(23);
let temp1 = q[i3].rotate_left(10);
let temp2 = q[i10].rotate_left(8);
q[i] = q
[i]
.wrapping_add(temp2)
.wrapping_add(temp0 ^ temp1);
q[i] = q[i].wrapping_add(temp2).wrapping_add(temp0 ^ temp1);
let temp3 = {
// The h2 function in HC-128
let a = q[i12] as u8;
Expand All @@ -246,40 +241,40 @@ impl Hc128Core {

if self.counter1024 < 512 {
// P block
self.t[cc+0] = self.step_p(cc+0, cc+1, ee+13, ee+6, ee+4);
self.t[cc+1] = self.step_p(cc+1, cc+2, ee+14, ee+7, ee+5);
self.t[cc+2] = self.step_p(cc+2, cc+3, ee+15, ee+8, ee+6);
self.t[cc+3] = self.step_p(cc+3, cc+4, cc+0, ee+9, ee+7);
self.t[cc+4] = self.step_p(cc+4, cc+5, cc+1, ee+10, ee+8);
self.t[cc+5] = self.step_p(cc+5, cc+6, cc+2, ee+11, ee+9);
self.t[cc+6] = self.step_p(cc+6, cc+7, cc+3, ee+12, ee+10);
self.t[cc+7] = self.step_p(cc+7, cc+8, cc+4, ee+13, ee+11);
self.t[cc+8] = self.step_p(cc+8, cc+9, cc+5, ee+14, ee+12);
self.t[cc+9] = self.step_p(cc+9, cc+10, cc+6, ee+15, ee+13);
self.t[cc+10] = self.step_p(cc+10, cc+11, cc+7, cc+0, ee+14);
self.t[cc+11] = self.step_p(cc+11, cc+12, cc+8, cc+1, ee+15);
self.t[cc+12] = self.step_p(cc+12, cc+13, cc+9, cc+2, cc+0);
self.t[cc+13] = self.step_p(cc+13, cc+14, cc+10, cc+3, cc+1);
self.t[cc+14] = self.step_p(cc+14, cc+15, cc+11, cc+4, cc+2);
self.t[cc+15] = self.step_p(cc+15, dd+0, cc+12, cc+5, cc+3);
self.t[cc + 0] = self.step_p(cc + 0, cc + 1, ee + 13, ee + 6, ee + 4);
self.t[cc + 1] = self.step_p(cc + 1, cc + 2, ee + 14, ee + 7, ee + 5);
self.t[cc + 2] = self.step_p(cc + 2, cc + 3, ee + 15, ee + 8, ee + 6);
self.t[cc + 3] = self.step_p(cc + 3, cc + 4, cc + 0, ee + 9, ee + 7);
self.t[cc + 4] = self.step_p(cc + 4, cc + 5, cc + 1, ee + 10, ee + 8);
self.t[cc + 5] = self.step_p(cc + 5, cc + 6, cc + 2, ee + 11, ee + 9);
self.t[cc + 6] = self.step_p(cc + 6, cc + 7, cc + 3, ee + 12, ee + 10);
self.t[cc + 7] = self.step_p(cc + 7, cc + 8, cc + 4, ee + 13, ee + 11);
self.t[cc + 8] = self.step_p(cc + 8, cc + 9, cc + 5, ee + 14, ee + 12);
self.t[cc + 9] = self.step_p(cc + 9, cc + 10, cc + 6, ee + 15, ee + 13);
self.t[cc + 10] = self.step_p(cc + 10, cc + 11, cc + 7, cc + 0, ee + 14);
self.t[cc + 11] = self.step_p(cc + 11, cc + 12, cc + 8, cc + 1, ee + 15);
self.t[cc + 12] = self.step_p(cc + 12, cc + 13, cc + 9, cc + 2, cc + 0);
self.t[cc + 13] = self.step_p(cc + 13, cc + 14, cc + 10, cc + 3, cc + 1);
self.t[cc + 14] = self.step_p(cc + 14, cc + 15, cc + 11, cc + 4, cc + 2);
self.t[cc + 15] = self.step_p(cc + 15, dd + 0, cc + 12, cc + 5, cc + 3);
} else {
// Q block
self.t[cc+512+0] = self.step_q(cc+0, cc+1, ee+13, ee+6, ee+4);
self.t[cc+512+1] = self.step_q(cc+1, cc+2, ee+14, ee+7, ee+5);
self.t[cc+512+2] = self.step_q(cc+2, cc+3, ee+15, ee+8, ee+6);
self.t[cc+512+3] = self.step_q(cc+3, cc+4, cc+0, ee+9, ee+7);
self.t[cc+512+4] = self.step_q(cc+4, cc+5, cc+1, ee+10, ee+8);
self.t[cc+512+5] = self.step_q(cc+5, cc+6, cc+2, ee+11, ee+9);
self.t[cc+512+6] = self.step_q(cc+6, cc+7, cc+3, ee+12, ee+10);
self.t[cc+512+7] = self.step_q(cc+7, cc+8, cc+4, ee+13, ee+11);
self.t[cc+512+8] = self.step_q(cc+8, cc+9, cc+5, ee+14, ee+12);
self.t[cc+512+9] = self.step_q(cc+9, cc+10, cc+6, ee+15, ee+13);
self.t[cc+512+10] = self.step_q(cc+10, cc+11, cc+7, cc+0, ee+14);
self.t[cc+512+11] = self.step_q(cc+11, cc+12, cc+8, cc+1, ee+15);
self.t[cc+512+12] = self.step_q(cc+12, cc+13, cc+9, cc+2, cc+0);
self.t[cc+512+13] = self.step_q(cc+13, cc+14, cc+10, cc+3, cc+1);
self.t[cc+512+14] = self.step_q(cc+14, cc+15, cc+11, cc+4, cc+2);
self.t[cc+512+15] = self.step_q(cc+15, dd+0, cc+12, cc+5, cc+3);
self.t[cc + 512 + 0] = self.step_q(cc + 0, cc + 1, ee + 13, ee + 6, ee + 4);
self.t[cc + 512 + 1] = self.step_q(cc + 1, cc + 2, ee + 14, ee + 7, ee + 5);
self.t[cc + 512 + 2] = self.step_q(cc + 2, cc + 3, ee + 15, ee + 8, ee + 6);
self.t[cc + 512 + 3] = self.step_q(cc + 3, cc + 4, cc + 0, ee + 9, ee + 7);
self.t[cc + 512 + 4] = self.step_q(cc + 4, cc + 5, cc + 1, ee + 10, ee + 8);
self.t[cc + 512 + 5] = self.step_q(cc + 5, cc + 6, cc + 2, ee + 11, ee + 9);
self.t[cc + 512 + 6] = self.step_q(cc + 6, cc + 7, cc + 3, ee + 12, ee + 10);
self.t[cc + 512 + 7] = self.step_q(cc + 7, cc + 8, cc + 4, ee + 13, ee + 11);
self.t[cc + 512 + 8] = self.step_q(cc + 8, cc + 9, cc + 5, ee + 14, ee + 12);
self.t[cc + 512 + 9] = self.step_q(cc + 9, cc + 10, cc + 6, ee + 15, ee + 13);
self.t[cc + 512 + 10] = self.step_q(cc + 10, cc + 11, cc + 7, cc + 0, ee + 14);
self.t[cc + 512 + 11] = self.step_q(cc + 11, cc + 12, cc + 8, cc + 1, ee + 15);
self.t[cc + 512 + 12] = self.step_q(cc + 12, cc + 13, cc + 9, cc + 2, cc + 0);
self.t[cc + 512 + 13] = self.step_q(cc + 13, cc + 14, cc + 10, cc + 3, cc + 1);
self.t[cc + 512 + 14] = self.step_q(cc + 14, cc + 15, cc + 11, cc + 4, cc + 2);
self.t[cc + 512 + 15] = self.step_q(cc + 15, dd + 0, cc + 12, cc + 5, cc + 3);
}
self.counter1024 += 16;
}
Expand All @@ -299,7 +294,10 @@ impl Hc128Core {
x.rotate_right(17) ^ x.rotate_right(19) ^ (x >> 10)
}

let mut core = Self { t: [0u32; 1024], counter1024: 0 };
let mut core = Self {
t: [0u32; 1024],
counter1024: 0,
};
let t = &mut core.t;

// Expand the key and iv into P and Q
Expand Down
Loading
Loading