From e57479ab5bc954d19ca9493c2c3a28e03291236b Mon Sep 17 00:00:00 2001
From: Rain <rain@oxide.computer>
Date: Wed, 6 Dec 2023 22:56:25 -0800
Subject: [PATCH] update ring to 0.17 as well

---
 Cargo.lock                | 21 ++++++++++-----------
 Cargo.toml                |  2 +-
 workspace-hack/Cargo.toml |  6 ++----
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5eba507b86..9b823a8738 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4718,7 +4718,7 @@ dependencies = [
  "ref-cast",
  "regex",
  "reqwest",
- "ring 0.16.20",
+ "ring 0.17.7",
  "rustls",
  "samael",
  "schemars",
@@ -4809,7 +4809,7 @@ dependencies = [
  "petgraph",
  "rayon",
  "reqwest",
- "ring 0.16.20",
+ "ring 0.17.7",
  "semver 1.0.20",
  "serde",
  "sled-hardware",
@@ -4955,7 +4955,7 @@ dependencies = [
  "rcgen",
  "regex",
  "reqwest",
- "ring 0.16.20",
+ "ring 0.17.7",
  "rustls",
  "slog",
  "subprocess",
@@ -5044,8 +5044,7 @@ dependencies = [
  "regex-automata 0.4.3",
  "regex-syntax 0.8.2",
  "reqwest",
- "ring 0.16.20",
- "ring 0.17.5",
+ "ring 0.17.7",
  "rustix 0.38.25",
  "schemars",
  "semver 1.0.20",
@@ -6701,9 +6700,9 @@ dependencies = [
 
 [[package]]
 name = "ring"
-version = "0.17.5"
+version = "0.17.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b"
+checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74"
 dependencies = [
  "cc",
  "getrandom 0.2.10",
@@ -6971,7 +6970,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9"
 dependencies = [
  "log",
- "ring 0.17.5",
+ "ring 0.17.7",
  "rustls-webpki",
  "sct",
 ]
@@ -7003,7 +7002,7 @@ version = "0.101.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
 dependencies = [
- "ring 0.17.5",
+ "ring 0.17.7",
  "untrusted 0.9.0",
 ]
 
@@ -8754,7 +8753,7 @@ dependencies = [
  "pem",
  "percent-encoding",
  "reqwest",
- "ring 0.17.5",
+ "ring 0.17.7",
  "serde",
  "serde_json",
  "serde_plain",
@@ -8964,7 +8963,7 @@ dependencies = [
  "omicron-test-utils",
  "omicron-workspace-hack",
  "rand 0.8.5",
- "ring 0.16.20",
+ "ring 0.17.7",
  "serde",
  "serde_json",
  "serde_path_to_error",
diff --git a/Cargo.toml b/Cargo.toml
index df7e18ca97..eae419127a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -305,7 +305,7 @@ ref-cast = "1.0"
 regex = "1.10.2"
 regress = "0.7.1"
 reqwest = { version = "0.11", default-features = false }
-ring = "0.16"
+ring = "0.17.7"
 rpassword = "7.3.1"
 rstest = "0.18.2"
 rustfmt-wrapper = "0.2"
diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml
index e8e42e13ba..88ab9b2060 100644
--- a/workspace-hack/Cargo.toml
+++ b/workspace-hack/Cargo.toml
@@ -83,8 +83,7 @@ regex = { version = "1.10.2" }
 regex-automata = { version = "0.4.3", default-features = false, features = ["dfa-onepass", "hybrid", "meta", "nfa-backtrack", "perf-inline", "perf-literal", "unicode"] }
 regex-syntax = { version = "0.8.2" }
 reqwest = { version = "0.11.22", features = ["blocking", "json", "rustls-tls", "stream"] }
-ring-9067fe90e8c1f593 = { package = "ring", version = "0.17.5", features = ["std"] }
-ring-986da7b5efc2b80e = { package = "ring", version = "0.16.20", features = ["std"] }
+ring = { version = "0.17.7", features = ["std"] }
 schemars = { version = "0.8.13", features = ["bytes", "chrono", "uuid1"] }
 semver = { version = "1.0.20", features = ["serde"] }
 serde = { version = "1.0.192", features = ["alloc", "derive", "rc"] }
@@ -185,8 +184,7 @@ regex = { version = "1.10.2" }
 regex-automata = { version = "0.4.3", default-features = false, features = ["dfa-onepass", "hybrid", "meta", "nfa-backtrack", "perf-inline", "perf-literal", "unicode"] }
 regex-syntax = { version = "0.8.2" }
 reqwest = { version = "0.11.22", features = ["blocking", "json", "rustls-tls", "stream"] }
-ring-9067fe90e8c1f593 = { package = "ring", version = "0.17.5", features = ["std"] }
-ring-986da7b5efc2b80e = { package = "ring", version = "0.16.20", features = ["std"] }
+ring = { version = "0.17.7", features = ["std"] }
 schemars = { version = "0.8.13", features = ["bytes", "chrono", "uuid1"] }
 semver = { version = "1.0.20", features = ["serde"] }
 serde = { version = "1.0.192", features = ["alloc", "derive", "rc"] }