From 6377daabe7587461d0ddeaa73b22c8d5ab459fb1 Mon Sep 17 00:00:00 2001
From: Eugene <inbox@null.page>
Date: Thu, 30 Jan 2025 10:19:53 +0100
Subject: [PATCH] bumped aws-lc-rs

---
 Cargo.lock                            | 24 ++++++++----------------
 Cargo.toml                            |  2 ++
 warpgate-common/Cargo.toml            |  4 ++--
 warpgate-core/Cargo.toml              |  2 +-
 warpgate-protocol-mysql/Cargo.toml    |  4 ++--
 warpgate-protocol-postgres/Cargo.toml |  4 ++--
 6 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e507e8341..50c3412d6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "addr2line"
@@ -281,12 +281,11 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "aws-lc-rs"
-version = "1.9.0"
+version = "1.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f95446d919226d587817a7d21379e6eb099b97b45110a7f272a444ca5c54070"
+checksum = "4c2b7ddaa2c56a367ad27a094ad8ef4faacf8a617c2575acb2ba88949df999ca"
 dependencies = [
  "aws-lc-sys",
- "mirai-annotations",
  "paste",
  "untrusted 0.7.1",
  "zeroize",
@@ -294,16 +293,15 @@ dependencies = [
 
 [[package]]
 name = "aws-lc-sys"
-version = "0.21.1"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "234314bd569802ec87011d653d6815c6d7b9ffb969e9fee5b8b20ef860e8dce9"
+checksum = "71b2ddd3ada61a305e1d8bb6c005d1eaa7d14d903681edfc400406d523a9b491"
 dependencies = [
- "bindgen 0.69.4",
+ "bindgen 0.69.5",
  "cc",
  "cmake",
  "dunce",
  "fs_extra",
- "libc",
  "paste",
 ]
 
@@ -441,9 +439,9 @@ dependencies = [
 
 [[package]]
 name = "bindgen"
-version = "0.69.4"
+version = "0.69.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
+checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
 dependencies = [
  "bitflags 2.6.0",
  "cexpr",
@@ -2414,12 +2412,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "mirai-annotations"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1"
-
 [[package]]
 name = "multer"
 version = "3.1.0"
diff --git a/Cargo.toml b/Cargo.toml
index 94c533787..d133d536f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -28,7 +28,9 @@ russh = { version = "0.50.0", features = ["des"] }
 tracing = "0.1"
 futures = "0.3"
 tokio-stream = { version = "0.1.17", features = ["net"] }
+tokio-rustls = "0.26"
 enum_dispatch = "0.3.13"
+rustls = "0.23"
 
 [profile.release]
 lto = true
diff --git a/warpgate-common/Cargo.toml b/warpgate-common/Cargo.toml
index 9be406a71..afa998aa5 100644
--- a/warpgate-common/Cargo.toml
+++ b/warpgate-common/Cargo.toml
@@ -36,14 +36,14 @@ serde.workspace = true
 serde_json.workspace = true
 thiserror = "1.0"
 tokio = { version = "1.20", features = ["tracing"] }
-tokio-rustls = "0.26"
+tokio-rustls.workspace = true
 totp-rs = { version = "5.0", features = ["otpauth"] }
 tracing.workspace = true
 tracing-core = "0.1"
 url = "2.2"
 uuid = { version = "1.3", features = ["v4", "serde"] }
 warpgate-sso = { version = "*", path = "../warpgate-sso" }
-rustls = "0.23"
+rustls.workspace = true
 rustls-pemfile = "1.0"
 webpki = "0.22"
 aho-corasick = "1.1.3"
diff --git a/warpgate-core/Cargo.toml b/warpgate-core/Cargo.toml
index 69c7cc74b..2f1414573 100644
--- a/warpgate-core/Cargo.toml
+++ b/warpgate-core/Cargo.toml
@@ -46,7 +46,7 @@ tracing-subscriber = "0.3"
 url = "2.2"
 uuid = { version = "1.3", features = ["v4", "serde"] }
 warpgate-sso = { version = "*", path = "../warpgate-sso" }
-rustls = "0.23"
+rustls.workspace = true
 rustls-pemfile = "1.0"
 webpki = "0.22"
 
diff --git a/warpgate-protocol-mysql/Cargo.toml b/warpgate-protocol-mysql/Cargo.toml
index fbc346353..86122ed3b 100644
--- a/warpgate-protocol-mysql/Cargo.toml
+++ b/warpgate-protocol-mysql/Cargo.toml
@@ -21,9 +21,9 @@ flate2 = { version = "1", features = ["zlib"] } # flate2 requires a backend sele
 rand = "0.8"
 sha1 = "0.10"
 password-hash = { version = "0.2", features = ["std"] }
-rustls = "0.23"
+rustls.workspace = true
 rustls-pemfile = "1.0"
-tokio-rustls = "0.26"
+tokio-rustls.workspace = true
 thiserror = "1.0"
 webpki = "0.22"
 once_cell = "1.17"
diff --git a/warpgate-protocol-postgres/Cargo.toml b/warpgate-protocol-postgres/Cargo.toml
index cab6aa167..abc13941f 100644
--- a/warpgate-protocol-postgres/Cargo.toml
+++ b/warpgate-protocol-postgres/Cargo.toml
@@ -13,9 +13,9 @@ tokio = { version = "1.20", features = ["tracing", "signal"] }
 tracing.workspace = true
 uuid = { version = "1.2" }
 bytes.workspace = true
-rustls = "0.23"
+rustls.workspace = true
 rustls-pemfile = "1.0"
-tokio-rustls = "0.26"
+tokio-rustls.workspace = true
 thiserror = "1.0"
 rustls-native-certs = "0.6"
 pgwire = { version = "0.25" }