Upgrade getrandom to 0.3 (#91)

Notably this removes the `js` feature in favor of a `cfg`

Author: alex

.github/workflows/ci.yml

@@ -79,7 +79,7 @@ jobs:
 
  - uses: dtolnay/rust-toolchain@master
  with:
- toolchain: 1.60.0
+ toolchain: 1.63.0
  components: clippy
 
  - run: cargo clippy -- -D warnings

Cargo.toml

@@ -15,11 +15,10 @@ include = ["src/**/*", "LICENSE", "README.md"]
 default = ["std", "zeroize"]
 std = ["getrandom/std", "base64/std"]
 alloc = ["base64/alloc", "getrandom"]
-js = ["getrandom/js"]
 
 [dependencies]
 blowfish = { version = "0.9", features = ["bcrypt"] }
-getrandom = { version = "0.2", default-features = false, optional = true }
+getrandom = { version = "0.3", default-features = false, optional = true }
 base64 = { version = "0.22", default-features = false }
 zeroize = { version = "1.5.4", optional = true }
 subtle = { version = "2.4.1", default-features = false }

src/lib.rs

@@ -17,7 +17,7 @@ use zeroize::Zeroize;
 use base64::{alphabet::BCRYPT, engine::general_purpose::NO_PAD, engine::GeneralPurpose};
 use core::fmt;
 #[cfg(any(feature = "alloc", feature = "std"))]
-use {base64::Engine, core::convert::AsRef, core::str::FromStr, getrandom::getrandom};
+use {base64::Engine, core::convert::AsRef, core::str::FromStr};
 
 mod bcrypt;
 mod errors;
@@ -32,7 +32,7 @@ pub const DEFAULT_COST: u32 = 12;
 pub const BASE_64: GeneralPurpose = GeneralPurpose::new(&BCRYPT, NO_PAD);
 
 #[cfg(any(feature = "alloc", feature = "std"))]
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
 /// A bcrypt hash result before concatenating
 pub struct HashParts {
  cost: u32,
@@ -203,7 +203,7 @@ pub fn non_truncating_hash<P: AsRef<[u8]>>(password: P, cost: u32) -> BcryptResu
 pub fn hash_with_result<P: AsRef<[u8]>>(password: P, cost: u32) -> BcryptResult<HashParts> {
  let salt = {
  let mut s = [0u8; 16];
- getrandom(&mut s).map(|_| s)
+ getrandom::fill(&mut s).map(|_| s)
  }?;
 
  _hash_password(password.as_ref(), cost, salt, false)
@@ -220,7 +220,7 @@ pub fn non_truncating_hash_with_result<P: AsRef<[u8]>>(
 ) -> BcryptResult<HashParts> {
  let salt = {
  let mut s = [0u8; 16];
- getrandom(&mut s).map(|_| s)
+ getrandom::fill(&mut s).map(|_| s)
  }?;
 
  _hash_password(password.as_ref(), cost, salt, true)