Skip to content

Commit 185bb23

Browse files
committed
migrate to hmac v0.12
1 parent 1a89dc2 commit 185bb23

14 files changed

+695
-623
lines changed

.gitattributes

-1
This file was deleted.

Cargo.lock

+59-115
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+7
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,10 @@
22
members = [
33
"hkdf",
44
]
5+
6+
[patch.crates-io]
7+
digest = { git = "https://github.com/RustCrypto/traits/", branch = "digest/v0.10" }
8+
block-buffer = { git = "https://github.com/RustCrypto/utils", branch = "block-buffer/v0.10" }
9+
sha-1 = { git = "https://github.com/RustCrypto/hashes/", branch = "digest/v0.10.0-pre" }
10+
sha2 = { git = "https://github.com/RustCrypto/hashes/", branch = "digest/v0.10.0-pre" }
11+
hmac = { git = "https://github.com/RustCrypto/MACs/", branch = "hmac/v0.12" }

README.md

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# RustCrypto KDFs ![Rust Version][rustc-image] [![Project Chat][chat-image]][chat-link] [![dependency status][deps-image]][deps-link]
1+
# RustCrypto KDFs [![Project Chat][chat-image]][chat-link] [![dependency status][deps-image]][deps-link]
22

33
Collection of key derivation functions (KDFs) written in pure Rust.
44

55
## Crates
66

7-
| Name | Algorithm | Crates.io | Documentation | Build Status |
8-
|--------|-----------|---------------|---------------|--------------|
9-
| `hkdf` | [HKDF] | [![crates.io](https://img.shields.io/crates/v/hkdf.svg)](https://crates.io/crates/hkdf) | [![Documentation](https://docs.rs/hkdf/badge.svg)](https://docs.rs/hkdf) | [![Build](https://github.com/RustCrypto/KDFs/workflows/hkdf/badge.svg?branch=master&event=push)](https://github.com/RustCrypto/KDFs/actions?query=workflow:hkdf+branch:master)
7+
| Algorithm | Name | Crates.io | Documentation | BMSRV |
8+
|-----------|--------|---------------|---------------|--------------|
9+
| [HKDF] | `hkdf` | [![crates.io](https://img.shields.io/crates/v/hkdf.svg)](https://crates.io/crates/hkdf) | [![Documentation](https://docs.rs/hkdf/badge.svg)](https://docs.rs/hkdf) | ![Minimum Supported Rust Version][msrv-1.41] |
1010

1111
*NOTE: for password-based KDFs (e.g. Argon2, PBKDF2, scrypt), please see [RustCrypto/password-hashes]*
1212

@@ -21,17 +21,15 @@ at your option.
2121

2222
### Contribution
2323

24-
Unless you explicitly state otherwise, any contribution intentionally submitted
25-
for inclusion in the work by you, as defined in the Apache-2.0 license, shall be
26-
dual licensed as above, without any additional terms or conditions.
24+
Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions.
2725

2826
[//]: # (badges)
2927

30-
[rustc-image]: https://img.shields.io/badge/rustc-1.41+-blue.svg
3128
[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
3229
[chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260043-KDFs
3330
[deps-image]: https://deps.rs/repo/github/RustCrypto/KDFs/status.svg
3431
[deps-link]: https://deps.rs/repo/github/RustCrypto/KDFs
32+
[msrv-1.41]: https://img.shields.io/badge/rustc-1.41.0+-blue.svg
3533

3634
[//]: # (algorithms)
3735

hkdf/Cargo.toml

+15-21
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,28 @@
11
[package]
22
name = "hkdf"
3-
version = "0.11.0"
4-
authors = ["vladikoff", "warner", "RustCrypto Developers"]
5-
license = "MIT/Apache-2.0"
3+
version = "0.12.0" # Also update html_root_url in lib.rs when bumping this
4+
authors = ["RustCrypto Developers"]
5+
license = "MIT OR Apache-2.0"
66
homepage = "https://github.com/RustCrypto/KDFs/"
77
repository = "https://github.com/RustCrypto/KDFs/"
88
description = "HMAC-based Extract-and-Expand Key Derivation Function (HKDF)"
9-
keywords = [ "HKDF", "Crypto" ]
9+
keywords = ["crypto", "HKDF", "KDF"]
10+
categories = ["cryptography", "no-std"]
1011
readme = "README.md"
1112
edition = "2018"
1213

13-
[features]
14-
std = []
15-
16-
[lib]
17-
name = "hkdf"
18-
path = "src/hkdf.rs"
19-
2014
[dependencies]
21-
digest = "0.9"
22-
hmac = "0.11"
15+
hmac = "0.12"
2316

2417
[dev-dependencies]
2518
blobby = "0.3"
26-
crypto-tests = "0.5.*"
27-
hex = "0.4"
28-
sha-1 = "0.9"
29-
sha2 = "0.9"
30-
bencher = "0.1"
19+
hex-literal = "0.2"
20+
sha-1 = { version = "0.10", default-features = false }
21+
sha2 = { version = "0.10", default-features = false }
3122

32-
[[bench]]
33-
name = "hkdf"
34-
harness = false
23+
[features]
24+
std = ["hmac/std"]
25+
26+
[package.metadata.docs.rs]
27+
all-features = true
28+
rustdoc-args = ["--cfg", "docsrs"]

0 commit comments

Comments
 (0)