diff --git a/.github/workflows/pkcs5.yml b/.github/workflows/pkcs5.yml index ffc1348fe..537280507 100644 --- a/.github/workflows/pkcs5.yml +++ b/.github/workflows/pkcs5.yml @@ -43,12 +43,12 @@ jobs: toolchain: ${{ matrix.rust }} targets: ${{ matrix.target }} - uses: RustCrypto/actions/cargo-hack-install@master - - run: cargo hack build --target ${{ matrix.target }} --feature-powerset --exclude-features getrandom,std + - run: cargo hack build --target ${{ matrix.target }} --feature-powerset --exclude-features getrandom minimal-versions: uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master with: - working-directory: ${{ github.workflow }} + working-directory: ${{ github.workflow }} test: runs-on: ubuntu-latest diff --git a/Cargo.lock b/Cargo.lock index 6ecb6d624..003ff7a42 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -968,9 +968,9 @@ dependencies = [ [[package]] name = "pbkdf2" -version = "0.13.0-rc.10" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f24f3eb2f4471b1730d59e4b730b747939960a8c7eb0c33c5a9076f2d3dddea" +checksum = "112d82ceb8c5bf524d9af484d4e4970c9fd5a0cc15ba14ad93dccd28873b0629" dependencies = [ "digest", "hmac", @@ -1438,9 +1438,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scrypt" -version = "0.12.0-rc.10" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e03ed5b54ed5fcc8e016cd94301416bc2c01c05c87a6742b97468337c8804598" +checksum = "d87af57419b594aa23fa95f09f0e06d80d84ba01c26148c43844cad6ff4485f0" dependencies = [ "cfg-if", "pbkdf2", diff --git a/pkcs5/Cargo.toml b/pkcs5/Cargo.toml index 72e2d4979..3dacf9805 100644 --- a/pkcs5/Cargo.toml +++ b/pkcs5/Cargo.toml @@ -34,7 +34,6 @@ hex-literal = "1" [features] alloc = [] -std = [] 3des = ["dep:des", "pbes2"] des-insecure = ["dep:des", "pbes2"] diff --git a/pkcs5/src/error.rs b/pkcs5/src/error.rs index 050da6a38..a12068958 100644 --- a/pkcs5/src/error.rs +++ b/pkcs5/src/error.rs @@ -36,8 +36,7 @@ pub enum Error { }, } -#[cfg(feature = "std")] -impl std::error::Error for Error {} +impl core::error::Error for Error {} impl fmt::Display for Error { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { diff --git a/pkcs5/src/lib.rs b/pkcs5/src/lib.rs index 3bb1d4b8b..97cdbc2d4 100644 --- a/pkcs5/src/lib.rs +++ b/pkcs5/src/lib.rs @@ -29,9 +29,6 @@ #[cfg(all(feature = "alloc", feature = "pbes2"))] extern crate alloc; -#[cfg(feature = "std")] -extern crate std; - mod error; pub mod pbes1;