diff --git a/Cargo.lock b/Cargo.lock index 961781029..859a253b5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1909,17 +1909,7 @@ dependencies = [ [[package]] name = "olpc-cjson" version = "0.1.3" -source = "git+https://github.com/webern/tough.git?rev=3f4e35845bb15a4c3c4b5d7df0ed905c6d2cab8f#3f4e35845bb15a4c3c4b5d7df0ed905c6d2cab8f" -dependencies = [ - "serde", - "serde_json", - "unicode-normalization", -] - -[[package]] -name = "olpc-cjson" -version = "0.1.3" -source = "git+https://github.com/phu-cinemo/tough.git?rev=4704b1d26e48cc161e7e5d79a9c095ac35b54723#4704b1d26e48cc161e7e5d79a9c095ac35b54723" +source = "git+https://github.com/webern/tough.git?rev=7a550cfcdc4c96143c8c55f97b8ddf04b35a1c82#7a550cfcdc4c96143c8c55f97b8ddf04b35a1c82" dependencies = [ "serde", "serde_json", @@ -2203,9 +2193,9 @@ dependencies = [ "tokio", "tokio-stream", "toml", - "tough 0.14.0 (git+https://github.com/webern/tough.git?rev=d98f85290a619c3a55877fd3accf1c3cae89b8ac)", - "tough-kms 0.6.0 (git+https://github.com/webern/tough.git?rev=7a550cfcdc4c96143c8c55f97b8ddf04b35a1c82)", - "tough-ssm 0.9.0 (git+https://github.com/webern/tough.git?rev=7a550cfcdc4c96143c8c55f97b8ddf04b35a1c82)", + "tough", + "tough-kms", + "tough-ssm", "update-metadata", "url", ] @@ -3277,39 +3267,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea68304e134ecd095ac6c3574494fc62b909f416c4fca77e440530221e549d3d" -[[package]] -name = "tough" -version = "0.14.0" -source = "git+https://github.com/phu-cinemo/tough.git?rev=4704b1d26e48cc161e7e5d79a9c095ac35b54723#4704b1d26e48cc161e7e5d79a9c095ac35b54723" -dependencies = [ - "async-recursion", - "async-trait", - "bytes", - "chrono", - "dyn-clone", - "futures", - "futures-core", - "globset", - "hex", - "log", - "olpc-cjson 0.1.3 (git+https://github.com/phu-cinemo/tough.git?rev=4704b1d26e48cc161e7e5d79a9c095ac35b54723)", - "pem 3.0.2", - "percent-encoding", - "reqwest", - "ring", - "serde", - "serde_json", - "serde_plain", - "snafu", - "tempfile", - "tokio", - "tokio-util", - "typed-path", - "untrusted", - "url", - "walkdir", -] - [[package]] name = "tough" version = "0.14.0" @@ -3343,20 +3300,6 @@ dependencies = [ "walkdir", ] -[[package]] -name = "tough-kms" -version = "0.6.0" -source = "git+https://github.com/webern/tough.git?rev=3f4e35845bb15a4c3c4b5d7df0ed905c6d2cab8f#3f4e35845bb15a4c3c4b5d7df0ed905c6d2cab8f" -dependencies = [ - "aws-config", - "aws-sdk-kms", - "pem 3.0.2", - "ring", - "snafu", - "tokio", - "tough 0.14.0 (git+https://github.com/phu-cinemo/tough.git?rev=4704b1d26e48cc161e7e5d79a9c095ac35b54723)", -] - [[package]] name = "tough-kms" version = "0.6.0" @@ -3368,19 +3311,7 @@ dependencies = [ "ring", "snafu", "tokio", - "tough 0.14.0 (git+https://github.com/webern/tough.git?rev=d98f85290a619c3a55877fd3accf1c3cae89b8ac)", -] - -[[package]] -name = "tough-ssm" -version = "0.9.0" -source = "git+https://github.com/webern/tough.git?rev=3f4e35845bb15a4c3c4b5d7df0ed905c6d2cab8f#3f4e35845bb15a4c3c4b5d7df0ed905c6d2cab8f" -dependencies = [ - "aws-config", - "aws-sdk-ssm", - "snafu", - "tokio", - "tough 0.14.0 (git+https://github.com/phu-cinemo/tough.git?rev=4704b1d26e48cc161e7e5d79a9c095ac35b54723)", + "tough", ] [[package]] @@ -3392,7 +3323,7 @@ dependencies = [ "aws-sdk-ssm", "snafu", "tokio", - "tough 0.14.0 (git+https://github.com/webern/tough.git?rev=d98f85290a619c3a55877fd3accf1c3cae89b8ac)", + "tough", ] [[package]] @@ -3496,7 +3427,7 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "tuftool" version = "0.10.0" -source = "git+https://github.com/webern/tough.git?rev=3f4e35845bb15a4c3c4b5d7df0ed905c6d2cab8f#3f4e35845bb15a4c3c4b5d7df0ed905c6d2cab8f" +source = "git+https://github.com/webern/tough.git?rev=7a550cfcdc4c96143c8c55f97b8ddf04b35a1c82#7a550cfcdc4c96143c8c55f97b8ddf04b35a1c82" dependencies = [ "aws-config", "aws-sdk-kms", @@ -3507,7 +3438,7 @@ dependencies = [ "hex", "log", "maplit", - "olpc-cjson 0.1.3 (git+https://github.com/webern/tough.git?rev=3f4e35845bb15a4c3c4b5d7df0ed905c6d2cab8f)", + "olpc-cjson 0.1.3 (git+https://github.com/webern/tough.git?rev=7a550cfcdc4c96143c8c55f97b8ddf04b35a1c82)", "pem 3.0.2", "rayon", "reqwest", @@ -3518,9 +3449,9 @@ dependencies = [ "snafu", "tempfile", "tokio", - "tough 0.14.0 (git+https://github.com/phu-cinemo/tough.git?rev=4704b1d26e48cc161e7e5d79a9c095ac35b54723)", - "tough-kms 0.6.0 (git+https://github.com/webern/tough.git?rev=3f4e35845bb15a4c3c4b5d7df0ed905c6d2cab8f)", - "tough-ssm 0.9.0 (git+https://github.com/webern/tough.git?rev=3f4e35845bb15a4c3c4b5d7df0ed905c6d2cab8f)", + "tough", + "tough-kms", + "tough-ssm", "url", "walkdir", ]