Skip to content

Use resolver = "2"; MSRV 1.51+#220

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
Aug 27, 2021
Merged

Use resolver = "2"; MSRV 1.51+ #220

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
47 changes: 23 additions & 24 deletions .github/workflows/argon2.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,36 +17,35 @@ env:
RUSTFLAGS: "-Dwarnings"

jobs:
# TODO(tarcieri): test when new cargo resolver is available (RFC 2957)
# build:
# runs-on: ubuntu-latest
# strategy:
# matrix:
# rust:
# - 1.47.0 # MSRV
# - stable
# target:
# - thumbv7em-none-eabi
# - wasm32-unknown-unknown
# steps:
# - uses: actions/checkout@v1
# - uses: actions-rs/toolchain@v1
# with:
# profile: minimal
# toolchain: ${{ matrix.rust }}
# target: ${{ matrix.target }}
# override: true
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features password-hash
# - run: cargo build --target ${{ matrix.target }} --release
# - run: cargo build --target ${{ matrix.target }} --release --features zeroize
build:
runs-on: ubuntu-latest
strategy:
matrix:
rust:
- 1.51.0 # MSRV
- stable
target:
- thumbv7em-none-eabi
- wasm32-unknown-unknown
steps:
- uses: actions/checkout@v1
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: ${{ matrix.rust }}
target: ${{ matrix.target }}
override: true
- run: cargo build --target ${{ matrix.target }} --release --no-default-features
- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features password-hash
- run: cargo build --target ${{ matrix.target }} --release
- run: cargo build --target ${{ matrix.target }} --release --features zeroize

test:
runs-on: ubuntu-latest
strategy:
matrix:
rust:
- 1.47.0 # MSRV
- 1.51.0 # MSRV
- stable
steps:
- uses: actions/checkout@v1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/bcrypt-pbkdf.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ jobs:
strategy:
matrix:
rust:
- 1.47.0 # MSRV
- 1.51.0 # MSRV
- stable
target:
- thumbv7em-none-eabi
Expand All@@ -42,7 +42,7 @@ jobs:
strategy:
matrix:
rust:
- 1.47.0 # MSRV
- 1.51.0 # MSRV
- stable
steps:
- uses: actions/checkout@v1
Expand Down
41 changes: 20 additions & 21 deletions .github/workflows/pbkdf2.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,33 +17,32 @@ env:
RUSTFLAGS: "-Dwarnings"

jobs:
# TODO(tarcieri): test when new cargo resolver is available (RFC 2957)
# build:
# runs-on: ubuntu-latest
# strategy:
# matrix:
# rust:
# - 1.47.0 # MSRV
# - stable
# target:
# - thumbv7em-none-eabi
# - wasm32-unknown-unknown
# steps:
# - uses: actions/checkout@v1
# - uses: actions-rs/toolchain@v1
# with:
# profile: minimal
# toolchain: ${{ matrix.rust }}
# target: ${{ matrix.target }}
# override: true
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features
build:
runs-on: ubuntu-latest
strategy:
matrix:
rust:
- 1.51.0 # MSRV
- stable
target:
- thumbv7em-none-eabi
- wasm32-unknown-unknown
steps:
- uses: actions/checkout@v1
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: ${{ matrix.rust }}
target: ${{ matrix.target }}
override: true
- run: cargo build --target ${{ matrix.target }} --release --no-default-features

test:
runs-on: ubuntu-latest
strategy:
matrix:
rust:
- 1.47.0 # MSRV
- 1.51.0 # MSRV
- stable
steps:
- uses: actions/checkout@v1
Expand Down
43 changes: 21 additions & 22 deletions .github/workflows/scrypt.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,34 +17,33 @@ env:
RUSTFLAGS: "-Dwarnings"

jobs:
# TODO(tarcieri): test when new cargo resolver is available (RFC 2957)
# build:
# runs-on: ubuntu-latest
# strategy:
# matrix:
# rust:
# - 1.47.0 # MSRV
# - stable
# target:
# - thumbv7em-none-eabi
# - wasm32-unknown-unknown
# steps:
# - uses: actions/checkout@v1
# - uses: actions-rs/toolchain@v1
# with:
# profile: minimal
# toolchain: ${{ matrix.rust }}
# target: ${{ matrix.target }}
# override: true
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features simple
build:
runs-on: ubuntu-latest
strategy:
matrix:
rust:
- 1.51.0 # MSRV
- stable
target:
- thumbv7em-none-eabi
- wasm32-unknown-unknown
steps:
- uses: actions/checkout@v1
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: ${{ matrix.rust }}
target: ${{ matrix.target }}
override: true
- run: cargo build --target ${{ matrix.target }} --release --no-default-features
- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features simple

