Merge pull request #442 from fabriziosestito/dependabot/cargo/rustls-…

…webpki-0.103

build(deps): rustls webpki 0.103

Cargo.toml

@@ -142,7 +142,8 @@ url = "2.5"
 x509-cert = { version = "0.2", features = ["builder", "pem", "std", "sct"] }
 crypto_secretbox = "0.1"
 zeroize = "1.8"
-rustls-webpki = { version = "0.103", features = ["alloc"] }
+rustls-webpki = { version = "0.103", features = ["alloc", "ring"] }
+pki-types = { package = "rustls-pki-types", version = "1.11", default-features = false }
 serde_repr = "0.1"
 hex = "0.4"
 json-syntax = { version = "0.12", features = ["canonicalize", "serde"] }

src/bundle/verify/verifier.rs

@@ -16,10 +16,10 @@
 
 use std::io::{self, Read};
 
+use pki_types::{CertificateDer, UnixTime};
 use sha2::{Digest, Sha256};
 use tokio::io::{AsyncRead, AsyncReadExt};
 use tracing::debug;
-use webpki::types::{CertificateDer, UnixTime};
 use x509_cert::der::Encode;
 
 use crate::{

src/cosign/client_builder.rs

@@ -13,8 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use pki_types::CertificateDer;
 use tracing::info;
-use webpki::types::CertificateDer;
 
 use super::client::Client;
 use crate::crypto::SigningScheme;

src/cosign/mod.rs

@@ -281,8 +281,8 @@ where
 
 #[cfg(test)]
 mod tests {
+    use pki_types::CertificateDer;
     use serde_json::json;
-    use webpki::types::CertificateDer;
 
     use super::constraint::{AnnotationMarker, PrivateKeySigner};
     use super::verification_constraint::cert_subject_email_verifier::StringVerifier;

src/cosign/signature_layers.rs

@@ -435,7 +435,7 @@ impl CertificateSignature {
         // ensure the certificate has been issued by Fulcio
         fulcio_cert_pool.verify_pem_cert(
             cert_pem,
-            Some(webpki::types::UnixTime::since_unix_epoch(
+            Some(pki_types::UnixTime::since_unix_epoch(
                 cert.tbs_certificate.validity.not_before.to_unix_duration(),
             )),
         )?;

src/cosign/verification_constraint/certificate_verifier.rs

@@ -1,7 +1,7 @@
 use chrono::{DateTime, Utc};
 use pkcs8::der::Decode;
+use pki_types::CertificateDer;
 use tracing::warn;
-use webpki::types::CertificateDer;
 use x509_cert::Certificate;
 
 use super::VerificationConstraint;

src/crypto/certificate_pool.rs

@@ -14,10 +14,8 @@
 // limitations under the License.
 
 use const_oid::db::rfc5280::ID_KP_CODE_SIGNING;
-use webpki::{
-    types::{CertificateDer, TrustAnchor, UnixTime},
-    EndEntityCert, KeyUsage, VerifiedPath,
-};
+use pki_types::{CertificateDer, TrustAnchor, UnixTime};
+use webpki::{EndEntityCert, KeyUsage, VerifiedPath};
 
 use crate::errors::{Result as SigstoreResult, SigstoreError};
 

src/registry/config.rs

@@ -15,9 +15,9 @@
 
 //! Set of structs and enums used to define how to interact with OCI registries
 
+use pki_types::CertificateDer;
 use serde::Serialize;
 use std::cmp::Ordering;
-use webpki::types::CertificateDer;
 
 use crate::errors;
 

src/trust/mod.rs

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use webpki::types::CertificateDer;
+use pki_types::CertificateDer;
 
 #[cfg_attr(docsrs, doc(cfg(feature = "sigstore-trust-root")))]
 #[cfg(feature = "sigstore-trust-root")]

src/trust/sigstore/mod.rs

@@ -25,13 +25,13 @@ use sha2::{Digest, Sha256};
 use std::path::Path;
 use tokio_util::bytes::BytesMut;
 
+use pki_types::CertificateDer;
 use sigstore_protobuf_specs::dev::sigstore::{
     common::v1::TimeRange,
     trustroot::v1::{CertificateAuthority, TransparencyLogInstance, TrustedRoot},
 };
 use tough::TargetName;
 use tracing::debug;
-use webpki::types::CertificateDer;
 
 mod constants;