Rebase ring branch

Signed-off-by: Nick Spinale <[email protected]>
seL4 · Mar 30, 2024 · 671c731 · 671c731
1 parent 1f2b0c9
commit 671c731
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 93 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.nix b/Cargo.nix
@@ -26,7 +26,7 @@
   patch.crates-io = {
     ring = {
       git = "https://github.com/coliasgroup/ring.git";
-      rev = "10a2b3cbe68da77f9f20ebb3776ab4c605f2b40e";
+      rev = "5a6085b525d2f2651c30fc6e9133ed32f92bc622";
     };
   };
 }
diff --git a/Cargo.toml b/Cargo.toml
@@ -144,4 +144,4 @@ members = [
 
 [patch.crates-io.ring]
 git = "https://github.com/coliasgroup/ring.git"
-rev = "10a2b3cbe68da77f9f20ebb3776ab4c605f2b40e"
+rev = "5a6085b525d2f2651c30fc6e9133ed32f92bc622"
diff --git a/crates/sel4-async/network/rustls/utils/Cargo.toml b/crates/sel4-async/network/rustls/utils/Cargo.toml
@@ -19,7 +19,7 @@ license = "BSD-2-Clause"
 [dependencies]
 getrandom = { version = "0.2.10", features = ["custom"] }
 rand = { version = "0.8.5", default-features = false, features = ["small_rng"] }
-ring = { version = "=0.17.7", features = ["less-safe-getrandom-custom-or-rdrand"] }
+ring = { version = "=0.17.8", features = ["less-safe-getrandom-custom-or-rdrand"] }
 sel4-async-time = { path = "../../../time" }
 
 [dependencies.rustls]

diff --git a/hacking/cargo-manifest-management/manifest-scope.nix b/hacking/cargo-manifest-management/manifest-scope.nix
@@ -188,7 +188,7 @@ in rec {
   };
 
   ringWith = features: {
-    version = "=0.17.7";
+    version = "=0.17.8";
     features = [ "less-safe-getrandom-custom-or-rdrand" ] ++ features;
   };
 

diff --git a/hacking/nix/scope/world/instances/default.nix b/hacking/nix/scope/world/instances/default.nix
@@ -216,7 +216,7 @@ in rec {
         };
       });
 
-      ring = maybe (haveFullRuntime && haveUnwindingSupport && !hostPlatform.isRiscV32) (
+      ring = maybe (haveFullRuntime && haveUnwindingSupport && !hostPlatform.isRiscV32 && !hostPlatform.isx86) (
         let
           rootTask = lib.makeOverridable mkTask {
             rootCrate = crates.ring;