From d49be47800df17c2236f1272a1e682bf027fe5ba Mon Sep 17 00:00:00 2001
From: Maciej Modelski <maciej.modelski@dfinity.org>
Date: Wed, 6 Sep 2023 07:56:22 +0000
Subject: [PATCH] specify ring dep explicityly

---
 Cargo.Bazel.lock            | 153 +++++-------------------------------
 Cargo.lock                  |  37 +++------
 Cargo.toml                  |   1 -
 test/env/replica/Cargo.toml |   2 +-
 4 files changed, 33 insertions(+), 160 deletions(-)

diff --git a/Cargo.Bazel.lock b/Cargo.Bazel.lock
index 8f337b29..af10e2e6 100644
--- a/Cargo.Bazel.lock
+++ b/Cargo.Bazel.lock
@@ -1,5 +1,5 @@
 {
-  "checksum": "1c77fc0122b13957717459e2239fb5dc73b4032daf3b46fe41ef9c68c63f950a",
+  "checksum": "73b643b11b8816f2424e7a7702b36d32ade8fca392b858bbfd3c062f8c4b166f",
   "crates": {
     "addr2line 0.21.0": {
       "name": "addr2line",
@@ -963,13 +963,13 @@
       },
       "license": "MIT"
     },
-    "candid 0.9.5": {
+    "candid 0.9.6": {
       "name": "candid",
-      "version": "0.9.5",
+      "version": "0.9.6",
       "repository": {
         "Http": {
-          "url": "https://crates.io/api/v1/crates/candid/0.9.5/download",
-          "sha256": "762aa04e3a889d47a1773b74ee3b13438a9bc895954fff79ebf7f308c3744a6c"
+          "url": "https://crates.io/api/v1/crates/candid/0.9.6/download",
+          "sha256": "88f6eec0ae850e006ef0fe306f362884d370624094ec55a6a26de18b251774be"
         }
       },
       "targets": [
@@ -1012,7 +1012,7 @@
               "target": "byteorder"
             },
             {
-              "id": "candid 0.9.5",
+              "id": "candid 0.9.6",
               "target": "build_script_build"
             },
             {
@@ -1081,7 +1081,7 @@
         "proc_macro_deps": {
           "common": [
             {
-              "id": "candid_derive 0.6.2",
+              "id": "candid_derive 0.6.3",
               "target": "candid_derive"
             },
             {
@@ -1091,7 +1091,7 @@
           ],
           "selects": {}
         },
-        "version": "0.9.5"
+        "version": "0.9.6"
       },
       "build_script_attrs": {
         "data_glob": [
@@ -1100,13 +1100,13 @@
       },
       "license": "Apache-2.0"
     },
-    "candid_derive 0.6.2": {
+    "candid_derive 0.6.3": {
       "name": "candid_derive",
-      "version": "0.6.2",
+      "version": "0.6.3",
       "repository": {
         "Http": {
-          "url": "https://crates.io/api/v1/crates/candid_derive/0.6.2/download",
-          "sha256": "810b3bd60244f282090652ffc7c30a9d23892e72dfe443e46ee55569044f7dd5"
+          "url": "https://crates.io/api/v1/crates/candid_derive/0.6.3/download",
+          "sha256": "158403ea38fab5904ae47a5d67eb7047650a91681407f5ccbcbcabc4f4ffb489"
         }
       },
       "targets": [
@@ -1147,7 +1147,7 @@
           "selects": {}
         },
         "edition": "2021",
-        "version": "0.6.2"
+        "version": "0.6.3"
       },
       "license": "Apache-2.0"
     },
@@ -4248,7 +4248,7 @@
               "target": "backoff"
             },
             {
-              "id": "candid 0.9.5",
+              "id": "candid 0.9.6",
               "target": "candid"
             },
             {
@@ -4454,7 +4454,7 @@
         "deps": {
           "common": [
             {
-              "id": "candid 0.9.5",
+              "id": "candid 0.9.6",
               "target": "candid"
             },
             {
@@ -4555,7 +4555,7 @@
               "target": "anyhow"
             },
             {
-              "id": "candid 0.9.5",
+              "id": "candid 0.9.6",
               "target": "candid"
             },
             {
@@ -4610,7 +4610,7 @@
               "target": "anyhow"
             },
             {
-              "id": "candid 0.9.5",
+              "id": "candid 0.9.6",
               "target": "candid"
             },
             {
@@ -4626,7 +4626,7 @@
               "target": "rand"
             },
             {
-              "id": "ring 0.17.0-alpha.11",
+              "id": "ring 0.16.20",
               "target": "ring"
             }
           ],
@@ -4673,7 +4673,7 @@
               "target": "anyhow"
             },
             {
-              "id": "candid 0.9.5",
+              "id": "candid 0.9.6",
               "target": "candid"
             },
             {
@@ -4764,7 +4764,7 @@
               "target": "anyhow"
             },
             {
-              "id": "candid 0.9.5",
+              "id": "candid 0.9.6",
               "target": "candid"
             },
             {
@@ -4818,7 +4818,7 @@
               "target": "anyhow"
             },
             {
-              "id": "candid 0.9.5",
+              "id": "candid 0.9.6",
               "target": "candid"
             },
             {
@@ -7692,117 +7692,6 @@
       },
       "license": null
     },
-    "ring 0.17.0-alpha.11": {
-      "name": "ring",
-      "version": "0.17.0-alpha.11",
-      "repository": {
-        "Http": {
-          "url": "https://crates.io/api/v1/crates/ring/0.17.0-alpha.11/download",
-          "sha256": "4575a179070909595bea5f999d67934737c2e0757a1eb9839af555917817b257"
-        }
-      },
-      "targets": [
-        {
-          "Library": {
-            "crate_name": "ring",
-            "crate_root": "src/lib.rs",
-            "srcs": [
-              "**/*.rs"
-            ]
-          }
-        },
-        {
-          "BuildScript": {
-            "crate_name": "build_script_build",
-            "crate_root": "build.rs",
-            "srcs": [
-              "**/*.rs"
-            ]
-          }
-        }
-      ],
-      "library_target_name": "ring",
-      "common_attrs": {
-        "compile_data_glob": [
-          "**"
-        ],
-        "crate_features": {
-          "common": [
-            "alloc",
-            "default",
-            "dev_urandom_fallback",
-            "once_cell"
-          ],
-          "selects": {}
-        },
-        "deps": {
-          "common": [
-            {
-              "id": "ring 0.17.0-alpha.11",
-              "target": "build_script_build"
-            },
-            {
-              "id": "untrusted 0.7.1",
-              "target": "untrusted"
-            }
-          ],
-          "selects": {
-            "cfg(all(target_arch = \"wasm32\", target_vendor = \"unknown\", target_os = \"unknown\", target_env = \"\"))": [
-              {
-                "id": "web-sys 0.3.64",
-                "target": "web_sys"
-              }
-            ],
-            "cfg(any(target_arch = \"x86\", target_arch = \"x86_64\", all(any(target_arch = \"aarch64\", target_arch = \"arm\"), any(target_os = \"android\", target_os = \"fuchsia\", target_os = \"linux\"))))": [
-              {
-                "id": "spin 0.5.2",
-                "target": "spin"
-              }
-            ],
-            "cfg(any(target_os = \"android\", target_os = \"linux\"))": [
-              {
-                "id": "libc 0.2.147",
-                "target": "libc"
-              },
-              {
-                "id": "once_cell 1.18.0",
-                "target": "once_cell"
-              }
-            ],
-            "cfg(any(target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"illumos\", target_os = \"netbsd\", target_os = \"openbsd\", target_os = \"solaris\"))": [
-              {
-                "id": "once_cell 1.18.0",
-                "target": "once_cell"
-              }
-            ],
-            "cfg(target_os = \"windows\")": [
-              {
-                "id": "winapi 0.3.9",
-                "target": "winapi"
-              }
-            ]
-          }
-        },
-        "edition": "2018",
-        "version": "0.17.0-alpha.11"
-      },
-      "build_script_attrs": {
-        "data_glob": [
-          "**"
-        ],
-        "deps": {
-          "common": [
-            {
-              "id": "cc 1.0.83",
-              "target": "cc"
-            }
-          ],
-          "selects": {}
-        },
-        "links": "ring_core_0_17_0_alpha_11"
-      },
-      "license": null
-    },
     "rustc-demangle 0.1.23": {
       "name": "rustc-demangle",
       "version": "0.1.23",
diff --git a/Cargo.lock b/Cargo.lock
index 23e762e9..2e414020 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -177,9 +177,9 @@ checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
 
 [[package]]
 name = "candid"
-version = "0.9.5"
+version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "762aa04e3a889d47a1773b74ee3b13438a9bc895954fff79ebf7f308c3744a6c"
+checksum = "88f6eec0ae850e006ef0fe306f362884d370624094ec55a6a26de18b251774be"
 dependencies = [
  "anyhow",
  "binread",
@@ -204,9 +204,9 @@ dependencies = [
 
 [[package]]
 name = "candid_derive"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "810b3bd60244f282090652ffc7c30a9d23892e72dfe443e46ee55569044f7dd5"
+checksum = "158403ea38fab5904ae47a5d67eb7047650a91681407f5ccbcbcabc4f4ffb489"
 dependencies = [
  "lazy_static",
  "proc-macro2",
@@ -806,7 +806,7 @@ dependencies = [
  "pkcs8",
  "rand",
  "reqwest",
- "ring 0.16.20",
+ "ring",
  "rustls 0.20.9",
  "sec1",
  "serde",
@@ -879,7 +879,7 @@ dependencies = [
  "ic-agent",
  "icrc1-test-env",
  "rand",
- "ring 0.17.0-alpha.11",
+ "ring",
 ]
 
 [[package]]
@@ -1446,21 +1446,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "ring"
-version = "0.17.0-alpha.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4575a179070909595bea5f999d67934737c2e0757a1eb9839af555917817b257"
-dependencies = [
- "cc",
- "libc",
- "once_cell",
- "spin",
- "untrusted",
- "web-sys",
- "winapi",
-]
-
 [[package]]
 name = "rustc-demangle"
 version = "0.1.23"
@@ -1487,7 +1472,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99"
 dependencies = [
  "log",
- "ring 0.16.20",
+ "ring",
  "sct",
  "webpki",
 ]
@@ -1499,7 +1484,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8"
 dependencies = [
  "log",
- "ring 0.16.20",
+ "ring",
  "rustls-webpki",
  "sct",
 ]
@@ -1519,7 +1504,7 @@ version = "0.101.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d"
 dependencies = [
- "ring 0.16.20",
+ "ring",
  "untrusted",
 ]
 
@@ -1550,7 +1535,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
 dependencies = [
- "ring 0.16.20",
+ "ring",
  "untrusted",
 ]
 
@@ -2176,7 +2161,7 @@ version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0e74f82d49d545ad128049b7e88f6576df2da6b02e9ce565c6f533be576957e"
 dependencies = [
- "ring 0.16.20",
+ "ring",
  "untrusted",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index dc88f735..d4e196e9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,7 +18,6 @@ ic-agent = "0.25.0"
 reqwest = "0.11"
 ic-test-state-machine-client = "3.0.0"
 rand = "0.8.5"
-ring = "0.16.20"
 serde = "=1.0.171"
 tempfile = "3.3"
 thiserror = "1"
diff --git a/test/env/replica/Cargo.toml b/test/env/replica/Cargo.toml
index e030fa44..3197aade 100644
--- a/test/env/replica/Cargo.toml
+++ b/test/env/replica/Cargo.toml
@@ -16,7 +16,7 @@ anyhow = { workspace = true }
 candid = { workspace = true }
 ic-agent = { workspace = true }
 rand = { workspace = true }
-ring = { worksapce = true }
+ring = "0.16.20"
 hex = { workspace = true }
 async-trait = { workspace = true }
 icrc1-test-env = { version = "0.1.1", path = "../" }