Skip to content

Commit 6d93d8a

Browse files
committed
hkdf: migrate to hmac v0.12
1 parent 1a89dc2 commit 6d93d8a

15 files changed

+711
-622
lines changed

.gitattributes

-1
This file was deleted.

Cargo.lock

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

README.md

+20-10
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
1-
# RustCrypto KDFs ![Rust Version][rustc-image] [![Project Chat][chat-image]][chat-link] [![dependency status][deps-image]][deps-link]
1+
# RustCrypto: Key Derivation Functions
22

3-
Collection of key derivation functions (KDFs) written in pure Rust.
3+
[![Project Chat][chat-image]][chat-link] [![dependency status][deps-image]][deps-link] ![Apache2/MIT licensed][license-image]
44

5-
## Crates
5+
Collection of [Key Derivation Functions][KDF] (KDF) written in pure Rust.
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+
## Supported Algorithms
8+
9+
| Algorithm | Crate | Crates.io | Documentation | MSRV |
10+
|-----------|--------|:-------------:|:-------------:|:----:|
11+
| [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) | ![MSRV 1.41][msrv-1.41] |
1012

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

15+
### Minimum Supported Rust Version (MSRV) Policy
16+
17+
MSRV bumps are considered breaking changes and will be performed only with minor version bump.
18+
1319
## License
1420

1521
All crates licensed under either of
@@ -21,19 +27,23 @@ at your option.
2127

2228
### Contribution
2329

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.
30+
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.
2731

2832
[//]: # (badges)
2933

30-
[rustc-image]: https://img.shields.io/badge/rustc-1.41+-blue.svg
3134
[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
3235
[chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260043-KDFs
36+
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
3337
[deps-image]: https://deps.rs/repo/github/RustCrypto/KDFs/status.svg
3438
[deps-link]: https://deps.rs/repo/github/RustCrypto/KDFs
39+
[msrv-1.41]: https://img.shields.io/badge/rustc-1.41.0+-blue.svg
40+
41+
[//]: # (crates)
42+
43+
[`hkdf`]: ./hkdf
3544

3645
[//]: # (algorithms)
3746

47+
[KDF]: https://en.wikipedia.org/wiki/Key_derivation_function
3848
[HKDF]: https://en.wikipedia.org/wiki/HKDF
3949
[RustCrypto/password-hashes]: https://github.com/RustCrypto/password-hashes

hkdf/CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## 0.12.0 (2021-12-07)
8+
### Changed
9+
- Bump `hmac` crate dependency to v0.12 ([#52])
10+
11+
[#52]: https://github.com/RustCrypto/KDFs/pull/52
12+
713
## 0.11.0 (2021-04-29)
814
### Added
915
- Wycheproof HKDF test vectors ([#49])

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"]

hkdf/LICENSE-MIT

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Copyright (c) 2015-2018 Vlad Filippov
2-
Copyright (c) 2018 RustCrypto Developers
2+
Copyright (c) 2018-2021 RustCrypto Developers
33

44
Permission is hereby granted, free of charge, to any
55
person obtaining a copy of this software and associated

0 commit comments

Comments
 (0)