test:
runs-on: ubuntu-latest
strategy:
matrix:
rust:
- 1.47.0 # MSRV
- 1.51.0 # MSRV
- stable
steps:
- uses: actions/checkout@v1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sha-crypt.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ jobs:
strategy:
matrix:
rust:
- 1.47.0 # MSRV
- 1.51.0 # MSRV
- stable
target:
- thumbv7em-none-eabi
Expand All@@ -42,7 +42,7 @@ jobs:
strategy:
matrix:
rust:
- 1.47.0 # MSRV
- 1.51.0 # MSRV
- stable
steps:
- uses: actions/checkout@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/workspace.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v1
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.47.0 # MSRV
toolchain: 1.51.0 # MSRV
components: clippy
override: true
profile: minimal
Expand Down
14 changes: 7 additions & 7 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.

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
[workspace]
resolver = "2"
members = [
"argon2",
"bcrypt-pbkdf",
Expand Down
2 changes: 1 addition & 1 deletion argon2/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ base64ct = "1"
blake2 = { version = "0.9", default-features = false }
password-hash = { version = "0.3", optional = true }
rayon = { version = "1", optional = true }
zeroize = { version = ">=1, <1.4", optional = true }
zeroize = { version = ">=1, <1.5", optional = true }

[dev-dependencies]
hex-literal = "0.3"
Expand Down
4 changes: 2 additions & 2 deletions argon2/README.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ Pure Rust implementation of the [Argon2] password hashing function.

## Minimum Supported Rust Version

Rust **1.47** or higher.
Rust **1.51** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand 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.47+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.51+-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
2 changes: 1 addition & 1 deletion bcrypt-pbkdf/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ blowfish = { version = "0.8", features = ["bcrypt"] }
crypto-mac = "0.11"
pbkdf2 = { version = "0.8", default-features = false, path = "../pbkdf2" }
sha2 = { version = "0.9", default-features = false }
zeroize = { version = ">=1, <1.4", default-features = false }
zeroize = { version = ">=1, <1.5", default-features = false }

[features]
default = ["std"]
Expand Down
4 changes: 2 additions & 2 deletions pbkdf2/README.md
View file
Open in desktop
Original file line numberDiff line numberDiff 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.47** or higher.
Rust **1.51** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand Up@@ -45,7 +45,7 @@ dual licensed as above, without any additional terms or conditions.
[docs-image]: https://docs.rs/pbkdf2/badge.svg
[docs-link]: https://docs.rs/pbkdf2/
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.47+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.51+-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/pbkdf2/badge.svg?branch=master&event=push
Expand Down
4 changes: 2 additions & 2 deletions scrypt/README.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ Pure Rust implementation of the [scrypt key derivation function][1].

## Minimum Supported Rust Version

Rust **1.47** or higher.
Rust **1.51** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand Up@@ -45,7 +45,7 @@ dual licensed as above, without any additional terms or conditions.
[docs-image]: https://docs.rs/scrypt/badge.svg
[docs-link]: https://docs.rs/scrypt/
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.47+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.51+-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/scrypt/badge.svg?branch=master&event=push
Expand Down
2 changes: 1 addition & 1 deletion sha-crypt/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ readme = "README.md"
[dependencies]
sha2 = { version = "0.9", default-features = false }
rand = { version = "0.8", optional = true }
subtle = { version = "=2.4", optional = true, default-features = false }
subtle = { version = ">=2, <2.4", optional = true, default-features = false }

[features]
default = ["simple"]
Expand Down
4 changes: 2 additions & 2 deletions sha-crypt/README.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ Password hashes using this algorithm start with `$6$` when encoded using the

## Minimum Supported Rust Version

Rust **1.41** or higher.
Rust **1.51** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand Up@@ -49,7 +49,7 @@ dual licensed as above, without any additional terms or conditions.
[docs-image]: https://docs.rs/sha-crypt/badge.svg
[docs-link]: https://docs.rs/sha-crypt/
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.47+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.51+-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/sha-crypt/badge.svg?branch=master&event=push
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Use `resolver = "2"`; MSRV 1.51+ by tarcieri · Pull Request #220 · RustCrypto/password-hashes · GitHub
Skip to content
Use resolver = "2"; MSRV 1.51+#220

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

Aug 27, 2021
 Merged


Use resolver = "2"; MSRV 1.51+
#220
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


47 changes: 23 additions & 24 deletions
.github/workflows/argon2.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,36 +17,35 @@ env:
 RUSTFLAGS: "-Dwarnings"

jobs:
# TODO(tarcieri): test when new cargo resolver is available (RFC 2957)
# build:
# runs-on: ubuntu-latest
# strategy:
# matrix:
# rust:
# - 1.47.0 # MSRV
# - stable
# target:
# - thumbv7em-none-eabi
# - wasm32-unknown-unknown
# steps:
# - uses: actions/checkout@v1
# - uses: actions-rs/toolchain@v1
# with:
# profile: minimal
# toolchain: ${{ matrix.rust }}
# target: ${{ matrix.target }}
# override: true
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features password-hash
# - run: cargo build --target ${{ matrix.target }} --release
# - run: cargo build --target ${{ matrix.target }} --release --features zeroize
 build:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.51.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
 - wasm32-unknown-unknown
 steps:
 - uses: actions/checkout@v1
 - uses: actions-rs/toolchain@v1
 with:
 profile: minimal
 toolchain: ${{ matrix.rust }}
 target: ${{ matrix.target }}
 override: true
 - run: cargo build --target ${{ matrix.target }} --release --no-default-features
 - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features password-hash
 - run: cargo build --target ${{ matrix.target }} --release
 - run: cargo build --target ${{ matrix.target }} --release --features zeroize

 test:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v1
Expand Down

4 changes: 2 additions & 2 deletions
.github/workflows/bcrypt-pbkdf.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
Expand All@@ -42,7 +42,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v1
Expand Down

41 changes: 20 additions & 21 deletions
.github/workflows/pbkdf2.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,33 +17,32 @@ env:
 RUSTFLAGS: "-Dwarnings"

jobs:
# TODO(tarcieri): test when new cargo resolver is available (RFC 2957)
# build:
# runs-on: ubuntu-latest
# strategy:
# matrix:
# rust:
# - 1.47.0 # MSRV
# - stable
# target:
# - thumbv7em-none-eabi
# - wasm32-unknown-unknown
# steps:
# - uses: actions/checkout@v1
# - uses: actions-rs/toolchain@v1
# with:
# profile: minimal
# toolchain: ${{ matrix.rust }}
# target: ${{ matrix.target }}
# override: true
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features
 build:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.51.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
 - wasm32-unknown-unknown
 steps:
 - uses: actions/checkout@v1
 - uses: actions-rs/toolchain@v1
 with:
 profile: minimal
 toolchain: ${{ matrix.rust }}
 target: ${{ matrix.target }}
 override: true
 - run: cargo build --target ${{ matrix.target }} --release --no-default-features

 test:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v1
Expand Down

43 changes: 21 additions & 22 deletions
.github/workflows/scrypt.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,34 +17,33 @@ env:
 RUSTFLAGS: "-Dwarnings"

jobs:
# TODO(tarcieri): test when new cargo resolver is available (RFC 2957)
# build:
# runs-on: ubuntu-latest
# strategy:
# matrix:
# rust:
# - 1.47.0 # MSRV
# - stable
# target:
# - thumbv7em-none-eabi
# - wasm32-unknown-unknown
# steps:
# - uses: actions/checkout@v1
# - uses: actions-rs/toolchain@v1
# with:
# profile: minimal
# toolchain: ${{ matrix.rust }}
# target: ${{ matrix.target }}
# override: true
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features simple
 build:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.51.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
 - wasm32-unknown-unknown
 steps:
 - uses: actions/checkout@v1
 - uses: actions-rs/toolchain@v1
 with:
 profile: minimal
 toolchain: ${{ matrix.rust }}
 target: ${{ matrix.target }}
 override: true
 - run: cargo build --target ${{ matrix.target }} --release --no-default-features
 - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features simple

 test:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v1
Expand Down

4 changes: 2 additions & 2 deletions
.github/workflows/sha-crypt.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
Expand All@@ -42,7 +42,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v1
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/workspace.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ jobs:
 - uses: actions/checkout@v1
 - uses: actions-rs/toolchain@v1
 with:
 toolchain: 1.47.0 # MSRV
 toolchain: 1.51.0 # MSRV
 components: clippy
 override: true
 profile: minimal
Expand Down

14 changes: 7 additions & 7 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.


1 change: 1 addition & 0 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
[workspace]
resolver = "2"
members = [
 "argon2",
 "bcrypt-pbkdf",
Expand Down

2 changes: 1 addition & 1 deletion
argon2/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ base64ct = "1"
blake2 = { version = "0.9", default-features = false }
password-hash = { version = "0.3", optional = true }
rayon = { version = "1", optional = true }
zeroize = { version = ">=1, <1.4", optional = true }
zeroize = { version = ">=1, <1.5", optional = true }

[dev-dependencies]
hex-literal = "0.3"
Expand Down

4 changes: 2 additions & 2 deletions
argon2/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ Pure Rust implementation of the [Argon2] password hashing function.

## Minimum Supported Rust Version

Rust **1.47** or higher.
Rust **1.51** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand 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.47+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.51+-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

2 changes: 1 addition & 1 deletion
bcrypt-pbkdf/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ blowfish = { version = "0.8", features = ["bcrypt"] }
crypto-mac = "0.11"
pbkdf2 = { version = "0.8", default-features = false, path = "../pbkdf2" }
sha2 = { version = "0.9", default-features = false }
zeroize = { version = ">=1, <1.4", default-features = false }
zeroize = { version = ">=1, <1.5", default-features = false }

[features]
default = ["std"]
Expand Down

4 changes: 2 additions & 2 deletions
pbkdf2/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff 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.47** or higher.
Rust **1.51** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand Up@@ -45,7 +45,7 @@ dual licensed as above, without any additional terms or conditions.
[docs-image]: https://docs.rs/pbkdf2/badge.svg
[docs-link]: https://docs.rs/pbkdf2/
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.47+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.51+-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/pbkdf2/badge.svg?branch=master&event=push
Expand Down

4 changes: 2 additions & 2 deletions
scrypt/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ Pure Rust implementation of the [scrypt key derivation function][1].

## Minimum Supported Rust Version

Rust **1.47** or higher.
Rust **1.51** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand Up@@ -45,7 +45,7 @@ dual licensed as above, without any additional terms or conditions.
[docs-image]: https://docs.rs/scrypt/badge.svg
[docs-link]: https://docs.rs/scrypt/
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.47+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.51+-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/scrypt/badge.svg?branch=master&event=push
Expand Down

2 changes: 1 addition & 1 deletion
sha-crypt/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ readme = "README.md"
[dependencies]
sha2 = { version = "0.9", default-features = false }
rand = { version = "0.8", optional = true }
subtle = { version = "=2.4", optional = true, default-features = false }
subtle = { version = ">=2, <2.4", optional = true, default-features = false }

[features]
default = ["simple"]
Expand Down

4 changes: 2 additions & 2 deletions
sha-crypt/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ Password hashes using this algorithm start with `$6$` when encoded using the

## Minimum Supported Rust Version

Rust **1.41** or higher.
Rust **1.51** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand Up@@ -49,7 +49,7 @@ dual licensed as above, without any additional terms or conditions.
[docs-image]: https://docs.rs/sha-crypt/badge.svg
[docs-link]: https://docs.rs/sha-crypt/
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.47+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.51+-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/sha-crypt/badge.svg?branch=master&event=push
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Use `resolver = "2"`; MSRV 1.51+ by tarcieri · Pull Request #220 · RustCrypto/password-hashes · GitHub
Skip to content
Use resolver = "2"; MSRV 1.51+#220

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

Aug 27, 2021
 Merged


Use resolver = "2"; MSRV 1.51+
#220
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


47 changes: 23 additions & 24 deletions
.github/workflows/argon2.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,36 +17,35 @@ env:
 RUSTFLAGS: "-Dwarnings"

jobs:
# TODO(tarcieri): test when new cargo resolver is available (RFC 2957)
# build:
# runs-on: ubuntu-latest
# strategy:
# matrix:
# rust:
# - 1.47.0 # MSRV
# - stable
# target:
# - thumbv7em-none-eabi
# - wasm32-unknown-unknown
# steps:
# - uses: actions/checkout@v1
# - uses: actions-rs/toolchain@v1
# with:
# profile: minimal
# toolchain: ${{ matrix.rust }}
# target: ${{ matrix.target }}
# override: true
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features password-hash
# - run: cargo build --target ${{ matrix.target }} --release
# - run: cargo build --target ${{ matrix.target }} --release --features zeroize
 build:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.51.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
 - wasm32-unknown-unknown
 steps:
 - uses: actions/checkout@v1
 - uses: actions-rs/toolchain@v1
 with:
 profile: minimal
 toolchain: ${{ matrix.rust }}
 target: ${{ matrix.target }}
 override: true
 - run: cargo build --target ${{ matrix.target }} --release --no-default-features
 - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features password-hash
 - run: cargo build --target ${{ matrix.target }} --release
 - run: cargo build --target ${{ matrix.target }} --release --features zeroize

 test:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v1
Expand Down

4 changes: 2 additions & 2 deletions
.github/workflows/bcrypt-pbkdf.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
Expand All@@ -42,7 +42,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v1
Expand Down

41 changes: 20 additions & 21 deletions
.github/workflows/pbkdf2.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,33 +17,32 @@ env:
 RUSTFLAGS: "-Dwarnings"

jobs:
# TODO(tarcieri): test when new cargo resolver is available (RFC 2957)
# build:
# runs-on: ubuntu-latest
# strategy:
# matrix:
# rust:
# - 1.47.0 # MSRV
# - stable
# target:
# - thumbv7em-none-eabi
# - wasm32-unknown-unknown
# steps:
# - uses: actions/checkout@v1
# - uses: actions-rs/toolchain@v1
# with:
# profile: minimal
# toolchain: ${{ matrix.rust }}
# target: ${{ matrix.target }}
# override: true
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features
 build:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.51.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
 - wasm32-unknown-unknown
 steps:
 - uses: actions/checkout@v1
 - uses: actions-rs/toolchain@v1
 with:
 profile: minimal
 toolchain: ${{ matrix.rust }}
 target: ${{ matrix.target }}
 override: true
 - run: cargo build --target ${{ matrix.target }} --release --no-default-features

 test:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v1
Expand Down

43 changes: 21 additions & 22 deletions
.github/workflows/scrypt.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,34 +17,33 @@ env:
 RUSTFLAGS: "-Dwarnings"

jobs:
# TODO(tarcieri): test when new cargo resolver is available (RFC 2957)
# build:
# runs-on: ubuntu-latest
# strategy:
# matrix:
# rust:
# - 1.47.0 # MSRV
# - stable
# target:
# - thumbv7em-none-eabi
# - wasm32-unknown-unknown
# steps:
# - uses: actions/checkout@v1
# - uses: actions-rs/toolchain@v1
# with:
# profile: minimal
# toolchain: ${{ matrix.rust }}
# target: ${{ matrix.target }}
# override: true
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features simple
 build:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.51.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
 - wasm32-unknown-unknown
 steps:
 - uses: actions/checkout@v1
 - uses: actions-rs/toolchain@v1
 with:
 profile: minimal
 toolchain: ${{ matrix.rust }}
 target: ${{ matrix.target }}
 override: true
 - run: cargo build --target ${{ matrix.target }} --release --no-default-features
 - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features simple

 test:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v1
Expand Down

4 changes: 2 additions & 2 deletions
.github/workflows/sha-crypt.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
Expand All@@ -42,7 +42,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v1
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/workspace.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ jobs:
 - uses: actions/checkout@v1
 - uses: actions-rs/toolchain@v1
 with:
 toolchain: 1.47.0 # MSRV
 toolchain: 1.51.0 # MSRV
 components: clippy
 override: true
 profile: minimal
Expand Down

14 changes: 7 additions & 7 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.


1 change: 1 addition & 0 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
[workspace]
resolver = "2"
members = [
 "argon2",
 "bcrypt-pbkdf",
Expand Down

2 changes: 1 addition & 1 deletion
argon2/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ base64ct = "1"
blake2 = { version = "0.9", default-features = false }
password-hash = { version = "0.3", optional = true }
rayon = { version = "1", optional = true }
zeroize = { version = ">=1, <1.4", optional = true }
zeroize = { version = ">=1, <1.5", optional = true }

[dev-dependencies]
hex-literal = "0.3"
Expand Down

4 changes: 2 additions & 2 deletions
argon2/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ Pure Rust implementation of the [Argon2] password hashing function.

## Minimum Supported Rust Version

Rust **1.47** or higher.
Rust **1.51** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand 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.47+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.51+-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

2 changes: 1 addition & 1 deletion
bcrypt-pbkdf/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ blowfish = { version = "0.8", features = ["bcrypt"] }
crypto-mac = "0.11"
pbkdf2 = { version = "0.8", default-features = false, path = "../pbkdf2" }
sha2 = { version = "0.9", default-features = false }
zeroize = { version = ">=1, <1.4", default-features = false }
zeroize = { version = ">=1, <1.5", default-features = false }

[features]
default = ["std"]
Expand Down

4 changes: 2 additions & 2 deletions
pbkdf2/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff 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.47** or higher.
Rust **1.51** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand Up@@ -45,7 +45,7 @@ dual licensed as above, without any additional terms or conditions.
[docs-image]: https://docs.rs/pbkdf2/badge.svg
[docs-link]: https://docs.rs/pbkdf2/
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.47+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.51+-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/pbkdf2/badge.svg?branch=master&event=push
Expand Down

4 changes: 2 additions & 2 deletions
scrypt/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ Pure Rust implementation of the [scrypt key derivation function][1].

## Minimum Supported Rust Version

Rust **1.47** or higher.
Rust **1.51** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand Up@@ -45,7 +45,7 @@ dual licensed as above, without any additional terms or conditions.
[docs-image]: https://docs.rs/scrypt/badge.svg
[docs-link]: https://docs.rs/scrypt/
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.47+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.51+-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/scrypt/badge.svg?branch=master&event=push
Expand Down

2 changes: 1 addition & 1 deletion
sha-crypt/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ readme = "README.md"
[dependencies]
sha2 = { version = "0.9", default-features = false }
rand = { version = "0.8", optional = true }
subtle = { version = "=2.4", optional = true, default-features = false }
subtle = { version = ">=2, <2.4", optional = true, default-features = false }

[features]
default = ["simple"]
Expand Down

4 changes: 2 additions & 2 deletions
sha-crypt/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ Password hashes using this algorithm start with `$6$` when encoded using the

## Minimum Supported Rust Version

Rust **1.41** or higher.
Rust **1.51** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand Up@@ -49,7 +49,7 @@ dual licensed as above, without any additional terms or conditions.
[docs-image]: https://docs.rs/sha-crypt/badge.svg
[docs-link]: https://docs.rs/sha-crypt/
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.47+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.51+-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/sha-crypt/badge.svg?branch=master&event=push
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Use `resolver = "2"`; MSRV 1.51+ by tarcieri · Pull Request #220 · RustCrypto/password-hashes · GitHub
Skip to content
Use resolver = "2"; MSRV 1.51+#220

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

Aug 27, 2021
 Merged


Use resolver = "2"; MSRV 1.51+
#220
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


47 changes: 23 additions & 24 deletions
.github/workflows/argon2.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,36 +17,35 @@ env:
 RUSTFLAGS: "-Dwarnings"

jobs:
# TODO(tarcieri): test when new cargo resolver is available (RFC 2957)
# build:
# runs-on: ubuntu-latest
# strategy:
# matrix:
# rust:
# - 1.47.0 # MSRV
# - stable
# target:
# - thumbv7em-none-eabi
# - wasm32-unknown-unknown
# steps:
# - uses: actions/checkout@v1
# - uses: actions-rs/toolchain@v1
# with:
# profile: minimal
# toolchain: ${{ matrix.rust }}
# target: ${{ matrix.target }}
# override: true
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features password-hash
# - run: cargo build --target ${{ matrix.target }} --release
# - run: cargo build --target ${{ matrix.target }} --release --features zeroize
 build:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.51.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
 - wasm32-unknown-unknown
 steps:
 - uses: actions/checkout@v1
 - uses: actions-rs/toolchain@v1
 with:
 profile: minimal
 toolchain: ${{ matrix.rust }}
 target: ${{ matrix.target }}
 override: true
 - run: cargo build --target ${{ matrix.target }} --release --no-default-features
 - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features password-hash
 - run: cargo build --target ${{ matrix.target }} --release
 - run: cargo build --target ${{ matrix.target }} --release --features zeroize

 test:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v1
Expand Down

4 changes: 2 additions & 2 deletions
.github/workflows/bcrypt-pbkdf.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
Expand All@@ -42,7 +42,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v1
Expand Down

41 changes: 20 additions & 21 deletions
.github/workflows/pbkdf2.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,33 +17,32 @@ env:
 RUSTFLAGS: "-Dwarnings"

jobs:
# TODO(tarcieri): test when new cargo resolver is available (RFC 2957)
# build:
# runs-on: ubuntu-latest
# strategy:
# matrix:
# rust:
# - 1.47.0 # MSRV
# - stable
# target:
# - thumbv7em-none-eabi
# - wasm32-unknown-unknown
# steps:
# - uses: actions/checkout@v1
# - uses: actions-rs/toolchain@v1
# with:
# profile: minimal
# toolchain: ${{ matrix.rust }}
# target: ${{ matrix.target }}
# override: true
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features
 build:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.51.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
 - wasm32-unknown-unknown
 steps:
 - uses: actions/checkout@v1
 - uses: actions-rs/toolchain@v1
 with:
 profile: minimal
 toolchain: ${{ matrix.rust }}
 target: ${{ matrix.target }}
 override: true
 - run: cargo build --target ${{ matrix.target }} --release --no-default-features

 test:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v1
Expand Down

43 changes: 21 additions & 22 deletions
.github/workflows/scrypt.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,34 +17,33 @@ env:
 RUSTFLAGS: "-Dwarnings"

jobs:
# TODO(tarcieri): test when new cargo resolver is available (RFC 2957)
# build:
# runs-on: ubuntu-latest
# strategy:
# matrix:
# rust:
# - 1.47.0 # MSRV
# - stable
# target:
# - thumbv7em-none-eabi
# - wasm32-unknown-unknown
# steps:
# - uses: actions/checkout@v1
# - uses: actions-rs/toolchain@v1
# with:
# profile: minimal
# toolchain: ${{ matrix.rust }}
# target: ${{ matrix.target }}
# override: true
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features simple
 build:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.51.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
 - wasm32-unknown-unknown
 steps:
 - uses: actions/checkout@v1
 - uses: actions-rs/toolchain@v1
 with:
 profile: minimal
 toolchain: ${{ matrix.rust }}
 target: ${{ matrix.target }}
 override: true
 - run: cargo build --target ${{ matrix.target }} --release --no-default-features
 - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features simple

 test:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v1
Expand Down

4 changes: 2 additions & 2 deletions
.github/workflows/sha-crypt.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
Expand All@@ -42,7 +42,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v1
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/workspace.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ jobs:
 - uses: actions/checkout@v1
 - uses: actions-rs/toolchain@v1
 with:
 toolchain: 1.47.0 # MSRV
 toolchain: 1.51.0 # MSRV
 components: clippy
 override: true
 profile: minimal
Expand Down

14 changes: 7 additions & 7 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.


1 change: 1 addition & 0 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
[workspace]
resolver = "2"
members = [
 "argon2",
 "bcrypt-pbkdf",
Expand Down

2 changes: 1 addition & 1 deletion
argon2/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ base64ct = "1"
blake2 = { version = "0.9", default-features = false }
password-hash = { version = "0.3", optional = true }
rayon = { version = "1", optional = true }
zeroize = { version = ">=1, <1.4", optional = true }
zeroize = { version = ">=1, <1.5", optional = true }

[dev-dependencies]
hex-literal = "0.3"
Expand Down

4 changes: 2 additions & 2 deletions
argon2/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ Pure Rust implementation of the [Argon2] password hashing function.

## Minimum Supported Rust Version

Rust **1.47** or higher.
Rust **1.51** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand 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.47+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.51+-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

2 changes: 1 addition & 1 deletion
bcrypt-pbkdf/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ blowfish = { version = "0.8", features = ["bcrypt"] }
crypto-mac = "0.11"
pbkdf2 = { version = "0.8", default-features = false, path = "../pbkdf2" }
sha2 = { version = "0.9", default-features = false }
zeroize = { version = ">=1, <1.4", default-features = false }
zeroize = { version = ">=1, <1.5", default-features = false }

[features]
default = ["std"]
Expand Down

4 changes: 2 additions & 2 deletions
pbkdf2/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff 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.47** or higher.
Rust **1.51** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand Up@@ -45,7 +45,7 @@ dual licensed as above, without any additional terms or conditions.
[docs-image]: https://docs.rs/pbkdf2/badge.svg
[docs-link]: https://docs.rs/pbkdf2/
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.47+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.51+-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/pbkdf2/badge.svg?branch=master&event=push
Expand Down

4 changes: 2 additions & 2 deletions
scrypt/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ Pure Rust implementation of the [scrypt key derivation function][1].

## Minimum Supported Rust Version

Rust **1.47** or higher.
Rust **1.51** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand Up@@ -45,7 +45,7 @@ dual licensed as above, without any additional terms or conditions.
[docs-image]: https://docs.rs/scrypt/badge.svg
[docs-link]: https://docs.rs/scrypt/
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.47+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.51+-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/scrypt/badge.svg?branch=master&event=push
Expand Down

2 changes: 1 addition & 1 deletion
sha-crypt/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ readme = "README.md"
[dependencies]
sha2 = { version = "0.9", default-features = false }
rand = { version = "0.8", optional = true }
subtle = { version = "=2.4", optional = true, default-features = false }
subtle = { version = ">=2, <2.4", optional = true, default-features = false }

[features]
default = ["simple"]
Expand Down

4 changes: 2 additions & 2 deletions
sha-crypt/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ Password hashes using this algorithm start with `$6$` when encoded using the

## Minimum Supported Rust Version

Rust **1.41** or higher.
Rust **1.51** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand Up@@ -49,7 +49,7 @@ dual licensed as above, without any additional terms or conditions.
[docs-image]: https://docs.rs/sha-crypt/badge.svg
[docs-link]: https://docs.rs/sha-crypt/
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.47+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.51+-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/sha-crypt/badge.svg?branch=master&event=push
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Use `resolver = "2"`; MSRV 1.51+ by tarcieri · Pull Request #220 · RustCrypto/password-hashes · GitHub
Skip to content
Use resolver = "2"; MSRV 1.51+#220

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

Aug 27, 2021
 Merged


Use resolver = "2"; MSRV 1.51+
#220
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


47 changes: 23 additions & 24 deletions
.github/workflows/argon2.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,36 +17,35 @@ env:
 RUSTFLAGS: "-Dwarnings"

jobs:
# TODO(tarcieri): test when new cargo resolver is available (RFC 2957)
# build:
# runs-on: ubuntu-latest
# strategy:
# matrix:
# rust:
# - 1.47.0 # MSRV
# - stable
# target:
# - thumbv7em-none-eabi
# - wasm32-unknown-unknown
# steps:
# - uses: actions/checkout@v1
# - uses: actions-rs/toolchain@v1
# with:
# profile: minimal
# toolchain: ${{ matrix.rust }}
# target: ${{ matrix.target }}
# override: true
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features password-hash
# - run: cargo build --target ${{ matrix.target }} --release
# - run: cargo build --target ${{ matrix.target }} --release --features zeroize
 build:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.51.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
 - wasm32-unknown-unknown
 steps:
 - uses: actions/checkout@v1
 - uses: actions-rs/toolchain@v1
 with:
 profile: minimal
 toolchain: ${{ matrix.rust }}
 target: ${{ matrix.target }}
 override: true
 - run: cargo build --target ${{ matrix.target }} --release --no-default-features
 - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features password-hash
 - run: cargo build --target ${{ matrix.target }} --release
 - run: cargo build --target ${{ matrix.target }} --release --features zeroize

 test:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v1
Expand Down

4 changes: 2 additions & 2 deletions
.github/workflows/bcrypt-pbkdf.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
Expand All@@ -42,7 +42,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v1
Expand Down

41 changes: 20 additions & 21 deletions
.github/workflows/pbkdf2.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,33 +17,32 @@ env:
 RUSTFLAGS: "-Dwarnings"

jobs:
# TODO(tarcieri): test when new cargo resolver is available (RFC 2957)
# build:
# runs-on: ubuntu-latest
# strategy:
# matrix:
# rust:
# - 1.47.0 # MSRV
# - stable
# target:
# - thumbv7em-none-eabi
# - wasm32-unknown-unknown
# steps:
# - uses: actions/checkout@v1
# - uses: actions-rs/toolchain@v1
# with:
# profile: minimal
# toolchain: ${{ matrix.rust }}
# target: ${{ matrix.target }}
# override: true
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features
 build:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.51.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
 - wasm32-unknown-unknown
 steps:
 - uses: actions/checkout@v1
 - uses: actions-rs/toolchain@v1
 with:
 profile: minimal
 toolchain: ${{ matrix.rust }}
 target: ${{ matrix.target }}
 override: true
 - run: cargo build --target ${{ matrix.target }} --release --no-default-features

 test:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v1
Expand Down

43 changes: 21 additions & 22 deletions
.github/workflows/scrypt.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,34 +17,33 @@ env:
 RUSTFLAGS: "-Dwarnings"

jobs:
# TODO(tarcieri): test when new cargo resolver is available (RFC 2957)
# build:
# runs-on: ubuntu-latest
# strategy:
# matrix:
# rust:
# - 1.47.0 # MSRV
# - stable
# target:
# - thumbv7em-none-eabi
# - wasm32-unknown-unknown
# steps:
# - uses: actions/checkout@v1
# - uses: actions-rs/toolchain@v1
# with:
# profile: minimal
# toolchain: ${{ matrix.rust }}
# target: ${{ matrix.target }}
# override: true
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features simple
 build:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.51.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
 - wasm32-unknown-unknown
 steps:
 - uses: actions/checkout@v1
 - uses: actions-rs/toolchain@v1
 with:
 profile: minimal
 toolchain: ${{ matrix.rust }}
 target: ${{ matrix.target }}
 override: true
 - run: cargo build --target ${{ matrix.target }} --release --no-default-features
 - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features simple

 test:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v1
Expand Down

4 changes: 2 additions & 2 deletions
.github/workflows/sha-crypt.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
Expand All@@ -42,7 +42,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v1
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/workspace.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ jobs:
 - uses: actions/checkout@v1
 - uses: actions-rs/toolchain@v1
 with:
 toolchain: 1.47.0 # MSRV
 toolchain: 1.51.0 # MSRV
 components: clippy
 override: true
 profile: minimal
Expand Down

14 changes: 7 additions & 7 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.


1 change: 1 addition & 0 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
[workspace]
resolver = "2"
members = [
 "argon2",
 "bcrypt-pbkdf",
Expand Down

2 changes: 1 addition & 1 deletion
argon2/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ base64ct = "1"
blake2 = { version = "0.9", default-features = false }
password-hash = { version = "0.3", optional = true }
rayon = { version = "1", optional = true }
zeroize = { version = ">=1, <1.4", optional = true }
zeroize = { version = ">=1, <1.5", optional = true }

[dev-dependencies]
hex-literal = "0.3"
Expand Down

4 changes: 2 additions & 2 deletions
argon2/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ Pure Rust implementation of the [Argon2] password hashing function.

## Minimum Supported Rust Version

Rust **1.47** or higher.
Rust **1.51** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand 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.47+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.51+-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

2 changes: 1 addition & 1 deletion
bcrypt-pbkdf/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ blowfish = { version = "0.8", features = ["bcrypt"] }
crypto-mac = "0.11"
pbkdf2 = { version = "0.8", default-features = false, path = "../pbkdf2" }
sha2 = { version = "0.9", default-features = false }
zeroize = { version = ">=1, <1.4", default-features = false }
zeroize = { version = ">=1, <1.5", default-features = false }

[features]
default = ["std"]
Expand Down

4 changes: 2 additions & 2 deletions
pbkdf2/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff 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.47** or higher.
Rust **1.51** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand Up@@ -45,7 +45,7 @@ dual licensed as above, without any additional terms or conditions.
[docs-image]: https://docs.rs/pbkdf2/badge.svg
[docs-link]: https://docs.rs/pbkdf2/
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.47+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.51+-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/pbkdf2/badge.svg?branch=master&event=push
Expand Down

4 changes: 2 additions & 2 deletions
scrypt/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ Pure Rust implementation of the [scrypt key derivation function][1].

## Minimum Supported Rust Version

Rust **1.47** or higher.
Rust **1.51** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand Up@@ -45,7 +45,7 @@ dual licensed as above, without any additional terms or conditions.
[docs-image]: https://docs.rs/scrypt/badge.svg
[docs-link]: https://docs.rs/scrypt/
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.47+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.51+-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/scrypt/badge.svg?branch=master&event=push
Expand Down

2 changes: 1 addition & 1 deletion
sha-crypt/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ readme = "README.md"
[dependencies]
sha2 = { version = "0.9", default-features = false }
rand = { version = "0.8", optional = true }
subtle = { version = "=2.4", optional = true, default-features = false }
subtle = { version = ">=2, <2.4", optional = true, default-features = false }

[features]
default = ["simple"]
Expand Down

4 changes: 2 additions & 2 deletions
sha-crypt/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ Password hashes using this algorithm start with `$6$` when encoded using the

## Minimum Supported Rust Version

Rust **1.41** or higher.
Rust **1.51** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand Up@@ -49,7 +49,7 @@ dual licensed as above, without any additional terms or conditions.
[docs-image]: https://docs.rs/sha-crypt/badge.svg
[docs-link]: https://docs.rs/sha-crypt/
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.47+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.51+-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/sha-crypt/badge.svg?branch=master&event=push
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Use `resolver = "2"`; MSRV 1.51+ by tarcieri · Pull Request #220 · RustCrypto/password-hashes · GitHub
Skip to content
Use resolver = "2"; MSRV 1.51+#220

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

Aug 27, 2021
 Merged


Use resolver = "2"; MSRV 1.51+
#220
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


47 changes: 23 additions & 24 deletions
.github/workflows/argon2.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,36 +17,35 @@ env:
 RUSTFLAGS: "-Dwarnings"

jobs:
# TODO(tarcieri): test when new cargo resolver is available (RFC 2957)
# build:
# runs-on: ubuntu-latest
# strategy:
# matrix:
# rust:
# - 1.47.0 # MSRV
# - stable
# target:
# - thumbv7em-none-eabi
# - wasm32-unknown-unknown
# steps:
# - uses: actions/checkout@v1
# - uses: actions-rs/toolchain@v1
# with:
# profile: minimal
# toolchain: ${{ matrix.rust }}
# target: ${{ matrix.target }}
# override: true
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features password-hash
# - run: cargo build --target ${{ matrix.target }} --release
# - run: cargo build --target ${{ matrix.target }} --release --features zeroize
 build:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.51.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
 - wasm32-unknown-unknown
 steps:
 - uses: actions/checkout@v1
 - uses: actions-rs/toolchain@v1
 with:
 profile: minimal
 toolchain: ${{ matrix.rust }}
 target: ${{ matrix.target }}
 override: true
 - run: cargo build --target ${{ matrix.target }} --release --no-default-features
 - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features password-hash
 - run: cargo build --target ${{ matrix.target }} --release
 - run: cargo build --target ${{ matrix.target }} --release --features zeroize

 test:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v1
Expand Down

4 changes: 2 additions & 2 deletions
.github/workflows/bcrypt-pbkdf.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
Expand All@@ -42,7 +42,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v1
Expand Down

41 changes: 20 additions & 21 deletions
.github/workflows/pbkdf2.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,33 +17,32 @@ env:
 RUSTFLAGS: "-Dwarnings"

jobs:
# TODO(tarcieri): test when new cargo resolver is available (RFC 2957)
# build:
# runs-on: ubuntu-latest
# strategy:
# matrix:
# rust:
# - 1.47.0 # MSRV
# - stable
# target:
# - thumbv7em-none-eabi
# - wasm32-unknown-unknown
# steps:
# - uses: actions/checkout@v1
# - uses: actions-rs/toolchain@v1
# with:
# profile: minimal
# toolchain: ${{ matrix.rust }}
# target: ${{ matrix.target }}
# override: true
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features
 build:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.51.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
 - wasm32-unknown-unknown
 steps:
 - uses: actions/checkout@v1
 - uses: actions-rs/toolchain@v1
 with:
 profile: minimal
 toolchain: ${{ matrix.rust }}
 target: ${{ matrix.target }}
 override: true
 - run: cargo build --target ${{ matrix.target }} --release --no-default-features

 test:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v1
Expand Down

43 changes: 21 additions & 22 deletions
.github/workflows/scrypt.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,34 +17,33 @@ env:
 RUSTFLAGS: "-Dwarnings"

jobs:
# TODO(tarcieri): test when new cargo resolver is available (RFC 2957)
# build:
# runs-on: ubuntu-latest
# strategy:
# matrix:
# rust:
# - 1.47.0 # MSRV
# - stable
# target:
# - thumbv7em-none-eabi
# - wasm32-unknown-unknown
# steps:
# - uses: actions/checkout@v1
# - uses: actions-rs/toolchain@v1
# with:
# profile: minimal
# toolchain: ${{ matrix.rust }}
# target: ${{ matrix.target }}
# override: true
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features simple
 build:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.51.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
 - wasm32-unknown-unknown
 steps:
 - uses: actions/checkout@v1
 - uses: actions-rs/toolchain@v1
 with:
 profile: minimal
 toolchain: ${{ matrix.rust }}
 target: ${{ matrix.target }}
 override: true
 - run: cargo build --target ${{ matrix.target }} --release --no-default-features
 - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features simple

 test:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v1
Expand Down

4 changes: 2 additions & 2 deletions
.github/workflows/sha-crypt.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
Expand All@@ -42,7 +42,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v1
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/workspace.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ jobs:
 - uses: actions/checkout@v1
 - uses: actions-rs/toolchain@v1
 with:
 toolchain: 1.47.0 # MSRV
 toolchain: 1.51.0 # MSRV
 components: clippy
 override: true
 profile: minimal
Expand Down

14 changes: 7 additions & 7 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.


1 change: 1 addition & 0 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
[workspace]
resolver = "2"
members = [
 "argon2",
 "bcrypt-pbkdf",
Expand Down

2 changes: 1 addition & 1 deletion
argon2/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ base64ct = "1"
blake2 = { version = "0.9", default-features = false }
password-hash = { version = "0.3", optional = true }
rayon = { version = "1", optional = true }
zeroize = { version = ">=1, <1.4", optional = true }
zeroize = { version = ">=1, <1.5", optional = true }

[dev-dependencies]
hex-literal = "0.3"
Expand Down

4 changes: 2 additions & 2 deletions
argon2/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ Pure Rust implementation of the [Argon2] password hashing function.

## Minimum Supported Rust Version

Rust **1.47** or higher.
Rust **1.51** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand 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.47+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.51+-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

2 changes: 1 addition & 1 deletion
bcrypt-pbkdf/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ blowfish = { version = "0.8", features = ["bcrypt"] }
crypto-mac = "0.11"
pbkdf2 = { version = "0.8", default-features = false, path = "../pbkdf2" }
sha2 = { version = "0.9", default-features = false }
zeroize = { version = ">=1, <1.4", default-features = false }
zeroize = { version = ">=1, <1.5", default-features = false }

[features]
default = ["std"]
Expand Down

4 changes: 2 additions & 2 deletions
pbkdf2/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff 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.47** or higher.
Rust **1.51** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand Up@@ -45,7 +45,7 @@ dual licensed as above, without any additional terms or conditions.
[docs-image]: https://docs.rs/pbkdf2/badge.svg
[docs-link]: https://docs.rs/pbkdf2/
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.47+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.51+-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/pbkdf2/badge.svg?branch=master&event=push
Expand Down

4 changes: 2 additions & 2 deletions
scrypt/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ Pure Rust implementation of the [scrypt key derivation function][1].

## Minimum Supported Rust Version

Rust **1.47** or higher.
Rust **1.51** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand Up@@ -45,7 +45,7 @@ dual licensed as above, without any additional terms or conditions.
[docs-image]: https://docs.rs/scrypt/badge.svg
[docs-link]: https://docs.rs/scrypt/
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.47+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.51+-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/scrypt/badge.svg?branch=master&event=push
Expand Down

2 changes: 1 addition & 1 deletion
sha-crypt/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ readme = "README.md"
[dependencies]
sha2 = { version = "0.9", default-features = false }
rand = { version = "0.8", optional = true }
subtle = { version = "=2.4", optional = true, default-features = false }
subtle = { version = ">=2, <2.4", optional = true, default-features = false }

[features]
default = ["simple"]
Expand Down

4 changes: 2 additions & 2 deletions
sha-crypt/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ Password hashes using this algorithm start with `$6$` when encoded using the

## Minimum Supported Rust Version

Rust **1.41** or higher.
Rust **1.51** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand Up@@ -49,7 +49,7 @@ dual licensed as above, without any additional terms or conditions.
[docs-image]: https://docs.rs/sha-crypt/badge.svg
[docs-link]: https://docs.rs/sha-crypt/
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.47+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.51+-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/sha-crypt/badge.svg?branch=master&event=push
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Use `resolver = "2"`; MSRV 1.51+ by tarcieri · Pull Request #220 · RustCrypto/password-hashes · GitHub
Skip to content
Use resolver = "2"; MSRV 1.51+#220

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

Aug 27, 2021
 Merged


Use resolver = "2"; MSRV 1.51+
#220
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


47 changes: 23 additions & 24 deletions
.github/workflows/argon2.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,36 +17,35 @@ env:
 RUSTFLAGS: "-Dwarnings"

jobs:
# TODO(tarcieri): test when new cargo resolver is available (RFC 2957)
# build:
# runs-on: ubuntu-latest
# strategy:
# matrix:
# rust:
# - 1.47.0 # MSRV
# - stable
# target:
# - thumbv7em-none-eabi
# - wasm32-unknown-unknown
# steps:
# - uses: actions/checkout@v1
# - uses: actions-rs/toolchain@v1
# with:
# profile: minimal
# toolchain: ${{ matrix.rust }}
# target: ${{ matrix.target }}
# override: true
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features password-hash
# - run: cargo build --target ${{ matrix.target }} --release
# - run: cargo build --target ${{ matrix.target }} --release --features zeroize
 build:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.51.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
 - wasm32-unknown-unknown
 steps:
 - uses: actions/checkout@v1
 - uses: actions-rs/toolchain@v1
 with:
 profile: minimal
 toolchain: ${{ matrix.rust }}
 target: ${{ matrix.target }}
 override: true
 - run: cargo build --target ${{ matrix.target }} --release --no-default-features
 - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features password-hash
 - run: cargo build --target ${{ matrix.target }} --release
 - run: cargo build --target ${{ matrix.target }} --release --features zeroize

 test:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v1
Expand Down

4 changes: 2 additions & 2 deletions
.github/workflows/bcrypt-pbkdf.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
Expand All@@ -42,7 +42,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v1
Expand Down

41 changes: 20 additions & 21 deletions
.github/workflows/pbkdf2.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,33 +17,32 @@ env:
 RUSTFLAGS: "-Dwarnings"

jobs:
# TODO(tarcieri): test when new cargo resolver is available (RFC 2957)
# build:
# runs-on: ubuntu-latest
# strategy:
# matrix:
# rust:
# - 1.47.0 # MSRV
# - stable
# target:
# - thumbv7em-none-eabi
# - wasm32-unknown-unknown
# steps:
# - uses: actions/checkout@v1
# - uses: actions-rs/toolchain@v1
# with:
# profile: minimal
# toolchain: ${{ matrix.rust }}
# target: ${{ matrix.target }}
# override: true
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features
 build:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.51.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
 - wasm32-unknown-unknown
 steps:
 - uses: actions/checkout@v1
 - uses: actions-rs/toolchain@v1
 with:
 profile: minimal
 toolchain: ${{ matrix.rust }}
 target: ${{ matrix.target }}
 override: true
 - run: cargo build --target ${{ matrix.target }} --release --no-default-features

 test:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v1
Expand Down

43 changes: 21 additions & 22 deletions
.github/workflows/scrypt.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,34 +17,33 @@ env:
 RUSTFLAGS: "-Dwarnings"

jobs:
# TODO(tarcieri): test when new cargo resolver is available (RFC 2957)
# build:
# runs-on: ubuntu-latest
# strategy:
# matrix:
# rust:
# - 1.47.0 # MSRV
# - stable
# target:
# - thumbv7em-none-eabi
# - wasm32-unknown-unknown
# steps:
# - uses: actions/checkout@v1
# - uses: actions-rs/toolchain@v1
# with:
# profile: minimal
# toolchain: ${{ matrix.rust }}
# target: ${{ matrix.target }}
# override: true
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features simple
 build:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.51.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
 - wasm32-unknown-unknown
 steps:
 - uses: actions/checkout@v1
 - uses: actions-rs/toolchain@v1
 with:
 profile: minimal
 toolchain: ${{ matrix.rust }}
 target: ${{ matrix.target }}
 override: true
 - run: cargo build --target ${{ matrix.target }} --release --no-default-features
 - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features simple

 test:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v1
Expand Down

4 changes: 2 additions & 2 deletions
.github/workflows/sha-crypt.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
Expand All@@ -42,7 +42,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v1
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/workspace.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ jobs:
 - uses: actions/checkout@v1
 - uses: actions-rs/toolchain@v1
 with:
 toolchain: 1.47.0 # MSRV
 toolchain: 1.51.0 # MSRV
 components: clippy
 override: true
 profile: minimal
Expand Down

14 changes: 7 additions & 7 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.


1 change: 1 addition & 0 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
[workspace]
resolver = "2"
members = [
 "argon2",
 "bcrypt-pbkdf",
Expand Down

2 changes: 1 addition & 1 deletion
argon2/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ base64ct = "1"
blake2 = { version = "0.9", default-features = false }
password-hash = { version = "0.3", optional = true }
rayon = { version = "1", optional = true }
zeroize = { version = ">=1, <1.4", optional = true }
zeroize = { version = ">=1, <1.5", optional = true }

[dev-dependencies]
hex-literal = "0.3"
Expand Down

4 changes: 2 additions & 2 deletions
argon2/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ Pure Rust implementation of the [Argon2] password hashing function.

## Minimum Supported Rust Version

Rust **1.47** or higher.
Rust **1.51** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand 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.47+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.51+-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

2 changes: 1 addition & 1 deletion
bcrypt-pbkdf/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ blowfish = { version = "0.8", features = ["bcrypt"] }
crypto-mac = "0.11"
pbkdf2 = { version = "0.8", default-features = false, path = "../pbkdf2" }
sha2 = { version = "0.9", default-features = false }
zeroize = { version = ">=1, <1.4", default-features = false }
zeroize = { version = ">=1, <1.5", default-features = false }

[features]
default = ["std"]
Expand Down

4 changes: 2 additions & 2 deletions
pbkdf2/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff 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.47** or higher.
Rust **1.51** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand Up@@ -45,7 +45,7 @@ dual licensed as above, without any additional terms or conditions.
[docs-image]: https://docs.rs/pbkdf2/badge.svg
[docs-link]: https://docs.rs/pbkdf2/
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.47+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.51+-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/pbkdf2/badge.svg?branch=master&event=push
Expand Down

4 changes: 2 additions & 2 deletions
scrypt/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ Pure Rust implementation of the [scrypt key derivation function][1].

## Minimum Supported Rust Version

Rust **1.47** or higher.
Rust **1.51** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand Up@@ -45,7 +45,7 @@ dual licensed as above, without any additional terms or conditions.
[docs-image]: https://docs.rs/scrypt/badge.svg
[docs-link]: https://docs.rs/scrypt/
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.47+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.51+-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/scrypt/badge.svg?branch=master&event=push
Expand Down

2 changes: 1 addition & 1 deletion
sha-crypt/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ readme = "README.md"
[dependencies]
sha2 = { version = "0.9", default-features = false }
rand = { version = "0.8", optional = true }
subtle = { version = "=2.4", optional = true, default-features = false }
subtle = { version = ">=2, <2.4", optional = true, default-features = false }

[features]
default = ["simple"]
Expand Down

4 changes: 2 additions & 2 deletions
sha-crypt/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ Password hashes using this algorithm start with `$6$` when encoded using the

## Minimum Supported Rust Version

Rust **1.41** or higher.
Rust **1.51** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand Up@@ -49,7 +49,7 @@ dual licensed as above, without any additional terms or conditions.
[docs-image]: https://docs.rs/sha-crypt/badge.svg
[docs-link]: https://docs.rs/sha-crypt/
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.47+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.51+-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/sha-crypt/badge.svg?branch=master&event=push
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Use `resolver = "2"`; MSRV 1.51+ by tarcieri · Pull Request #220 · RustCrypto/password-hashes · GitHub
Skip to content
Use resolver = "2"; MSRV 1.51+#220

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

Aug 27, 2021
 Merged


Use resolver = "2"; MSRV 1.51+
#220
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


47 changes: 23 additions & 24 deletions
.github/workflows/argon2.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,36 +17,35 @@ env:
 RUSTFLAGS: "-Dwarnings"

jobs:
# TODO(tarcieri): test when new cargo resolver is available (RFC 2957)
# build:
# runs-on: ubuntu-latest
# strategy:
# matrix:
# rust:
# - 1.47.0 # MSRV
# - stable
# target:
# - thumbv7em-none-eabi
# - wasm32-unknown-unknown
# steps:
# - uses: actions/checkout@v1
# - uses: actions-rs/toolchain@v1
# with:
# profile: minimal
# toolchain: ${{ matrix.rust }}
# target: ${{ matrix.target }}
# override: true
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features password-hash
# - run: cargo build --target ${{ matrix.target }} --release
# - run: cargo build --target ${{ matrix.target }} --release --features zeroize
 build:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.51.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
 - wasm32-unknown-unknown
 steps:
 - uses: actions/checkout@v1
 - uses: actions-rs/toolchain@v1
 with:
 profile: minimal
 toolchain: ${{ matrix.rust }}
 target: ${{ matrix.target }}
 override: true
 - run: cargo build --target ${{ matrix.target }} --release --no-default-features
 - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features password-hash
 - run: cargo build --target ${{ matrix.target }} --release
 - run: cargo build --target ${{ matrix.target }} --release --features zeroize

 test:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v1
Expand Down

4 changes: 2 additions & 2 deletions
.github/workflows/bcrypt-pbkdf.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
Expand All@@ -42,7 +42,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v1
Expand Down

41 changes: 20 additions & 21 deletions
.github/workflows/pbkdf2.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,33 +17,32 @@ env:
 RUSTFLAGS: "-Dwarnings"

jobs:
# TODO(tarcieri): test when new cargo resolver is available (RFC 2957)
# build:
# runs-on: ubuntu-latest
# strategy:
# matrix:
# rust:
# - 1.47.0 # MSRV
# - stable
# target:
# - thumbv7em-none-eabi
# - wasm32-unknown-unknown
# steps:
# - uses: actions/checkout@v1
# - uses: actions-rs/toolchain@v1
# with:
# profile: minimal
# toolchain: ${{ matrix.rust }}
# target: ${{ matrix.target }}
# override: true
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features
 build:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.51.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
 - wasm32-unknown-unknown
 steps:
 - uses: actions/checkout@v1
 - uses: actions-rs/toolchain@v1
 with:
 profile: minimal
 toolchain: ${{ matrix.rust }}
 target: ${{ matrix.target }}
 override: true
 - run: cargo build --target ${{ matrix.target }} --release --no-default-features

 test:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v1
Expand Down

43 changes: 21 additions & 22 deletions
.github/workflows/scrypt.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,34 +17,33 @@ env:
 RUSTFLAGS: "-Dwarnings"

jobs:
# TODO(tarcieri): test when new cargo resolver is available (RFC 2957)
# build:
# runs-on: ubuntu-latest
# strategy:
# matrix:
# rust:
# - 1.47.0 # MSRV
# - stable
# target:
# - thumbv7em-none-eabi
# - wasm32-unknown-unknown
# steps:
# - uses: actions/checkout@v1
# - uses: actions-rs/toolchain@v1
# with:
# profile: minimal
# toolchain: ${{ matrix.rust }}
# target: ${{ matrix.target }}
# override: true
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features
# - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features simple
 build:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.51.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
 - wasm32-unknown-unknown
 steps:
 - uses: actions/checkout@v1
 - uses: actions-rs/toolchain@v1
 with:
 profile: minimal
 toolchain: ${{ matrix.rust }}
 target: ${{ matrix.target }}
 override: true
 - run: cargo build --target ${{ matrix.target }} --release --no-default-features
 - run: cargo build --target ${{ matrix.target }} --release --no-default-features --features simple

 test:
 runs-on: ubuntu-latest
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v1
Expand Down

4 changes: 2 additions & 2 deletions
.github/workflows/sha-crypt.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
Expand All@@ -42,7 +42,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.47.0 # MSRV
 - 1.51.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v1
Expand Down

2 changes: 1 addition & 1 deletion
.github/workflows/workspace.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ jobs:
 - uses: actions/checkout@v1
 - uses: actions-rs/toolchain@v1
 with:
 toolchain: 1.47.0 # MSRV
 toolchain: 1.51.0 # MSRV
 components: clippy
 override: true
 profile: minimal
Expand Down

14 changes: 7 additions & 7 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.


1 change: 1 addition & 0 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
[workspace]
resolver = "2"
members = [
 "argon2",
 "bcrypt-pbkdf",
Expand Down

2 changes: 1 addition & 1 deletion
argon2/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ base64ct = "1"
blake2 = { version = "0.9", default-features = false }
password-hash = { version = "0.3", optional = true }
rayon = { version = "1", optional = true }
zeroize = { version = ">=1, <1.4", optional = true }
zeroize = { version = ">=1, <1.5", optional = true }

[dev-dependencies]
hex-literal = "0.3"
Expand Down

4 changes: 2 additions & 2 deletions
argon2/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ Pure Rust implementation of the [Argon2] password hashing function.

## Minimum Supported Rust Version

Rust **1.47** or higher.
Rust **1.51** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand 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.47+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.51+-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

2 changes: 1 addition & 1 deletion
bcrypt-pbkdf/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ blowfish = { version = "0.8", features = ["bcrypt"] }
crypto-mac = "0.11"
pbkdf2 = { version = "0.8", default-features = false, path = "../pbkdf2" }
sha2 = { version = "0.9", default-features = false }
zeroize = { version = ">=1, <1.4", default-features = false }
zeroize = { version = ">=1, <1.5", default-features = false }

[features]
default = ["std"]
Expand Down

4 changes: 2 additions & 2 deletions
pbkdf2/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff 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.47** or higher.
Rust **1.51** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand Up@@ -45,7 +45,7 @@ dual licensed as above, without any additional terms or conditions.
[docs-image]: https://docs.rs/pbkdf2/badge.svg
[docs-link]: https://docs.rs/pbkdf2/
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.47+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.51+-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/pbkdf2/badge.svg?branch=master&event=push
Expand Down

4 changes: 2 additions & 2 deletions
scrypt/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ Pure Rust implementation of the [scrypt key derivation function][1].

## Minimum Supported Rust Version

Rust **1.47** or higher.
Rust **1.51** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand Up@@ -45,7 +45,7 @@ dual licensed as above, without any additional terms or conditions.
[docs-image]: https://docs.rs/scrypt/badge.svg
[docs-link]: https://docs.rs/scrypt/
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.47+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.51+-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/scrypt/badge.svg?branch=master&event=push
Expand Down

2 changes: 1 addition & 1 deletion
sha-crypt/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ readme = "README.md"
[dependencies]
sha2 = { version = "0.9", default-features = false }
rand = { version = "0.8", optional = true }
subtle = { version = "=2.4", optional = true, default-features = false }
subtle = { version = ">=2, <2.4", optional = true, default-features = false }

[features]
default = ["simple"]
Expand Down

4 changes: 2 additions & 2 deletions
sha-crypt/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ Password hashes using this algorithm start with `$6$` when encoded using the

## Minimum Supported Rust Version

Rust **1.41** or higher.
Rust **1.51** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand Up@@ -49,7 +49,7 @@ dual licensed as above, without any additional terms or conditions.
[docs-image]: https://docs.rs/sha-crypt/badge.svg
[docs-link]: https://docs.rs/sha-crypt/
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.47+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.51+-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/sha-crypt/badge.svg?branch=master&event=push
Expand Down