Skip to content

Commit

Permalink
update crates to digest v0.10
Browse files Browse the repository at this point in the history
  • Loading branch information
newpavlov committed Nov 23, 2021
1 parent 8754a8d commit 88365d6
Show file tree
Hide file tree
Showing 23 changed files with 257 additions and 279 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/argon2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ jobs:
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
- run: cargo build --target ${{ matrix.target }} --no-default-features
- run: cargo build --target ${{ matrix.target }} --no-default-features --features password-hash
- run: cargo build --target ${{ matrix.target }}
- run: cargo build --target ${{ matrix.target }} --features zeroize

test:
runs-on: ubuntu-latest
Expand All @@ -54,7 +54,7 @@ jobs:
profile: minimal
toolchain: ${{ matrix.rust }}
override: true
- run: cargo test --release --no-default-features
- run: cargo test --release --no-default-features --features password-hash
- run: cargo test --release
- run: cargo test --release --all-features
- run: cargo test --no-default-features
- run: cargo test --no-default-features --features password-hash
- run: cargo test
- run: cargo test --all-features
13 changes: 5 additions & 8 deletions .github/workflows/pbkdf2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ jobs:
toolchain: ${{ matrix.rust }}
target: ${{ matrix.target }}
override: true
- run: cargo build --target ${{ matrix.target }} --release --no-default-features
- run: cargo build --target ${{ matrix.target }} --no-default-features
- run: cargo build --target ${{ matrix.target }} --no-default-features --features simple

test:
runs-on: ubuntu-latest
Expand All @@ -51,10 +52,6 @@ jobs:
profile: minimal
toolchain: ${{ matrix.rust }}
override: true
- run: cargo test --release --no-default-features
- run: cargo test --release
- run: cargo test --release --features simple
- run: cargo test --release --features parallel
- run: cargo test --release --features sha1
- run: cargo test --release --features simple,sha1
- run: cargo test --release --all-features
- run: cargo test --no-default-features
- run: cargo test
- run: cargo test --all-features
9 changes: 5 additions & 4 deletions .github/workflows/scrypt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ jobs:
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
- run: cargo build --target ${{ matrix.target }} --no-default-features
- run: cargo build --target ${{ matrix.target }} --no-default-features --features simple

test:
runs-on: ubuntu-latest
Expand All @@ -52,5 +52,6 @@ jobs:
profile: minimal
toolchain: ${{ matrix.rust }}
override: true
- run: cargo test --release --no-default-features
- run: cargo test --release
- run: cargo test --no-default-features
- run: cargo test
- run: cargo test --all-features
7 changes: 4 additions & 3 deletions .github/workflows/sha-crypt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
toolchain: ${{ matrix.rust }}
target: ${{ matrix.target }}
override: true
- run: cargo build --target ${{ matrix.target }} --release --no-default-features
- run: cargo build --target ${{ matrix.target }} --no-default-features

test:
runs-on: ubuntu-latest
Expand All @@ -51,5 +51,6 @@ jobs:
profile: minimal
toolchain: ${{ matrix.rust }}
override: true
- run: cargo test --release --no-default-features
- run: cargo test --release
- run: cargo test --no-default-features
- run: cargo test
- run: cargo test --all-features
98 changes: 33 additions & 65 deletions Cargo.lock

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

12 changes: 12 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,15 @@ members = [
"scrypt",
"sha-crypt"
]

[profile.dev]
opt-level = 2

[patch.crates-io]
digest = { git = "https://github.com/RustCrypto/traits/", branch = "digest/v0.10" }
block-buffer = { git = "https://github.com/RustCrypto/utils", branch = "block-buffer/v0.10" }
blake2 = { git = "https://github.com/RustCrypto/hashes/", branch = "digest/v0.10.0-pre" }
sha-1 = { git = "https://github.com/RustCrypto/hashes/", branch = "digest/v0.10.0-pre" }
sha2 = { git = "https://github.com/RustCrypto/hashes/", branch = "digest/v0.10.0-pre" }
streebog = { git = "https://github.com/RustCrypto/hashes/", branch = "digest/v0.10.0-pre" }
hmac = { git = "https://github.com/RustCrypto/MACs/", branch = "hmac/v0.12" }
38 changes: 22 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
# RustCrypto: password hashes ![Rust Version][rustc-image] [![Project Chat][chat-image]][chat-link] [![dependency status][deps-image]][deps-link]
# RustCrypto: Password Hashes [![Project Chat][chat-image]][chat-link] [![dependency status][deps-image]][deps-link]

Collection of password hashing algorithms, otherwise known as password-based key
derivation functions, written in pure Rust.
Collection of password hashing algorithms, otherwise known as password-based key derivation functions, written in pure Rust.

## Supported algorithms
## Supported Algorithms

