Skip to content

k12: 2021 edition upgrade; MSRV 1.56 #487

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

Merged
tarcieri merged 1 commit into from
Jun 10, 2023
Merged

k12: 2021 edition upgrade; MSRV 1.56 #487

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/k12.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.56.0

build:
needs: set-msrv
Expand All @@ -32,7 +32,7 @@ jobs:
- ${{needs.set-msrv.outputs.msrv}}
- stable
target:
# - thumbv7em-none-eabi # TODO: no_std w/o liballoc
- thumbv7em-none-eabi
- wasm32-unknown-unknown
steps:
- uses: actions/checkout@v3
Expand Down
19 changes: 0 additions & 19 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.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ members = [
"fsb",
"gost94",
"groestl",
"k12",
"md2",
"md4",
"md5",
Expand All @@ -24,6 +23,7 @@ members = [
exclude = [
"ascon-hash",
"belt-hash",
"k12",
"skein",
]

Expand Down
15 changes: 10 additions & 5 deletions k12/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,29 @@
[package]
name = "k12"
version = "0.2.1"
version = "0.3.0-pre"
description = "Pure Rust implementation of the KangarooTwelve hash function"
authors = ["Diggory Hardy <github1@dhardy.name>"]
authors = ["RustCrypto Developers", "Diggory Hardy <github1@dhardy.name>"]
license = "Apache-2.0 OR MIT"
readme = "README.md"
edition = "2018"
edition = "2021"
documentation = "https://docs.rs/k12"
repository = "https://github.com/RustCrypto/hashes"
keywords = ["crypto", "hash", "digest"]
categories = ["cryptography", "no-std"]
rust-version = "1.56"

[dependencies]
digest = { version = "0.10.7", default-features = false, features = ["core-api"] }
sha3 = "0.10.8"
sha3 = { version = "0.10.8", default-features = false }

[dev-dependencies]
digest = { version = "0.10.7", features = ["alloc", "dev"] }
hex-literal = "0.2.2"
hex-literal = "0.3"

[features]
default = ["std"]
std = ["digest/std"]

# TODO: remove when crate will be part of the root workspace
[profile.dev]
opt-level = 2
4 changes: 2 additions & 2 deletions k12/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ function (XOF).

## Minimum Supported Rust Version

Rust **1.41** or higher.
Rust **1.56** 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 @@ -45,7 +45,7 @@ dual licensed as above, without any additional terms or conditions.
[docs-image]: https://docs.rs/k12/badge.svg
[docs-link]: https://docs.rs/k12/
[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.56+-blue.svg
[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
[chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260041-hashes
[build-image]: https://github.com/RustCrypto/hashes/workflows/k12/badge.svg?branch=master
Expand Down