Skip to content

Commit 7c2a6a3

Browse files
authored
chore: nss-rs@0.10.0 (#3620)
1 parent 63307d5 commit 7c2a6a3

5 files changed

Lines changed: 6 additions & 11 deletions

File tree

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ hex = { version = "0.4", default-features = false }
3636
http = { version = "1", default-features = false, features = ["std"] }
3737
libc = { version = "0.2", default-features = false }
3838
log = { version = "0.4", default-features = false }
39-
nss = { rev = "0.9.1", package = "nss-rs", git = "https://github.com/mozilla/nss-rs" }
39+
nss = { rev = "0.10.0", package = "nss-rs", git = "https://github.com/mozilla/nss-rs" }
4040
qlog = { version = "0.16.0", default-features = false }
4141
quinn-udp = { version = "0.6", default-features = false, features = ["log", "fast-apple-datapath"] }
4242
rustc-hash = { version = "2.1", default-features = false, features = [ "std" ]}

neqo-bin/src/bin/client.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,5 @@ use clap::Parser as _;
1515
async fn main() -> Result<(), neqo_bin::client::Error> {
1616
let args = neqo_bin::client::Args::parse();
1717

18-
#[cfg_attr(apple, expect(clippy::large_futures, reason = "OK in test code."))]
1918
neqo_bin::client::client(args).await
2019
}

neqo-bin/src/client/mod.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -644,18 +644,14 @@ pub async fn client(mut args: Args) -> Res<()> {
644644

645645
let handler = http3::Handler::new(to_request, args.clone());
646646

647-
Runner::new(real_local, &mut socket, client, handler, &args)
648-
.run()
649-
.await?
647+
Box::pin(Runner::new(real_local, &mut socket, client, handler, &args).run()).await?
650648
} else {
651649
let client = http09::create_client(&args, real_local, remote_addr, &host, token)
652650
.expect("failed to create client");
653651

654652
let handler = http09::Handler::new(to_request, &args);
655653

656-
Runner::new(real_local, &mut socket, client, handler, &args)
657-
.run()
658-
.await?
654+
Box::pin(Runner::new(real_local, &mut socket, client, handler, &args).run()).await?
659655
};
660656
}
661657

neqo-transport/src/crypto.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ impl CryptoDxState {
582582
next_secret,
583583
self.version.label_prefix(),
584584
)?,
585-
hpkey: self.hpkey.clone(),
585+
hpkey: self.hpkey.try_clone()?,
586586
used_pn: pn..pn,
587587
min_pn: pn,
588588
invocations,

0 commit comments

Comments
 (0)