Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/argon2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
strategy:
matrix:
rust:
- 1.51.0 # MSRV
- 1.57.0 # MSRV
- stable
target:
- thumbv7em-none-eabi
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
strategy:
matrix:
rust:
- 1.51.0 # MSRV
- 1.57.0 # MSRV
- stable
steps:
- uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/balloon-hash.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
strategy:
matrix:
rust:
- 1.56.1 # MSRV
- 1.57.0 # MSRV
- stable
target:
- thumbv7em-none-eabi
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
strategy:
matrix:
rust:
- 1.56.1 # MSRV
- 1.57.0 # MSRV
- stable
steps:
- uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/bcrypt-pbkdf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
strategy:
matrix:
rust:
- 1.56.0 # MSRV
- 1.57.0 # MSRV
- stable
target:
- thumbv7em-none-eabi
Expand All @@ -48,7 +48,7 @@ jobs:
strategy:
matrix:
rust:
- 1.56.0 # MSRV
- 1.57.0 # MSRV
- stable
steps:
- uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pbkdf2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
strategy:
matrix:
rust:
- 1.51.0 # MSRV
- 1.57.0 # MSRV
- stable
target:
- thumbv7em-none-eabi
Expand All @@ -49,7 +49,7 @@ jobs:
strategy:
matrix:
rust:
- 1.51.0 # MSRV
- 1.57.0 # MSRV
- stable
steps:
- uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/scrypt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
strategy:
matrix:
rust:
- 1.56.0 # MSRV
- 1.57.0 # MSRV
- stable
target:
- thumbv7em-none-eabi
Expand All @@ -49,7 +49,7 @@ jobs:
strategy:
matrix:
rust:
- 1.56.0 # MSRV
- 1.57.0 # MSRV
- stable
steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/workspace.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- uses: RustCrypto/actions/cargo-cache@master
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.56.1 # MSRV
toolchain: 1.57.0
components: clippy
override: true
profile: minimal
Expand Down
12 changes: 6 additions & 6 deletions Cargo.lock

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

