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

Jump to bottom

keccak: 2021 edition upgrade; MSRV 1.60 #70

Merged
merged 1 commit into from
Jan 12, 2024
Merged

keccak: 2021 edition upgrade; MSRV 1.60 #70

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
2 changes: 1 addition & 1 deletion .github/workflows/keccak.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
set-msrv:
uses: RustCrypto/actions/.github/workflows/set-msrv.yml@master
with:
msrv: 1.41.0
msrv: 1.60.0

build:
needs: set-msrv
Expand Down
22 changes: 22 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[workspace]
exclude = ["keccak"] # TODO(tarcieri): add back to `members` when MSRV >= 1.56
resolver = "2"
members = [
"ascon",
#"keccak",
"keccak",
]
25 changes: 0 additions & 25 deletions keccak/Cargo.lock
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions keccak/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "keccak"
version = "0.1.5"
version = "0.2.0-pre"
description = """
Pure Rust implementation of the Keccak sponge function including the keccak-f
and keccak-p variants
Expand All @@ -12,7 +12,8 @@ repository = "https://github.com/RustCrypto/sponges/tree/master/keccak"
keywords = ["crypto", "sponge", "keccak", "keccak-f", "keccak-p"]
categories = ["cryptography", "no-std"]
readme = "README.md"
edition = "2018"
edition = "2021"
rust-version = "1.60"

[features]
asm = [] # Use optimized assembly when available (currently only ARMv8)
Expand Down
4 changes: 2 additions & 2 deletions keccak/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ is built on this crate.

## Minimum Supported Rust Version

Rust **1.41** or higher by default, or **1.59** with the `asm` feature enabled.
Rust **1.60** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand Down Expand Up @@ -56,7 +56,7 @@ dual licensed as above, without any additional terms or conditions.
[build-image]: https://github.com/RustCrypto/sponges/actions/workflows/keccak.yml/badge.svg
[build-link]: https://github.com/RustCrypto/sponges/actions/workflows/keccak.yml
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.41+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.60+-blue.svg
[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
[chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/369879-sponges

Expand Down
1 change: 0 additions & 1 deletion keccak/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
)]

use core::{
convert::TryInto,
fmt::Debug,
mem::size_of,
ops::{BitAnd, BitAndAssign, BitXor, BitXorAssign, Not},
Expand Down
Loading