Skip to content

Commit 1462d37

Browse files
author
yngrtc
committed
update deps to avoid maybe insecure version
1 parent 4478244 commit 1462d37

File tree

12 files changed

+813
-564
lines changed

12 files changed

+813
-564
lines changed

Cargo.lock

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

dtls/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ p256 = { version = "0.13", features = ["default", "ecdh", "ecdsa"] }
1919
p384 = "0.13"
2020
rand = "0.8"
2121
hmac = "0.12"
22-
sec1 = { version = "0.7", features = [ "std" ] }
22+
sec1 = { version = "0.7", features = ["std"] }
2323
sha1 = "0.10"
2424
sha2 = "0.10"
2525
aes = "0.8"
26-
cbc = { version = "0.1", features = [ "block-padding", "alloc"] }
26+
cbc = { version = "0.1", features = ["block-padding", "alloc"] }
2727
aes-gcm = "0.10"
2828
ccm = "0.5"
2929
tokio = { version = "1.32.0", features = [
@@ -43,8 +43,8 @@ x25519-dalek = { version = "2", features = ["static_secrets"] }
4343
x509-parser = "0.16"
4444
der-parser = "9.0"
4545
rcgen = "0.13"
46-
ring = "0.17"
47-
rustls = { version = "0.23.10", default-features = false, features = ["std", "ring"] }
46+
ring = "0.17.14"
47+
rustls = { version = "0.23.27", default-features = false, features = ["std", "ring"] }
4848
bincode = "1"
4949
serde = { version = "1", features = ["derive"] }
5050
subtle = "2"
@@ -58,7 +58,7 @@ tokio-test = "0.4"
5858
env_logger = "0.11.3"
5959
chrono = "0.4.28"
6060
clap = "3"
61-
hub = {path = "examples/hub"}
61+
hub = { path = "examples/hub" }
6262

6363
[features]
6464
pem = ["dep:pem"]

dtls/examples/hub/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ version = "0.1.0"
44
edition = "2021"
55

66
[dependencies]
7-
util = { path = "../../../util", package = "webrtc-util", default-features = false, features = [
7+
util = { version = "0.10.0", path = "../../../util", package = "webrtc-util", default-features = false, features = [
88
"conn"
99
] }
10-
dtls = { package = "webrtc-dtls", path = "../../" }
10+
dtls = { version = "0.11.0", package = "webrtc-dtls", path = "../../" }
1111

1212
tokio = { version = "1.32.0", features = ["full"] }
1313
rcgen = { version = "0.13", features = ["pem", "x509-parser"] }
14-
rustls = { version = "0.23.10", default-features = false }
14+
rustls = { version = "0.23.27", default-features = false }
1515
rustls-pemfile = "2"
1616
thiserror = "1"

dtls/src/conn/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ impl DTLSConn {
572572
trace!(
573573
"Send [handshake:{}] -> {} (epoch: {}, seq: {})",
574574
srv_cli_str(is_client),
575-
h.handshake_header.handshake_type.to_string(),
575+
h.handshake_header.handshake_type,
576576
p.record.record_layer_header.epoch,
577577
h.handshake_header.message_sequence
578578
);
@@ -1042,7 +1042,7 @@ impl DTLSConn {
10421042
trace!(
10431043
"Recv [handshake:{}] -> {} (epoch: {}, seq: {})",
10441044
srv_cli_str(ctx.is_client),
1045-
rh.handshake_header.handshake_type.to_string(),
1045+
rh.handshake_header.handshake_type,
10461046
h.epoch,
10471047
rh.handshake_header.message_sequence
10481048
);
@@ -1089,7 +1089,7 @@ impl DTLSConn {
10891089

10901090
match r.content {
10911091
Content::Alert(mut a) => {
1092-
trace!("{}: <- {}", srv_cli_str(ctx.is_client), a.to_string());
1092+
trace!("{}: <- {}", srv_cli_str(ctx.is_client), a);
10931093
if a.alert_description == AlertDescription::CloseNotify {
10941094
// Respond with a close_notify [RFC5246 Section 7.2.1]
10951095
a = Alert {

dtls/src/handshaker.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,8 @@ impl DTLSConn {
223223
trace!(
224224
"[handshake:{}] {}: {}",
225225
srv_cli_str(self.state.is_client),
226-
self.current_flight.to_string(),
227-
state.to_string()
226+
self.current_flight,
227+
state
228228
);
229229

230230
if state == HandshakeState::Finished && !self.is_handshake_completed_successfully() {
@@ -332,18 +332,18 @@ impl DTLSConn {
332332
tokio::select! {
333333
done_senders = self.handshake_rx.recv() =>{
334334
if done_senders.is_none() {
335-
trace!("[handshake:{}] {} handshake_tx is dropped", srv_cli_str(self.state.is_client), self.current_flight.to_string());
335+
trace!("[handshake:{}] {} handshake_tx is dropped", srv_cli_str(self.state.is_client), self.current_flight);
336336
return Err(Error::ErrAlertFatalOrClose);
337337
} else if let Some((rendezvous_tx, done_tx)) = done_senders {
338338
rendezvous_tx.send(()).ok();
339-
//trace!("[handshake:{}] {} received handshake_rx", srv_cli_str(self.state.is_client), self.current_flight.to_string());
339+
//trace!("[handshake:{}] {} received handshake_rx", srv_cli_str(self.state.is_client), self.current_flight);
340340
let result = self.current_flight.parse(&mut self.handle_queue_tx, &mut self.state, &self.cache, &self.cfg).await;
341341
drop(done_tx);
342342
match result {
343343
Err((alert, mut err)) => {
344344
trace!("[handshake:{}] {} result alert:{:?}, err:{:?}",
345345
srv_cli_str(self.state.is_client),
346-
self.current_flight.to_string(),
346+
self.current_flight,
347347
alert,
348348
err);
349349

@@ -361,7 +361,7 @@ impl DTLSConn {
361361
}
362362
}
363363
Ok(next_flight) => {
364-
trace!("[handshake:{}] {} -> {}", srv_cli_str(self.state.is_client), self.current_flight.to_string(), next_flight.to_string());
364+
trace!("[handshake:{}] {} -> {}", srv_cli_str(self.state.is_client), self.current_flight, next_flight);
365365
if next_flight.is_last_recv_flight() && self.current_flight.to_string() == next_flight.to_string() {
366366
return Ok(HandshakeState::Finished);
367367
}
@@ -373,7 +373,7 @@ impl DTLSConn {
373373
}
374374

375375
_ = retransmit_timer.as_mut() =>{
376-
trace!("[handshake:{}] {} retransmit_timer", srv_cli_str(self.state.is_client), self.current_flight.to_string());
376+
trace!("[handshake:{}] {} retransmit_timer", srv_cli_str(self.state.is_client), self.current_flight);
377377

378378
if !self.retransmit {
379379
return Ok(HandshakeState::Waiting);
@@ -393,7 +393,7 @@ impl DTLSConn {
393393
tokio::select! {
394394
done = self.handshake_rx.recv() =>{
395395
if done.is_none() {
396-
trace!("[handshake:{}] {} handshake_tx is dropped", srv_cli_str(self.state.is_client), self.current_flight.to_string());
396+
trace!("[handshake:{}] {} handshake_tx is dropped", srv_cli_str(self.state.is_client), self.current_flight);
397397
return Err(Error::ErrAlertFatalOrClose);
398398
}
399399
let result = self.current_flight.parse(&mut self.handle_queue_tx, &mut self.state, &self.cache, &self.cfg).await;

ice/src/agent/agent_selector.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,8 @@ impl ControllingSelector for AgentInternal {
256256
if let Some(p) = self.agent_conn.get_best_valid_candidate_pair().await {
257257
log::trace!(
258258
"Nominatable pair found, nominating ({}, {})",
259-
p.local.to_string(),
260-
p.remote.to_string()
259+
p.local,
260+
p.remote
261261
);
262262
p.nominated.store(true, Ordering::SeqCst);
263263
{

sctp/src/association/association_internal.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1658,7 +1658,7 @@ impl AssociationInternal {
16581658
}
16591659

16601660
async fn handle_forward_tsn(&mut self, c: &ChunkForwardTsn) -> Result<Vec<Packet>> {
1661-
log::trace!("[{}] FwdTSN: {}", self.name, c.to_string());
1661+
log::trace!("[{}] FwdTSN: {}", self.name, c);
16621662

16631663
if !self.use_forward_tsn {
16641664
log::warn!("[{}] received FwdTSN but not enabled", self.name);

srtp/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ tokio = { version = "1.32.0", features = [
4545
log = "0.4"
4646
aead = { version = "0.5", features = ["std"] }
4747
aes-gcm = { version = "0.10", features = ["std"] }
48-
openssl = { version = "0.10.66", optional = true }
48+
openssl = { version = "0.10.72", optional = true }
4949

5050
[dev-dependencies]
5151
criterion = { version = "0.5", features = ["async_futures"] }

stun/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ rand = "0.8"
3434
base64 = "0.22.1"
3535
subtle = "2.4"
3636
crc = "3"
37-
ring = "0.17"
37+
ring = "0.17.14"
3838
md-5 = "0.10"
3939
thiserror = "1"
4040

turn/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ async-trait = "0.1"
3232
log = "0.4"
3333
base64 = "0.22.1"
3434
rand = "0.8"
35-
ring = "0.17"
35+
ring = "0.17.14"
3636
md-5 = "0.10"
3737
thiserror = "1"
3838
portable-atomic = "1.6"

0 commit comments

Comments
 (0)