Skip to content

keccak: replace keccak_soft_compact with keccak_backend_soft="compact" #116

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

Open
newpavlov wants to merge 1 commit into
base: master
Choose a base branch
from
Open

keccak: replace keccak_soft_compact with keccak_backend_soft="compact" #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .github/workflows/keccak.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:
- run: cargo test --target ${{ matrix.target }} --features parallel
- run: cargo test --release --target ${{ matrix.target }} --features parallel
- env:
RUSTFLAGS: '-Dwarnings --cfg keccak_soft_compact'
RUSTFLAGS: '-Dwarnings --cfg keccak_backend_soft="compact"'
run: cargo test --release --target ${{ matrix.target }}
- env:
RUSTFLAGS: '-Dwarnings --cfg keccak_backend="soft"'
Expand Down Expand Up @@ -131,7 +131,7 @@ jobs:
- run: cargo miri test --target ${{ matrix.target }}
- run: cargo miri test --target ${{ matrix.target }} --features parallel
- env:
RUSTFLAGS: '-Dwarnings --cfg keccak_soft_compact'
RUSTFLAGS: '-Dwarnings --cfg keccak_backend_soft="compact"'
run: cargo miri test --release --target ${{ matrix.target }} --features parallel
- env:
RUSTFLAGS: '-Dwarnings --cfg keccak_backend="simd128"'
Expand Down
2 changes: 1 addition & 1 deletion keccak/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ unused_qualifications = "warn"
[lints.rust.unexpected_cfgs]
level = "warn"
check-cfg = [
'cfg(keccak_soft_compact)',
'cfg(keccak_backend_soft, values("compact"))',
'cfg(keccak_backend, values("aarch64_sha3", "simd128", "simd256", "simd512", "soft"))',
]

Expand Down
8 changes: 4 additions & 4 deletions keccak/src/backends/soft.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@ impl_lanesize!(u64, F1600_ROUNDS);
#[rustfmt::skip]
macro_rules! unroll5 {
($var: ident, $body: block) => {
#[cfg(not(keccak_soft_compact))]
#[cfg(not(keccak_backend_soft = "compact"))]
{
{ const $var: usize = 0; $body; }
{ const $var: usize = 1; $body; }
{ const $var: usize = 2; $body; }
{ const $var: usize = 3; $body; }
{ const $var: usize = 4; $body; }
}
#[cfg(keccak_soft_compact)]
#[cfg(keccak_backend_soft = "compact")]
{
for $var in 0..5 $body
}
Expand All @@ -70,7 +70,7 @@ macro_rules! unroll5 {
#[rustfmt::skip]
macro_rules! unroll24 {
($var: ident, $body: block) => {
#[cfg(not(keccak_soft_compact))]
#[cfg(not(keccak_backend_soft = "compact"))]
{
{ const $var: usize = 0; $body; }
{ const $var: usize = 1; $body; }
Expand All @@ -97,7 +97,7 @@ macro_rules! unroll24 {
{ const $var: usize = 22; $body; }
{ const $var: usize = 23; $body; }
}
#[cfg(keccak_soft_compact)]
#[cfg(keccak_backend_soft = "compact")]
{
for $var in 0..24 $body
}
Expand Down
Loading