From 2df31b97c2b24faedbcfbe2b6379c3116da74108 Mon Sep 17 00:00:00 2001
From: Nick Spinale <nick@nickspinale.com>
Date: Sat, 20 Apr 2024 00:38:05 +0000
Subject: [PATCH] Use upstream rustls

no_std support has been merged
---
 Cargo.lock                                               | 5 +++--
 .../microkit/http-server/pds/server/core/Cargo.toml      | 7 +------
 crates/sel4-async/network/rustls/Cargo.toml              | 7 +------
 crates/sel4-async/network/rustls/utils/Cargo.toml        | 7 +------
 hacking/cargo-manifest-management/manifest-scope.nix     | 9 +++------
 5 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 484aedf4c..4cdc63cb9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1759,8 +1759,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.4"
-source = "git+https://github.com/coliasgroup/rustls.git?rev=c16f1e9c72a92b00259929aaf4768eb36061d83f#c16f1e9c72a92b00259929aaf4768eb36061d83f"
+version = "0.23.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afabcee0551bd1aa3e18e5adbf2c0544722014b899adb31bd186ec638d3da97e"
 dependencies = [
  "log",
  "once_cell",
diff --git a/crates/examples/microkit/http-server/pds/server/core/Cargo.toml b/crates/examples/microkit/http-server/pds/server/core/Cargo.toml
index 96bec8d08..aa4c68936 100644
--- a/crates/examples/microkit/http-server/pds/server/core/Cargo.toml
+++ b/crates/examples/microkit/http-server/pds/server/core/Cargo.toml
@@ -20,6 +20,7 @@ license = "BSD-2-Clause"
 futures = { version = "0.3.28", default-features = false, features = ["async-await", "alloc"] }
 httparse = { version = "1.8.0", default-features = false }
 log = "0.4.17"
+rustls = { version = "0.23.5", default-features = false, features = ["logging", "ring", "tls12"] }
 rustls-pemfile = { version = "2.0.0", default-features = false }
 sel4-async-block-io = { path = "../../../../../../sel4-async/block-io" }
 sel4-async-block-io-fat = { path = "../../../../../../sel4-async/block-io/fat" }
@@ -32,12 +33,6 @@ sel4-async-unsync = { path = "../../../../../../sel4-async/unsync" }
 sel4-panicking-env = { path = "../../../../../../sel4-panicking/env" }
 webpki-roots = "0.26"
 
-[dependencies.rustls]
-git = "https://github.com/coliasgroup/rustls.git"
-rev = "c16f1e9c72a92b00259929aaf4768eb36061d83f"
-default-features = false
-features = ["logging", "ring", "tls12"]
-
 [dependencies.sel4-async-single-threaded-executor]
 path = "../../../../../../sel4-async/single-threaded-executor"
 
diff --git a/crates/sel4-async/network/rustls/Cargo.toml b/crates/sel4-async/network/rustls/Cargo.toml
index eafd0c00c..5bc8bb4b1 100644
--- a/crates/sel4-async/network/rustls/Cargo.toml
+++ b/crates/sel4-async/network/rustls/Cargo.toml
@@ -18,10 +18,5 @@ license = "Apache-2.0 OR ISC OR MIT"
 
 [dependencies]
 log = "0.4.17"
+rustls = { version = "0.23.5", default-features = false, features = ["logging", "ring", "tls12"] }
 sel4-async-io = { path = "../../io" }
-
-[dependencies.rustls]
-git = "https://github.com/coliasgroup/rustls.git"
-rev = "c16f1e9c72a92b00259929aaf4768eb36061d83f"
-default-features = false
-features = ["logging", "ring", "tls12"]
diff --git a/crates/sel4-async/network/rustls/utils/Cargo.toml b/crates/sel4-async/network/rustls/utils/Cargo.toml
index f43ccaa3d..c658d5a61 100644
--- a/crates/sel4-async/network/rustls/utils/Cargo.toml
+++ b/crates/sel4-async/network/rustls/utils/Cargo.toml
@@ -20,10 +20,5 @@ license = "BSD-2-Clause"
 getrandom = { version = "0.2.10", features = ["custom"] }
 rand = { version = "0.8.5", default-features = false, features = ["small_rng"] }
 ring = { version = "=0.17.8", features = ["less-safe-getrandom-custom-or-rdrand"] }
+rustls = { version = "0.23.5", default-features = false, features = ["logging", "ring", "tls12"] }
 sel4-async-time = { path = "../../../time" }
-
-[dependencies.rustls]
-git = "https://github.com/coliasgroup/rustls.git"
-rev = "c16f1e9c72a92b00259929aaf4768eb36061d83f"
-default-features = false
-features = ["logging", "ring", "tls12"]
diff --git a/hacking/cargo-manifest-management/manifest-scope.nix b/hacking/cargo-manifest-management/manifest-scope.nix
index 2cfaa3aae..961ff793f 100644
--- a/hacking/cargo-manifest-management/manifest-scope.nix
+++ b/hacking/cargo-manifest-management/manifest-scope.nix
@@ -109,6 +109,7 @@ in rec {
     quote = "1.0.23";
     rand = "0.8.5";
     rustc_version = "0.4.0";
+    rustls = "0.23.5";
     serde = "1.0.147";
     serde_json = "1.0.87";
     serde_yaml = "0.9.14";
@@ -192,12 +193,8 @@ in rec {
     features = [ "less-safe-getrandom-custom-or-rdrand" ] ++ features;
   };
 
-  rustlsSource = {
-    git = "https://github.com/coliasgroup/rustls.git";
-    rev = "c16f1e9c72a92b00259929aaf4768eb36061d83f";
-  };
-
-  rustlsWith = features: rustlsSource // {
+  rustlsWith = features: {
+    version = versions.rustls;
     default-features = false;
     features = [
       "logging"