diff --git a/Cargo.lock b/Cargo.lock index 03d3768f1..961781029 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1926,6 +1926,16 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "olpc-cjson" +version = "0.1.3" +source = "git+https://github.com/webern/tough.git?rev=d98f85290a619c3a55877fd3accf1c3cae89b8ac#d98f85290a619c3a55877fd3accf1c3cae89b8ac" +dependencies = [ + "serde", + "serde_json", + "unicode-normalization", +] + [[package]] name = "once_cell" version = "1.18.0" @@ -2193,9 +2203,9 @@ dependencies = [ "tokio", "tokio-stream", "toml", - "tough", - "tough-kms", - "tough-ssm", + "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)", "update-metadata", "url", ] @@ -3300,6 +3310,39 @@ dependencies = [ "walkdir", ] +[[package]] +name = "tough" +version = "0.14.0" +source = "git+https://github.com/webern/tough.git?rev=d98f85290a619c3a55877fd3accf1c3cae89b8ac#d98f85290a619c3a55877fd3accf1c3cae89b8ac" +dependencies = [ + "async-recursion", + "async-trait", + "bytes", + "chrono", + "dyn-clone", + "futures", + "futures-core", + "globset", + "hex", + "log", + "olpc-cjson 0.1.3 (git+https://github.com/webern/tough.git?rev=d98f85290a619c3a55877fd3accf1c3cae89b8ac)", + "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-kms" version = "0.6.0" @@ -3311,7 +3354,21 @@ dependencies = [ "ring", "snafu", "tokio", - "tough", + "tough 0.14.0 (git+https://github.com/phu-cinemo/tough.git?rev=4704b1d26e48cc161e7e5d79a9c095ac35b54723)", +] + +[[package]] +name = "tough-kms" +version = "0.6.0" +source = "git+https://github.com/webern/tough.git?rev=7a550cfcdc4c96143c8c55f97b8ddf04b35a1c82#7a550cfcdc4c96143c8c55f97b8ddf04b35a1c82" +dependencies = [ + "aws-config", + "aws-sdk-kms", + "pem 3.0.2", + "ring", + "snafu", + "tokio", + "tough 0.14.0 (git+https://github.com/webern/tough.git?rev=d98f85290a619c3a55877fd3accf1c3cae89b8ac)", ] [[package]] @@ -3323,7 +3380,19 @@ dependencies = [ "aws-sdk-ssm", "snafu", "tokio", - "tough", + "tough 0.14.0 (git+https://github.com/phu-cinemo/tough.git?rev=4704b1d26e48cc161e7e5d79a9c095ac35b54723)", +] + +[[package]] +name = "tough-ssm" +version = "0.9.0" +source = "git+https://github.com/webern/tough.git?rev=7a550cfcdc4c96143c8c55f97b8ddf04b35a1c82#7a550cfcdc4c96143c8c55f97b8ddf04b35a1c82" +dependencies = [ + "aws-config", + "aws-sdk-ssm", + "snafu", + "tokio", + "tough 0.14.0 (git+https://github.com/webern/tough.git?rev=d98f85290a619c3a55877fd3accf1c3cae89b8ac)", ] [[package]] @@ -3449,9 +3518,9 @@ dependencies = [ "snafu", "tempfile", "tokio", - "tough", - "tough-kms", - "tough-ssm", + "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)", "url", "walkdir", ] diff --git a/tools/pubsys/Cargo.toml b/tools/pubsys/Cargo.toml index a1e5bff4c..94f737e87 100644 --- a/tools/pubsys/Cargo.toml +++ b/tools/pubsys/Cargo.toml @@ -45,8 +45,8 @@ tinytemplate = "1" tokio = { version = "1", features = ["full"] } tokio-stream = { version = "0.1", features = ["time"] } toml = "0.8" -tough = { version = "0.14", git = "https://github.com/phu-cinemo/tough.git", rev = "4704b1d26e48cc161e7e5d79a9c095ac35b54723", features = ["http"] } -tough-kms = { version = "0.6", git = "https://github.com/webern/tough.git", rev = "3f4e35845bb15a4c3c4b5d7df0ed905c6d2cab8f" } -tough-ssm = { version = "0.9", git = "https://github.com/webern/tough.git", rev = "3f4e35845bb15a4c3c4b5d7df0ed905c6d2cab8f" } +tough = { version = "0.14", git = "https://github.com/webern/tough.git", rev = "d98f85290a619c3a55877fd3accf1c3cae89b8ac", features = ["http"] } +tough-kms = { version = "0.6", git = "https://github.com/webern/tough.git", rev = "7a550cfcdc4c96143c8c55f97b8ddf04b35a1c82" } +tough-ssm = { version = "0.9", git = "https://github.com/webern/tough.git", rev = "7a550cfcdc4c96143c8c55f97b8ddf04b35a1c82" } update-metadata = { path = "../update-metadata/", version = "0.1" } url = { version = "2", features = ["serde"] }