From 2ce4ca009e19b690f5f0dd0ceac1d6b2a80d711b Mon Sep 17 00:00:00 2001
From: dignifiedquire <me@dignifiedquire.com>
Date: Fri, 19 May 2023 14:40:27 +0200
Subject: [PATCH] update deps and cargo deny

issues left for `cargo deny` are tracked in #1035
---
 Cargo.lock | 28 +++++++++++++++-------------
 Cargo.toml |  7 +++----
 deny.toml  |  7 +++++++
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4557d10cbc..7ecbe415c8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -850,7 +850,8 @@ dependencies = [
 [[package]]
 name = "crypto_box"
 version = "0.9.0-rc.0"
-source = "git+https://github.com/RustCrypto/nacl-compat?branch=master#9926d28edc51a89a5cffc9eb228e94deede00a74"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46371baeea312993a57fa3d1eb70e131210c64d15a2f677b2ca8025dd5eae421"
 dependencies = [
  "aead",
  "chacha20",
@@ -864,7 +865,8 @@ dependencies = [
 [[package]]
 name = "crypto_secretbox"
 version = "0.1.1"
-source = "git+https://github.com/RustCrypto/nacl-compat?branch=master#9926d28edc51a89a5cffc9eb228e94deede00a74"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9d6cf87adf719ddf43a805e92c6870a531aedda35ff640442cbaf8674e141e1"
 dependencies = [
  "aead",
  "chacha20",
@@ -1900,7 +1902,7 @@ dependencies = [
  "tokio-rustls",
  "tokio-stream",
  "tokio-util",
- "toml 0.7.3",
+ "toml 0.7.4",
  "tracing",
  "tracing-futures",
  "tracing-subscriber",
@@ -3520,9 +3522,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.9.0"
+version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca2855b3715770894e67cbfa3df957790aa0c9edc3bf06efa1a84d77fa0839d1"
+checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8"
 dependencies = [
  "bitflags",
  "core-foundation",
@@ -3604,9 +3606,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4"
+checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d"
 dependencies = [
  "serde",
 ]
@@ -4140,9 +4142,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21"
+checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -4152,18 +4154,18 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
+checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.19.8"
+version = "0.19.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13"
+checksum = "92d964908cec0d030b812013af25a0e57fddfadb1e066ecc6681d86253129d4f"
 dependencies = [
  "indexmap",
  "serde",
diff --git a/Cargo.toml b/Cargo.toml
index 3081d2156f..afd7395d52 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,7 +22,7 @@ bytes = { version = "1.4", features = ["serde"] }
 clap = { version = "4", features = ["derive"], optional = true }
 config = { version = "0.13.1", default-features = false, features = ["toml", "preserve_order"] }
 console = { version = "0.15.5", optional = true }
-crypto_box = { version = "0.9.0-pre", features = ["serde", "chacha20"] }
+crypto_box = { version = "0.9.0-rc.0", features = ["serde", "chacha20"] }
 curve25519-dalek = "=4.0.0-rc.2"
 data-encoding = { version = "2.3.3", optional = true }
 default-net = "0.14.1"
@@ -66,9 +66,9 @@ serde-error = "0.1.2"
 serdect = "0.2.0"
 smallvec = { version = "1.10.0", features = ["serde", "const_new"] }
 socket2 = "0.5.3"
-ssh-key = { version = "0.6.0-pre.0", features = ["ed25519", "std", "rand_core"] }
+ssh-key = { version = "0.6.0-rc.0", features = ["ed25519", "std", "rand_core"] }
 stun-rs = "0.1.4"
-subtle = "2.4.1"
+subtle = "2.4"
 surge-ping = "0.8.0"
 tempfile = "3.4"
 thiserror = "1"
@@ -131,5 +131,4 @@ panic = 'abort'
 incremental = false
 
 [patch.crates-io]
-crypto_box = { git = "https://github.com/RustCrypto/nacl-compat", branch = "master" }
 ed25519-dalek = { git = "https://github.com/dalek-cryptography/ed25519-dalek", branch = "main" }
diff --git a/deny.toml b/deny.toml
index eae0e40e51..2895db29a1 100644
--- a/deny.toml
+++ b/deny.toml
@@ -11,6 +11,7 @@ allow = [
       "OpenSSL",
       "Unicode-DFS-2016",
       "Zlib",
+      "MPL-2.0", # https://fossa.com/blog/open-source-software-licenses-101-mozilla-public-license-2-0/
 ]
 
 [[licenses.clarify]]
@@ -19,3 +20,9 @@ expression = "MIT AND ISC AND OpenSSL"
 license-files = [
       { path = "LICENSE", hash = 0xbd0eed23 },
 ]
+
+
+[advisories]
+ignore = [
+       "RUSTSEC-2020-0168" # mach is unmaintained
+]