8 changes: 4 additions & 4 deletions argon2/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "argon2"
version = "0.3.4" # Also update html_root_url in lib.rs when bumping this
version = "0.4.0-pre" # Also update html_root_url in lib.rs when bumping this
description = """
Pure Rust implementation of the Argon2 password hashing function with support
for the Argon2d, Argon2i, and Argon2id algorithmic variants
Expand All @@ -19,13 +19,13 @@ base64ct = "1"
blake2 = { version = "0.10.4", default-features = false }

# optional dependencies
password-hash = { version = "0.3", optional = true }
password-hash = { version = "0.4", optional = true }
rayon = { version = "1.2", optional = true }
zeroize = { version = ">=1, <1.6", optional = true }
zeroize = { version = "1", optional = true }

[dev-dependencies]
hex-literal = "0.3"
password-hash = { version = "0.3", features = ["rand_core"] }
password-hash = { version = "0.4", features = ["rand_core"] }

[features]
default = ["alloc", "password-hash", "rand"]
Expand Down
6 changes: 3 additions & 3 deletions argon2/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@

[![crate][crate-image]][crate-link]
[![Docs][docs-image]][docs-link]
[![Build Status][build-image]][build-link]
![Apache2/MIT licensed][license-image]
![Rust Version][rustc-image]
[![Project Chat][chat-image]][chat-link]
[![Build Status][build-image]][build-link]

Pure Rust implementation of the [Argon2] password hashing function.

[Documentation][docs-link]

## Minimum Supported Rust Version

Rust **1.51** or higher.
Rust **1.57** 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/argon2/badge.svg
[docs-link]: https://docs.rs/argon2/
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.51+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.57+-blue.svg
[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
[chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260046-password-hashes
[build-image]: https://github.com/RustCrypto/password-hashes/workflows/argon2/badge.svg?branch=master&event=push
Expand Down
6 changes: 3 additions & 3 deletions argon2/src/algorithm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ use {core::convert::TryFrom, password_hash::Ident};
/// Argon2d algorithm identifier
#[cfg(feature = "password-hash")]
#[cfg_attr(docsrs, doc(cfg(feature = "password-hash")))]
pub const ARGON2D_IDENT: Ident<'_> = Ident::new("argon2d");
pub const ARGON2D_IDENT: Ident<'_> = Ident::new_unwrap("argon2d");

/// Argon2i algorithm identifier
#[cfg(feature = "password-hash")]
#[cfg_attr(docsrs, doc(cfg(feature = "password-hash")))]
pub const ARGON2I_IDENT: Ident<'_> = Ident::new("argon2i");
pub const ARGON2I_IDENT: Ident<'_> = Ident::new_unwrap("argon2i");

/// Argon2id algorithm identifier
#[cfg(feature = "password-hash")]
#[cfg_attr(docsrs, doc(cfg(feature = "password-hash")))]
pub const ARGON2ID_IDENT: Ident<'_> = Ident::new("argon2id");
pub const ARGON2ID_IDENT: Ident<'_> = Ident::new_unwrap("argon2id");

/// Argon2 primitive type: variants of the algorithm.
#[derive(Copy, Clone, Debug, Eq, PartialEq, PartialOrd, Ord)]
Expand Down
2 changes: 1 addition & 1 deletion argon2/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
#![doc(
html_logo_url = "https://raw.githubusercontent.com/RustCrypto/media/8f1a9894/logo.svg",
html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/media/8f1a9894/logo.svg",
html_root_url = "https://docs.rs/argon2/0.3.4"
html_root_url = "https://docs.rs/argon2/0.4.0-pre"
)]
#![warn(rust_2018_idioms, missing_docs)]

Expand Down
4 changes: 2 additions & 2 deletions balloon-hash/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "balloon-hash"
version = "0.1.1" # Also update html_root_url in lib.rs when bumping this
version = "0.2.0-pre" # Also update html_root_url in lib.rs when bumping this
description = "Pure Rust implementation of the Balloon password hashing function"
authors = ["RustCrypto Developers"]
license = "MIT OR Apache-2.0"
Expand All @@ -17,7 +17,7 @@ digest = { version = "0.10.3", default-features = false }
crypto-bigint = { version = "0.3", default-features = false, features = ["generic-array"] }

# optional dependencies
password-hash = { version = "0.3", default-features = false, optional = true }
password-hash = { version = "0.4", default-features = false, optional = true }
rayon = { version = "1.2", optional = true }

[dev-dependencies]
Expand Down
6 changes: 3 additions & 3 deletions balloon-hash/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

[![crate][crate-image]][crate-link]
[![Docs][docs-image]][docs-link]
[![Build Status][build-image]][build-link]
![Apache2/MIT licensed][license-image]
![Rust Version][rustc-image]
[![Project Chat][chat-image]][chat-link]
[![Build Status][build-image]][build-link]

Pure Rust implementation of the [Balloon] password hashing function.

Expand All @@ -26,7 +26,7 @@ This algorithm is first practical password hashing function that provides:

## Minimum Supported Rust Version

Rust **1.56** or higher.
Rust **1.57** 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 @@ -58,7 +58,7 @@ dual licensed as above, without any additional terms or conditions.
[docs-image]: https://docs.rs/balloon-hash/badge.svg
[docs-link]: https://docs.rs/balloon-hash/
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.56+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.57+-blue.svg
[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
[chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260046-password-hashes
[build-image]: https://github.com/RustCrypto/password-hashes/workflows/balloon/badge.svg?branch=master&event=push
Expand Down
4 changes: 2 additions & 2 deletions balloon-hash/src/algorithm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ impl Algorithm {
/// Balloon algorithm identifier
#[cfg(feature = "password-hash")]
#[cfg_attr(docsrs, doc(cfg(feature = "password-hash")))]
pub const BALLOON_IDENT: Ident<'static> = Ident::new("balloon");
pub const BALLOON_IDENT: Ident<'static> = Ident::new_unwrap("balloon");

/// BalloonM algorithm identifier
#[cfg(feature = "password-hash")]
#[cfg_attr(docsrs, doc(cfg(feature = "password-hash")))]
pub const BALLOON_M_IDENT: Ident<'static> = Ident::new("balloon-m");
pub const BALLOON_M_IDENT: Ident<'static> = Ident::new_unwrap("balloon-m");

/// Parse an [`Algorithm`] from the provided string.
pub fn new(id: impl AsRef<str>) -> Result<Self> {
Expand Down
4 changes: 2 additions & 2 deletions balloon-hash/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#![doc(
html_logo_url = "https://raw.githubusercontent.com/RustCrypto/media/8f1a9894/logo.svg",
html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/media/8f1a9894/logo.svg",
html_root_url = "https://docs.rs/balloon-hash/0.1.1"
html_root_url = "https://docs.rs/balloon-hash/0.2.0-pre"
)]
#![warn(rust_2018_idioms, missing_docs)]

Expand All @@ -18,7 +18,7 @@
//!
//! ```toml
//! [dependencies]
//! balloon-hash = "0.1"
//! balloon-hash = "0.2"
//! rand_core = { version = "0.6", features = ["std"] }
//! sha2 = "0.9"
//! ```
Expand Down
2 changes: 1 addition & 1 deletion bcrypt-pbkdf/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ categories = ["cryptography"]

[dependencies]
blowfish = { version = "0.9.1", features = ["bcrypt"] }
pbkdf2 = { version = "0.10.1", default-features = false, path = "../pbkdf2" }
pbkdf2 = { version = "=0.11.0-pre", default-features = false, path = "../pbkdf2" }
sha2 = { version = "0.10.2", default-features = false }
zeroize = { version = ">=1, <1.6", default-features = false, optional = true }

Expand Down
6 changes: 3 additions & 3 deletions bcrypt-pbkdf/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@

[![crate][crate-image]][crate-link]
[![Docs][docs-image]][docs-link]
[![Build Status][build-image]][build-link]
![Apache2/MIT licensed][license-image]
![Rust Version][rustc-image]
[![Project Chat][chat-image]][chat-link]
[![Build Status][build-image]][build-link]

Pure Rust implementation of the bcrypt-pbkdf password-based key derivation function.

[Documentation][docs-link]

## Minimum Supported Rust Version

Rust **1.56** or higher.
Rust **1.57** 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/bcrypt-pbkdf/badge.svg
[docs-link]: https://docs.rs/bcrypt-pbkdf/
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.56+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.57+-blue.svg
[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
[chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260046-password-hashes
[build-image]: https://github.com/RustCrypto/password-hashes/workflows/bcrypt-pbkdf/badge.svg?branch=master&event=push
Expand Down
4 changes: 2 additions & 2 deletions pbkdf2/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pbkdf2"
version = "0.10.1" # Also update html_root_url in lib.rs when bumping this
version = "0.11.0-pre" # Also update html_root_url in lib.rs when bumping this
authors = ["RustCrypto Developers"]
license = "MIT OR Apache-2.0"
description = "Generic implementation of PBKDF2"
Expand All @@ -16,7 +16,7 @@ digest = { version = "0.10.3", features = ["mac"] }

# optional dependencies
rayon = { version = "1.2", optional = true }
password-hash = { version = "0.3", default-features = false, optional = true, features = ["rand_core"] }
password-hash = { version = "0.4", default-features = false, optional = true, features = ["rand_core"] }
hmac = { version = "0.12", default-features = false, optional = true }
sha1 = { version = "0.10", package = "sha-1", default-features = false, optional = true }
sha2 = { version = "0.10", default-features = false, optional = true }
Expand Down
2 changes: 1 addition & 1 deletion pbkdf2/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Pure Rust implementation of the [Password-Based Key Derivation Function v2 (PBKD

## Minimum Supported Rust Version

Rust **1.51** or higher.
Rust **1.57** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand Down
4 changes: 2 additions & 2 deletions pbkdf2/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//!
//! ```toml
//! [dependencies]
//! pbkdf2 = { version = "0.10", default-features = false }
//! pbkdf2 = { version = "0.11", default-features = false }
//! ```
//!
//! # Usage (simple with default params)
Expand Down Expand Up @@ -57,7 +57,7 @@
#![doc(
html_logo_url = "https://raw.githubusercontent.com/RustCrypto/media/8f1a9894/logo.svg",
html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/media/8f1a9894/logo.svg",
html_root_url = "https://docs.rs/pbkdf2/0.10.1"
html_root_url = "https://docs.rs/pbkdf2/0.11.0-pre"
)]

#[cfg(feature = "std")]
Expand Down
Loading