From ac84a02ed7858940da65c2a62ac5624fc9dad64b Mon Sep 17 00:00:00 2001 From: Yuxiang Cao Date: Thu, 11 May 2023 17:05:58 -0700 Subject: [PATCH] remove patch --- Cargo.lock | 6 ++++-- Cargo.toml | 10 ---------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d262b7785..f7406b3ef 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -412,7 +412,8 @@ dependencies = [ [[package]] name = "mbedtls-platform-support" version = "0.1.0" -source = "git+https://github.com/fortanix/rust-mbedtls.git?branch=master#95a24391ce2afc22aecc1ee9f44f00e895fd0461" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85be113c8c2dc54cc6a5fba20130c7128f78dcb3ed0bb6797427333fa8cdb54d" dependencies = [ "cc", "cfg-if 1.0.0", @@ -424,7 +425,8 @@ dependencies = [ [[package]] name = "mbedtls-sys-auto" version = "2.28.0" -source = "git+https://github.com/fortanix/rust-mbedtls.git?branch=master#95a24391ce2afc22aecc1ee9f44f00e895fd0461" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2231108271d9a10052178d940926baf24b57a2eb1703732faae387592dd6ac3" dependencies = [ "bindgen", "cc", diff --git a/Cargo.toml b/Cargo.toml index ba3f62c8d..832230aec 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,12 +1,2 @@ [workspace] members = ["mbedtls"] - -[patch.crates-io] -# This patch resolves a local dependency conflict between `mbedtls` and `mbedtls-selftest`. -# Both of these crates require the native library `mbedtls-sys-auto`. -# By default, Cargo chooses the `mbedtls-sys-auto` version from crates.io for `mbedtls-selftest`, -# which conflicts with the local `mbedtls-sys-auto` used by `mbedtls`. -# This patch ensures the local `mbedtls-sys-auto` is used for both crates. -# TODO: remove these patches once `mbedtls-platform-support v0.1.0` is published -mbedtls-platform-support = { git = "https://github.com/fortanix/rust-mbedtls.git", branch = "master"} -mbedtls-sys-auto = { git = "https://github.com/fortanix/rust-mbedtls.git", branch = "master"}