| Name | Crates.io | Documentation | Build |
|-----------|------------|---------------|-------|
| [Argon2](https://en.wikipedia.org/wiki/Argon2) | [![crates.io](https://img.shields.io/crates/v/argon2.svg)](https://crates.io/crates/argon2) | [![Documentation](https://docs.rs/argon2/badge.svg)](https://docs.rs/argon2) | ![Build](https://github.com/RustCrypto/password-hashes/workflows/argon2/badge.svg?branch=master&event=push) |
| [bcrypt-pbkdf](https://flak.tedunangst.com/post/bcrypt-pbkdf) | [![crates.io](https://img.shields.io/crates/v/bcrypt-pbkdf.svg)](https://crates.io/crates/bcrypt-pbkdf) | [![Documentation](https://docs.rs/bcrypt-pbkdf/badge.svg)](https://docs.rs/bcrypt-pbkdf) | ![Build](https://github.com/RustCrypto/password-hashes/workflows/bcrypt-pbkdf/badge.svg?branch=master&event=push) |
| [PBKDF2](https://en.wikipedia.org/wiki/PBKDF2) | [![crates.io](https://img.shields.io/crates/v/pbkdf2.svg)](https://crates.io/crates/pbkdf2) | [![Documentation](https://docs.rs/pbkdf2/badge.svg)](https://docs.rs/pbkdf2) | ![Build](https://github.com/RustCrypto/password-hashes/workflows/pbkdf2/badge.svg?branch=master&event=push) |
| [scrypt](https://en.wikipedia.org/wiki/Scrypt) | [![crates.io](https://img.shields.io/crates/v/scrypt.svg)](https://crates.io/crates/scrypt) | [![Documentation](https://docs.rs/scrypt/badge.svg)](https://docs.rs/scrypt) | ![Build](https://github.com/RustCrypto/password-hashes/workflows/scrypt/badge.svg?branch=master&event=push) |
| [SHA-crypt](https://www.akkadia.org/drepper/SHA-crypt.txt) | [![crates.io](https://img.shields.io/crates/v/sha-crypt.svg)](https://crates.io/crates/sha-crypt) | [![Documentation](https://docs.rs/sha-crypt/badge.svg)](https://docs.rs/sha-crypt) | ![Build](https://github.com/RustCrypto/password-hashes/workflows/sha-crypt/badge.svg?branch=master&event=push) |
| Algorithm | Crate | Crates.io | Documentation | MSRV |
|-----------|-------|:----------:|:-------------:|:----:|
| [Argon2] | `argon2` | [![crates.io](https://img.shields.io/crates/v/argon2.svg)](https://crates.io/crates/argon2) | [![Documentation](https://docs.rs/argon2/badge.svg)](https://docs.rs/argon2) | ![MSRV 1.51][msrv-1.51] |
| [bcrypt-pbkdf] | `bcrypt-pbkdf` |[![crates.io](https://img.shields.io/crates/v/bcrypt-pbkdf.svg)](https://crates.io/crates/bcrypt-pbkdf) | [![Documentation](https://docs.rs/bcrypt-pbkdf/badge.svg)](https://docs.rs/bcrypt-pbkdf) | ![MSRV 1.51][msrv-1.51] |
| [PBKDF2] | `pbkdf2` | [![crates.io](https://img.shields.io/crates/v/pbkdf2.svg)](https://crates.io/crates/pbkdf2) | [![Documentation](https://docs.rs/pbkdf2/badge.svg)](https://docs.rs/pbkdf2) | ![MSRV 1.51][msrv-1.51] |
| [scrypt] | `scrypt` | [![crates.io](https://img.shields.io/crates/v/scrypt.svg)](https://crates.io/crates/scrypt) | [![Documentation](https://docs.rs/scrypt/badge.svg)](https://docs.rs/scrypt) | ![MSRV 1.51][msrv-1.51] |
| [SHA-crypt] | `sha-crypt` | [![crates.io](https://img.shields.io/crates/v/sha-crypt.svg)](https://crates.io/crates/sha-crypt) | [![Documentation](https://docs.rs/sha-crypt/badge.svg)](https://docs.rs/sha-crypt) | ![MSRV 1.51][msrv-1.51] |

Please see the [OWASP Password Storage Cheat Sheet] for assistance in selecting
an appropriate algorithm for your use case.
Please see the [OWASP Password Storage Cheat Sheet] for assistance in selecting an appropriate algorithm for your use case.

### Minimum Supported Rust Version (MSRV) Policy

MSRV bumps are considered breaking changes and will be performed only with minor version bump.

## License

Expand All @@ -27,17 +29,21 @@ at your option.

### Contribution

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

[//]: # (badges)

[rustc-image]: https://img.shields.io/badge/rustc-1.41+-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
[deps-image]: https://deps.rs/repo/github/RustCrypto/password-hashes/status.svg
[deps-link]: https://deps.rs/repo/github/RustCrypto/password-hashes
[msrv-1.51]: https://img.shields.io/badge/rustc-1.51.0+-blue.svg

[//]: # (general links)

[Argon2]: https://en.wikipedia.org/wiki/Argon2
[bcrypt-pbkdf]: https://flak.tedunangst.com/post/bcrypt-pbkdf
[PBKDF2]: https://en.wikipedia.org/wiki/PBKDF2
[scrypt]: https://en.wikipedia.org/wiki/Scrypt
[SHA-crypt]: https://www.akkadia.org/drepper/SHA-crypt.txt
[OWASP Password Storage Cheat Sheet]: https://cheatsheetseries.owasp.org/cheatsheets/Password_Storage_Cheat_Sheet.html

0 comments on commit 88365d6

Please sign in to comment.