Merge pull request #303 from sigstore/dependabot/cargo/testcontainers…

…-0.15

chore(deps): Update testcontainers requirement from 0.14 to 0.15

Cargo.toml

@@ -131,7 +131,7 @@ openssl = "0.10.38"
 rstest = "0.18.1"
 serial_test = "2.0.0"
 tempfile = "3.3.0"
-testcontainers = "0.14"
+testcontainers = "0.15"
 tracing-subscriber = { version = "0.3.9", features = ["env-filter"] }
 hex = "0.4.3"
 

src/cosign/mod.rs

@@ -297,11 +297,7 @@ mod tests {
     use crate::crypto::{CosignVerificationKey, SigningScheme};
 
     #[cfg(feature = "test-registry")]
-    use testcontainers::{
-        clients,
-        core::WaitFor,
-        images::{self, generic::GenericImage},
-    };
+    use testcontainers::{clients, core::WaitFor};
 
     pub(crate) const REKOR_PUB_KEY: &str = r#"-----BEGIN PUBLIC KEY-----
 MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE2G2Y+2tabdTV5BcGiBIx0a9fAFwr
@@ -674,8 +670,8 @@ TNMea7Ix/stJ5TfcLLeABLE4BNJOsQ4vnBHJ
     }
 
     #[cfg(feature = "test-registry")]
-    fn registry_image() -> GenericImage {
-        images::generic::GenericImage::new("docker.io/library/registry", "2")
+    fn registry_image() -> testcontainers::GenericImage {
+        testcontainers::GenericImage::new("docker.io/library/registry", "2")
             .with_wait_for(WaitFor::message_on_stderr("listening on "))
     }
 }

src/crypto/signing_key/kdf.rs

@@ -114,8 +114,7 @@ impl ScryptKDF {
             self.params.p,
             scrypt::Params::RECOMMENDED_LEN,
         )?;
-        let mut res = Vec::new();
-        res.resize(BOX_KEY_SIZE, 0x00);
+        let mut res = vec![0; BOX_KEY_SIZE];
         scrypt::scrypt(password, &self.salt, &params, &mut res)?;
         Ok(res)
     }