rustls - cargo Package Compare versions

Comparing version 0.23.34 to 0.23.35

.cargo_vcs_info.json

 {
   "git": {
-    "sha1": "4cee226dbeb3fafeedda9041a2673d139319b51f"
+    "sha1": "7768cd2b44049e040685d48318d13bfa7f7d32a8"
   },
   "path_in_vcs": "rustls"
 }

Cargo.lock

@@ -183,3 +183,3 @@ # This file is automatically @generated by Cargo.
  "clang-sys",
- "itertools",
+ "itertools 0.10.5",
  "lazy_static",
@@ -207,3 +207,3 @@ "lazycell",
  "clang-sys",
- "itertools",
+ "itertools 0.13.0",
  "log",
@@ -471,2 +471,11 @@ "prettyplease",
 [[package]]
+name = "itertools"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
+[[package]]
 name = "itoa"
@@ -536,3 +545,3 @@ version = "1.0.15"
  "cfg-if",
- "windows-targets 0.48.5",
+ "windows-targets 0.53.3",
 ]
@@ -808,3 +817,3 @@
 name = "rustls"
-version = "0.23.34"
+version = "0.23.35"
 dependencies = [
@@ -1112,17 +1121,2 @@ "aws-lc-rs",
 name = "windows-targets"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
-dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
-]
-
-[[package]]
-name = "windows-targets"
 version = "0.52.6"
@@ -1161,8 +1155,2 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "windows_aarch64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
-[[package]]
-name = "windows_aarch64_gnullvm"
 version = "0.52.6"
@@ -1180,8 +1168,2 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "windows_aarch64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-
-[[package]]
-name = "windows_aarch64_msvc"
 version = "0.52.6"
@@ -1199,8 +1181,2 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "windows_i686_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-
-[[package]]
-name = "windows_i686_gnu"
 version = "0.52.6"
@@ -1230,8 +1206,2 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "windows_i686_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-
-[[package]]
-name = "windows_i686_msvc"
 version = "0.52.6"
@@ -1249,8 +1219,2 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "windows_x86_64_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-
-[[package]]
-name = "windows_x86_64_gnu"
 version = "0.52.6"
@@ -1268,8 +1232,2 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "windows_x86_64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
 version = "0.52.6"
@@ -1287,8 +1245,2 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "windows_x86_64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
-
-[[package]]
-name = "windows_x86_64_msvc"
 version = "0.52.6"
@@ -1295,0 +1247,0 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

Cargo.toml

@@ -16,3 +16,3 @@ # THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
 name = "rustls"
-version = "0.23.34"
+version = "0.23.35"
 build = "build.rs"
@@ -19,0 +19,0 @@ exclude = [

src/enums.rs

@@ -618,3 +618,5 @@ #![allow(non_camel_case_types)]
     #[repr(u8)]
+    #[derive(Default)]
     pub enum CertificateType {
+        #[default]
         X509 => 0x00,
@@ -621,0 +623,0 @@ RawPublicKey => 0x02,

src/msgs/enums.rs

@@ -358,3 +358,6 @@ #![allow(clippy::upper_case_acronyms)]
     #[repr(u16)]
+    #[derive(Default)]
     pub enum HpkeKdf {
+        // TODO(XXX): revisit the default configuration. This is just what Cloudflare ships right now.
+        #[default]
         HKDF_SHA256 => 0x0001,
@@ -366,9 +369,2 @@ HKDF_SHA384 => 0x0002,
 
-impl Default for HpkeKdf {
-    // TODO(XXX): revisit the default configuration. This is just what Cloudflare ships right now.
-    fn default() -> Self {
-        Self::HKDF_SHA256
-    }
-}
-
 enum_builder! {
@@ -380,3 +376,6 @@ /// The Authenticated Encryption with Associated Data (`Aead`) type for HPKE operations.
     #[repr(u16)]
+    #[derive(Default)]
     pub enum HpkeAead {
+        // TODO(XXX): revisit the default configuration. This is just what Cloudflare ships right now.
+        #[default]
         AES_128_GCM => 0x0001,
@@ -402,9 +401,2 @@ AES_256_GCM => 0x0002,
 
-impl Default for HpkeAead {
-    // TODO(XXX): revisit the default configuration. This is just what Cloudflare ships right now.
-    fn default() -> Self {
-        Self::AES_128_GCM
-    }
-}
-
 enum_builder! {
@@ -411,0 +403,0 @@ /// The Encrypted Client Hello protocol version (`EchVersion`).

src/msgs/macros.rs

@@ -6,7 +6,13 @@ /// A macro which defines an enum type.
         #[repr($uint:ty)]
+        $(#[$metas:meta])*
         $enum_vis:vis enum $enum_name:ident
         {
-          $( $enum_var:ident => $enum_val:literal),* $(,)?
+          $(
+            $(#[$enum_metas:meta])*
+            $enum_var:ident => $enum_val:literal),* $(,)?
           $( !Debug:
-            $( $enum_var_nd:ident => $enum_val_nd:literal),* $(,)?
+            $(
+                $(#[$enum_metas_nd:meta])*
+                $enum_var_nd:ident => $enum_val_nd:literal
+            ),* $(,)?
           )?
@@ -16,7 +22,17 @@ }
         $(#[doc = $comment])*
+        $(#[$metas])*
         #[non_exhaustive]
         #[derive(PartialEq, Eq, Clone, Copy)]
         $enum_vis enum $enum_name {
-            $( $enum_var),*
-            $(, $($enum_var_nd),* )?
+            $(
+                $(#[$enum_metas])*
+                $enum_var
+            ),*
+            $(
+                ,
+                $(
+                    $(#[$enum_metas_nd])*
+                    $enum_var_nd
+                ),*
+            )?
             ,Unknown($uint)
@@ -23,0 +39,0 @@ }

src/quic.rs

@@ -979,3 +979,3 @@ use alloc::boxed::Box;
 #[non_exhaustive]
-#[derive(Clone, Copy, Debug)]
+#[derive(Clone, Copy, Debug, Default)]
 pub enum Version {
@@ -985,2 +985,3 @@ /// Draft versions 29, 30, 31 and 32
     /// First stable RFC
+    #[default]
     V1,
@@ -1044,8 +1045,2 @@ /// Anti-ossification variant of V1
 
-impl Default for Version {
-    fn default() -> Self {
-        Self::V1
-    }
-}
-
 #[cfg(test)]
@@ -1052,0 +1047,0 @@ mod tests {

src/server/builder.rs

@@ -95,3 +95,5 @@ use alloc::vec::Vec;
             CertifiedKey::from_der(cert_chain, key_der, self.crypto_provider())?;
-        certified_key.ocsp = Some(ocsp);
+        if !ocsp.is_empty() {
+            certified_key.ocsp = Some(ocsp);
+        }
         Ok(self.with_cert_resolver(Arc::new(SingleCertAndKey::from(certified_key))))
@@ -98,0 +100,0 @@ }

src/server/server_conn.rs

@@ -1114,3 +1114,5 @@ use alloc::boxed::Box;
 
+#[derive(Default)]
 pub(super) enum EarlyDataState {
+    #[default]
     New,
@@ -1124,8 +1126,2 @@ Accepted {
 
-impl Default for EarlyDataState {
-    fn default() -> Self {
-        Self::New
-    }
-}
-
 impl EarlyDataState {
@@ -1132,0 +1128,0 @@ pub(super) fn reject(&mut self) {

No alert changes

No metric changes