Skip to content

Nero/fix 6.0.0 rc.20 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nerodesu017 merged 2 commits into from
Sep 25, 2025
Merged

Nero/fix 6.0.0 rc.20 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07dac0c
lint fix
nerodesu017 Sep 25, 2025
6369fa4
fix: change prefer_chacha20 to preserve_tls13_cipher_list
nerodesu017 Sep 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/client/emulation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,8 @@ impl<'de> Deserialize<'de> for Emulation {
&header[1..],
)),
1 => OrigHeaderName::Standard(
http::HeaderName::from_bytes(
&header[1..],
)
.map_err(serde::de::Error::custom)?,
http::HeaderName::from_bytes(&header[1..])
.map_err(serde::de::Error::custom)?,
),
_ => return Err(serde::de::Error::custom("invalid header")),
};
Expand Down
13 changes: 9 additions & 4 deletions src/tls/options.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,10 @@ impl Serialize for TlsOptions {
};

tls_options.serialize_field("aes_hw_override", &self.aes_hw_override)?;
tls_options.serialize_field("prefer_chacha20", &self.prefer_chacha20)?;
tls_options.serialize_field(
"preserve_tls13_cipher_list",
&self.preserve_tls13_cipher_list,
)?;
tls_options.serialize_field("random_aes_hw_override", &self.random_aes_hw_override)?;
tls_options.end()
}
Expand Down Expand Up @@ -335,7 +338,7 @@ impl<'de> Deserialize<'de> for TlsOptions {
let mut certificate_compression_algorithms = None;
let mut extension_permutation = None;
let mut aes_hw_override = None;
let mut prefer_chacha20 = None;
let mut preserve_tls13_cipher_list = None;
let mut random_aes_hw_override = false;

while let Some(key) = map.next_key::<String>()? {
Expand Down Expand Up @@ -494,7 +497,9 @@ impl<'de> Deserialize<'de> for TlsOptions {
}
}
"aes_hw_override" => aes_hw_override = map.next_value()?,
"prefer_chacha20" => prefer_chacha20 = map.next_value()?,
"preserve_tls13_cipher_list" => {
preserve_tls13_cipher_list = map.next_value()?
}
"random_aes_hw_override" => random_aes_hw_override = map.next_value()?,
_ => {
let _: de::IgnoredAny = map.next_value()?;
Expand Down Expand Up @@ -528,7 +533,7 @@ impl<'de> Deserialize<'de> for TlsOptions {
.map(|alg_vec| std::borrow::Cow::Owned(alg_vec)),
extension_permutation,
aes_hw_override,
prefer_chacha20,
preserve_tls13_cipher_list,
random_aes_hw_override,
})
}
Expand Down