From b439a54e2496f9c4435dc9ed0001108bf2b5c84a Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Fri, 27 Sep 2024 23:32:26 -0700 Subject: [PATCH 1/2] Bump hybrid-array to 0.2.0-rc.10; bump MSRV to 1.81 --- .github/workflows/argon2.yml | 8 ++++---- .github/workflows/balloon-hash.yml | 4 ++-- .github/workflows/bcrypt-pbkdf.yml | 4 ++-- .github/workflows/password-auth.yml | 4 ++-- .github/workflows/pbkdf2.yml | 4 ++-- .github/workflows/scrypt.yml | 4 ++-- .github/workflows/sha-crypt.yml | 4 ++-- .github/workflows/workspace.yml | 2 +- .github/workflows/yescrypt.yml | 4 ++-- Cargo.lock | 4 ++-- argon2/Cargo.toml | 2 +- balloon-hash/Cargo.toml | 2 +- bcrypt-pbkdf/Cargo.toml | 2 +- password-auth/Cargo.toml | 2 +- pbkdf2/Cargo.toml | 2 +- scrypt/Cargo.toml | 2 +- sha-crypt/Cargo.toml | 2 +- yescrypt/Cargo.toml | 2 +- 18 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.github/workflows/argon2.yml b/.github/workflows/argon2.yml index c26614c2..2d572273 100644 --- a/.github/workflows/argon2.yml +++ b/.github/workflows/argon2.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: rust: - - 1.71.0 # MSRV + - 1.81.0 # MSRV - stable target: - thumbv7em-none-eabi @@ -51,7 +51,7 @@ jobs: include: # 32-bit Linux - target: i686-unknown-linux-gnu - rust: 1.71.0 # MSRV + rust: 1.81.0 # MSRV deps: sudo apt update && sudo apt install gcc-multilib - target: i686-unknown-linux-gnu rust: stable @@ -59,7 +59,7 @@ jobs: # 64-bit Linux - target: x86_64-unknown-linux-gnu - rust: 1.71.0 # MSRV + rust: 1.81.0 # MSRV - target: x86_64-unknown-linux-gnu rust: stable steps: @@ -80,7 +80,7 @@ jobs: matrix: include: - target: powerpc-unknown-linux-gnu - rust: 1.71.0 # MSRV + rust: 1.81.0 # MSRV - target: powerpc-unknown-linux-gnu rust: stable runs-on: ubuntu-latest diff --git a/.github/workflows/balloon-hash.yml b/.github/workflows/balloon-hash.yml index c629c614..6efc802c 100644 --- a/.github/workflows/balloon-hash.yml +++ b/.github/workflows/balloon-hash.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: rust: - - 1.73.0 # MSRV + - 1.81.0 # MSRV - stable target: - thumbv7em-none-eabi @@ -48,7 +48,7 @@ jobs: strategy: matrix: rust: - - 1.73.0 # MSRV + - 1.81.0 # MSRV - stable steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/bcrypt-pbkdf.yml b/.github/workflows/bcrypt-pbkdf.yml index 39015afc..81ef93ea 100644 --- a/.github/workflows/bcrypt-pbkdf.yml +++ b/.github/workflows/bcrypt-pbkdf.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: rust: - - 1.72.0 # MSRV + - 1.81.0 # MSRV - stable target: - thumbv7em-none-eabi @@ -48,7 +48,7 @@ jobs: strategy: matrix: rust: - - 1.72.0 # MSRV + - 1.81.0 # MSRV - stable steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/password-auth.yml b/.github/workflows/password-auth.yml index 01e30d77..887cff17 100644 --- a/.github/workflows/password-auth.yml +++ b/.github/workflows/password-auth.yml @@ -26,7 +26,7 @@ jobs: strategy: matrix: rust: - - 1.72.0 # MSRV + - 1.81.0 # MSRV - stable steps: - uses: actions/checkout@v4 @@ -45,7 +45,7 @@ jobs: strategy: matrix: rust: - - 1.72.0 # MSRV + - 1.81.0 # MSRV - stable steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/pbkdf2.yml b/.github/workflows/pbkdf2.yml index cd2c4457..8c636b0f 100644 --- a/.github/workflows/pbkdf2.yml +++ b/.github/workflows/pbkdf2.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: rust: - - 1.72.0 # MSRV + - 1.81.0 # MSRV - stable target: - thumbv7em-none-eabi @@ -47,7 +47,7 @@ jobs: strategy: matrix: rust: - - 1.72.0 # MSRV + - 1.81.0 # MSRV - stable steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/scrypt.yml b/.github/workflows/scrypt.yml index b9261465..43d09fd7 100644 --- a/.github/workflows/scrypt.yml +++ b/.github/workflows/scrypt.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: rust: - - 1.72.0 # MSRV + - 1.81.0 # MSRV - stable target: - thumbv7em-none-eabi @@ -49,7 +49,7 @@ jobs: strategy: matrix: rust: - - 1.72.0 # MSRV + - 1.81.0 # MSRV - stable steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/sha-crypt.yml b/.github/workflows/sha-crypt.yml index 7dbe564e..69c9d9f2 100644 --- a/.github/workflows/sha-crypt.yml +++ b/.github/workflows/sha-crypt.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: rust: - - 1.72.0 # MSRV + - 1.81.0 # MSRV - stable target: - thumbv7em-none-eabi @@ -46,7 +46,7 @@ jobs: strategy: matrix: rust: - - 1.72.0 # MSRV + - 1.81.0 # MSRV - stable steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/workspace.yml b/.github/workflows/workspace.yml index 6fd9d509..9d7b2357 100644 --- a/.github/workflows/workspace.yml +++ b/.github/workflows/workspace.yml @@ -17,7 +17,7 @@ jobs: - uses: RustCrypto/actions/cargo-cache@master - uses: dtolnay/rust-toolchain@master with: - toolchain: 1.73.0 + toolchain: 1.81.0 components: clippy - run: cargo clippy --all -- -D warnings diff --git a/.github/workflows/yescrypt.yml b/.github/workflows/yescrypt.yml index 70241927..d42df4a6 100644 --- a/.github/workflows/yescrypt.yml +++ b/.github/workflows/yescrypt.yml @@ -29,7 +29,7 @@ jobs: include: # 32-bit Linux - target: i686-unknown-linux-gnu - rust: 1.72.0 # MSRV + rust: 1.81.0 # MSRV deps: sudo apt update && sudo apt install gcc-multilib - target: i686-unknown-linux-gnu rust: stable @@ -37,7 +37,7 @@ jobs: # 64-bit Linux - target: x86_64-unknown-linux-gnu - rust: 1.72.0 # MSRV + rust: 1.81.0 # MSRV - target: x86_64-unknown-linux-gnu rust: stable steps: diff --git a/Cargo.lock b/Cargo.lock index 21e47cdd..1b814a23 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -240,9 +240,9 @@ dependencies = [ [[package]] name = "hybrid-array" -version = "0.2.0-rc.9" +version = "0.2.0-rc.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d306b679262030ad8813a82d4915fc04efff97776e4db7f8eb5137039d56400" +checksum = "bae36f8710514b3e7aab028021733330de6e455e0352e19c6dd4513eecb7aa9a" dependencies = [ "typenum", ] diff --git a/argon2/Cargo.toml b/argon2/Cargo.toml index 780bcfa6..9a078dd7 100644 --- a/argon2/Cargo.toml +++ b/argon2/Cargo.toml @@ -14,7 +14,7 @@ keywords = ["crypto", "hashing", "password", "phf"] categories = ["authentication", "cryptography", "no-std"] readme = "README.md" edition = "2021" -rust-version = "1.71" +rust-version = "1.81" [dependencies] base64ct = "1" diff --git a/balloon-hash/Cargo.toml b/balloon-hash/Cargo.toml index 84cfb6a3..9c858c64 100644 --- a/balloon-hash/Cargo.toml +++ b/balloon-hash/Cargo.toml @@ -11,7 +11,7 @@ keywords = ["crypto", "hashing", "password", "phf"] categories = ["authentication", "cryptography", "no-std"] readme = "README.md" edition = "2021" -rust-version = "1.73" +rust-version = "1.81" [dependencies] digest = { version = "=0.11.0-pre.9", default-features = false } diff --git a/bcrypt-pbkdf/Cargo.toml b/bcrypt-pbkdf/Cargo.toml index 1ec33764..cd34d9db 100644 --- a/bcrypt-pbkdf/Cargo.toml +++ b/bcrypt-pbkdf/Cargo.toml @@ -11,7 +11,7 @@ repository = "https://github.com/RustCrypto/password-hashes" keywords = ["crypto", "hashing", "password", "phf"] categories = ["authentication", "cryptography", "no-std"] edition = "2021" -rust-version = "1.72" +rust-version = "1.81" [dependencies] blowfish = { version = "=0.10.0-pre.2", features = ["bcrypt"] } diff --git a/password-auth/Cargo.toml b/password-auth/Cargo.toml index 5dc976cd..a1ab34ca 100644 --- a/password-auth/Cargo.toml +++ b/password-auth/Cargo.toml @@ -14,7 +14,7 @@ keywords = ["crypto", "password", "hashing"] categories = ["authentication", "cryptography", "no-std"] readme = "README.md" edition = "2021" -rust-version = "1.72" +rust-version = "1.81" [dependencies] password-hash = { version = "0.6.0-rc.0", features = ["alloc", "rand_core"] } diff --git a/pbkdf2/Cargo.toml b/pbkdf2/Cargo.toml index be9f3767..e4fcb349 100644 --- a/pbkdf2/Cargo.toml +++ b/pbkdf2/Cargo.toml @@ -11,7 +11,7 @@ keywords = ["crypto", "hashing", "password", "phf"] categories = ["authentication", "cryptography", "no-std"] readme = "README.md" edition = "2021" -rust-version = "1.72" +rust-version = "1.81" [dependencies] digest = { version = "=0.11.0-pre.9", features = ["mac"] } diff --git a/scrypt/Cargo.toml b/scrypt/Cargo.toml index b64a6df8..7bce5d91 100644 --- a/scrypt/Cargo.toml +++ b/scrypt/Cargo.toml @@ -11,7 +11,7 @@ repository = "https://github.com/RustCrypto/password-hashes" keywords = ["crypto", "hashing", "password", "phf"] categories = ["authentication", "cryptography", "no-std"] edition = "2021" -rust-version = "1.72" +rust-version = "1.81" [dependencies] pbkdf2 = { version = "=0.13.0-pre.1", path = "../pbkdf2" } diff --git a/sha-crypt/Cargo.toml b/sha-crypt/Cargo.toml index d058b312..25ca5016 100644 --- a/sha-crypt/Cargo.toml +++ b/sha-crypt/Cargo.toml @@ -14,7 +14,7 @@ keywords = ["crypto", "hashing", "password", "phf"] categories = ["authentication", "cryptography", "no-std"] readme = "README.md" edition = "2021" -rust-version = "1.72" +rust-version = "1.81" [dependencies] sha2 = { version = "=0.11.0-pre.4", default-features = false } diff --git a/yescrypt/Cargo.toml b/yescrypt/Cargo.toml index 6467116f..473ee04b 100644 --- a/yescrypt/Cargo.toml +++ b/yescrypt/Cargo.toml @@ -11,7 +11,7 @@ keywords = ["crypto", "hashing", "password", "phf"] categories = ["authentication", "cryptography", "no-std"] readme = "README.md" edition = "2021" -rust-version = "1.72" +rust-version = "1.81" [dependencies] libc = "0.2" From 1c5a6556a8add6235bbeb305aecd4c1756bf3673 Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Sat, 28 Sep 2024 13:10:29 -0700 Subject: [PATCH 2/2] sha-crypt: clippy fixes --- sha-crypt/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sha-crypt/src/lib.rs b/sha-crypt/src/lib.rs index 736403bd..91784814 100644 --- a/sha-crypt/src/lib.rs +++ b/sha-crypt/src/lib.rs @@ -384,7 +384,7 @@ pub fn sha256_simple(password: &str, params: &Sha256Params) -> String { /// # Arguments /// - `password` - expected password /// - `hashed_value` - the hashed value which should be used for checking, -/// should be of format mentioned in [1]: `$6$$` +/// should be of format mentioned in [1]: `$6$$` /// /// # Return /// `OK(())` if password matches otherwise Err(CheckError) in case of invalid @@ -462,7 +462,7 @@ pub fn sha512_check(password: &str, hashed_value: &str) -> Result<(), CheckError /// # Arguments /// - `password` - expected password /// - `hashed_value` - the hashed value which should be used for checking, -/// should be of format mentioned in [1]: `$6$$` +/// should be of format mentioned in [1]: `$6$$` /// /// # Return /// `OK(())` if password matches otherwise Err(CheckError) in case of invalid