diff --git a/Cargo.lock b/Cargo.lock index 62785c5d..d43187cd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -390,9 +390,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "aws-config" -version = "1.1.2" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e64b72d4bdbb41a73d27709c65a25b6e4bfc8321bf70fa3a8b19ce7d4eb81b0" +checksum = "de3d533e0263bf453cc80af4c8bcc4d64e2aca293bd16f81633a36f1bf4a97cb" dependencies = [ "aws-credential-types", "aws-http", @@ -421,37 +421,43 @@ dependencies = [ [[package]] name = "aws-credential-types" -version = "1.1.2" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a7cb3510b95492bd9014b60e2e3bee3e48bc516e220316f8e6b60df18b47331" +checksum = "e4834ba01c5ad1ed9740aa222de62190e3c565d11ab7e72cc68314a258994567" dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api", "aws-smithy-types", + "fastrand 2.0.0", + "tokio", + "tracing", "zeroize", ] [[package]] name = "aws-http" -version = "0.60.2" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a95d41abe4e941399fdb4bc2f54713eac3c839d98151875948bb24e66ab658f2" +checksum = "72badf9de83cc7d66b21b004f09241836823b8302afb25a24708769e576a8d8f" dependencies = [ - "aws-smithy-runtime-api", + "aws-credential-types", + "aws-smithy-http", "aws-smithy-types", "aws-types", "bytes", - "http 0.2.11", + "http", "http-body", + "lazy_static", + "percent-encoding", "pin-project-lite", "tracing", ] [[package]] name = "aws-runtime" -version = "1.1.2" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233cca219c6705d525ace011d6f9bc51aaf32fce5b4c41661d2d7ff22d9b4d49" +checksum = "cf832f522111225c02547e1e1c28137e840e4b082399d93a236e4b29193a4667" dependencies = [ "aws-credential-types", "aws-http", @@ -462,18 +468,18 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "fastrand", - "http 0.2.11", + "fastrand 2.0.0", + "http", "percent-encoding", "tracing", - "uuid", + "uuid 1.3.3", ] [[package]] name = "aws-sdk-s3" -version = "1.12.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634fbe5b6591ee2e281cd2ba8641e9bd752dbf5bf338924d6ad4bd5a3304fe31" +checksum = "1e30370b61599168d38190ad272bb91842cd81870a6ca035c05dd5726d22832c" dependencies = [ "aws-credential-types", "aws-http", @@ -494,16 +500,17 @@ dependencies = [ "http-body", "once_cell", "percent-encoding", - "regex-lite", + "regex", + "tokio-stream", "tracing", "url", ] [[package]] name = "aws-sdk-sso" -version = "1.10.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee41005e0f3a19ae749c7953d9e1f1ef8d2183f76f64966e346fa41c1ba0ed44" +checksum = "f41bf2c28d32dbb9894a8fcfcb148265d034d3f4a170552a47553a09de890895" dependencies = [ "aws-credential-types", "aws-http", @@ -516,40 +523,17 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", - "http 0.2.11", - "once_cell", - "regex-lite", - "tracing", -] - -[[package]] -name = "aws-sdk-ssooidc" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa08168f8a27505e7b90f922c32a489feb1f2133878981a15138bebc849ac09c" -dependencies = [ - "aws-credential-types", - "aws-http", - "aws-runtime", - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-json", - "aws-smithy-runtime", - "aws-smithy-runtime-api", - "aws-smithy-types", - "aws-types", - "bytes", - "http 0.2.11", - "once_cell", - "regex-lite", + "http", + "regex", + "tokio-stream", "tracing", ] [[package]] name = "aws-sdk-sts" -version = "1.10.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29102eff04d50ef70f11a48823db33e33c6cc5f027bfb6ff4864efbd5f1f66f3" +checksum = "79e21aa1a5b0853969a1ef96ccfaa8ff5d57c761549786a4d5f86c1902b2586a" dependencies = [ "aws-credential-types", "aws-http", @@ -561,19 +545,17 @@ dependencies = [ "aws-smithy-runtime", "aws-smithy-runtime-api", "aws-smithy-types", - "aws-smithy-xml", "aws-types", - "http 0.2.11", - "once_cell", - "regex-lite", + "http", + "regex", "tracing", ] [[package]] name = "aws-sigv4" -version = "1.1.2" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b92384b39aedb258aa734fe0e7b2ffcd13f33e68227251a72cd2635e0acc8f1a" +checksum = "2cb40a93429794065f41f0581734fc56a345f6a38d8e2e3c25c7448d930cd132" dependencies = [ "aws-credential-types", "aws-smithy-eventstream", @@ -599,9 +581,9 @@ dependencies = [ [[package]] name = "aws-smithy-async" -version = "1.1.2" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d8e1c0904f78c76846a9dad41c28b41d330d97741c3e70d003d9a747d95e2a" +checksum = "6ee6d17d487c8b579423067718b3580c0908d0f01d7461813f94ec4323bad623" dependencies = [ "futures-util", "pin-project-lite", @@ -610,9 +592,9 @@ dependencies = [ [[package]] name = "aws-smithy-checksums" -version = "0.60.2" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62d59ef74bf94562512e570eeccb81e9b3879f9136b2171ed4bf996ffa609955" +checksum = "0d1849fd5916904513fb0862543b36f8faab43c07984dbc476132b7da1aed056" dependencies = [ "aws-smithy-http", "aws-smithy-types", @@ -629,11 +611,35 @@ dependencies = [ "tracing", ] +[[package]] +name = "aws-smithy-client" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdbe0a3ad15283cc5f863a68cb6adc8e256e7c109c43c01bdd09be407219a1e9" +dependencies = [ + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-http-tower", + "aws-smithy-types", + "bytes", + "fastrand 2.0.0", + "http", + "http-body", + "hyper", + "hyper-rustls", + "lazy_static", + "pin-project-lite", + "rustls", + "tokio", + "tower", + "tracing", +] + [[package]] name = "aws-smithy-eventstream" -version = "0.60.2" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31cf0466890a20988b9b2864250dd907f769bd189af1a51ba67beec86f7669fb" +checksum = "a56afef1aa766f512b4970b4c3150b9bf2df8035939723830df4b30267e2d7cb" dependencies = [ "aws-smithy-types", "bytes", @@ -642,9 +648,9 @@ dependencies = [ [[package]] name = "aws-smithy-http" -version = "0.60.2" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "568a3b159001358dd96143378afd7470e19baffb6918e4b5016abe576e553f9c" +checksum = "34dc313472d727f5ef44fdda93e668ebfe17380c99dee512c403e3ca51863bb9" dependencies = [ "aws-smithy-eventstream", "aws-smithy-runtime-api", @@ -661,71 +667,80 @@ dependencies = [ "tracing", ] +[[package]] +name = "aws-smithy-http-tower" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd50fca5a4ea4ec3771689ee93bf06b32de02a80af01ed93a8f8a4ed90e8483" +dependencies = [ + "aws-smithy-types", +] + [[package]] name = "aws-smithy-json" -version = "0.60.2" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f12bfb23370a069f8facbfd53ce78213461b0a8570f6c81488030f5ab6f8cc4e" +checksum = "3591dd7c2fe01ab8025e4847a0a0f6d0c2b2269714688ffb856f9cf6c6d465cf" dependencies = [ "aws-smithy-types", + "urlencoding", ] [[package]] name = "aws-smithy-query" -version = "0.60.2" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b1adc06e0175c175d280267bb8fd028143518013fcb869e1c3199569a2e902a" +checksum = "dbabb1145e65dd57ae72d91a2619d3f5fba40b68a5f40ba009c30571dfd60aff" dependencies = [ + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-runtime-api", "aws-smithy-types", "urlencoding", ] [[package]] name = "aws-smithy-runtime" -version = "1.1.2" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cf0f6845d2d97b953cea791b0ee37191c5509f2897ec7eb7580a0e7a594e98b" +checksum = "3687fb838d4ad1c883b62eb59115bc9fb02c4f308aac49a7df89627067f6eb0d" dependencies = [ "aws-smithy-async", + "aws-smithy-client", "aws-smithy-http", "aws-smithy-runtime-api", "aws-smithy-types", "bytes", - "fastrand", - "h2", - "http 0.2.11", + "fastrand 2.0.0", + "http", "http-body", - "hyper", - "hyper-rustls", "once_cell", "pin-project-lite", "pin-utils", - "rustls 0.21.10", "tokio", "tracing", ] [[package]] name = "aws-smithy-runtime-api" -version = "1.1.2" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47798ba97a33979c80e837519cf837f18fd6df0adb02dd5286a75d9891c6e671" +checksum = "5cfbf1e5c2108b41f5ca607cde40dd5109fecc448f5d30c8e614b61f36dce704" dependencies = [ "aws-smithy-async", + "aws-smithy-http", "aws-smithy-types", "bytes", - "http 0.2.11", - "pin-project-lite", + "http", "tokio", "tracing", - "zeroize", ] [[package]] name = "aws-smithy-types" -version = "1.1.2" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e9a85eafeaf783b2408e35af599e8b96f2c49d9a5d13ad3a887fbdefb6bc744" +checksum = "eed0a94eefd845a2a78677f1b72f02fa75802d38f7f59be675add140279aa8bf" dependencies = [ "base64-simd", "bytes", @@ -739,25 +754,23 @@ dependencies = [ "pin-utils", "ryu", "serde", - "time", - "tokio", - "tokio-util", + "time 0.3.21", ] [[package]] name = "aws-smithy-xml" -version = "0.60.2" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a84bee2b44c22cbba59f12c34b831a97df698f8e43df579b35998652a00dc13" +checksum = "c88052c812f696143ad7ba729c63535209ff0e0f49e31a6d2b1205208ea6ea79" dependencies = [ "xmlparser", ] [[package]] name = "aws-types" -version = "1.1.2" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8549aa62c5b7db5c57ab915200ee214b4f5d8f19b29a4a8fa0b3ad3bca1380e3" +checksum = "6bceb8cf724ad057ad7f327d0d256d7147b3eac777b39849a26189e003dc9782" dependencies = [ "aws-credential-types", "aws-smithy-async", @@ -1511,7 +1524,16 @@ dependencies = [ name = "fastrand" version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fastrand" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" [[package]] name = "fatfs" @@ -1903,16 +1925,16 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.24.2" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" dependencies = [ "futures-util", "http 0.2.11", "hyper", "log", - "rustls 0.21.10", - "rustls-native-certs 0.6.3", + "rustls", + "rustls-native-certs", "tokio", "tokio-rustls", ] @@ -2343,9 +2365,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "openssl-probe" @@ -2830,9 +2852,9 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.10", - "rustls-native-certs 0.6.3", - "rustls-pemfile 1.0.4", + "rustls", + "rustls-native-certs", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", @@ -2941,18 +2963,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "rustls" -version = "0.21.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" -dependencies = [ - "log", - "ring", - "rustls-webpki 0.101.7", - "sct", -] - [[package]] name = "rustls" version = "0.22.2" @@ -3568,8 +3578,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" dependencies = [ "cfg-if", - "fastrand", - "redox_syscall", + "fastrand 1.9.0", + "redox_syscall 0.3.5", "rustix", "windows-sys 0.52.0", ] @@ -3657,32 +3667,14 @@ dependencies = [ "zeroize", ] -[[package]] -name = "tls_codec_derive" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8e00e3e7a54e0f1c8834ce72ed49c8487fbd3f801d8cfe1a0ad0640382f8e15" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - [[package]] name = "tokio" version = "1.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "num_cpus", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "windows-sys 0.48.0", + "rustls", + "tokio", ] [[package]] @@ -3828,9 +3820,8 @@ dependencies = [ "httparse", "log", "rand", - "rustls 0.22.2", - "rustls-native-certs 0.7.0", - "rustls-pki-types", + "rustls", + "rustls-native-certs", "sha1", "thiserror", "url", diff --git a/apple-codesign/Cargo.toml b/apple-codesign/Cargo.toml index 73f5cbed..9a5bb339 100644 --- a/apple-codesign/Cargo.toml +++ b/apple-codesign/Cargo.toml @@ -16,20 +16,20 @@ name = "rcodesign" path = "src/main.rs" [dependencies] -anyhow = "1.0.79" -aws-config = { version = "1.1.2", optional = true } -aws-sdk-s3 = { version = "1.12.0", optional = true } -aws-smithy-http = {version = "0.60.2", optional = true } -aws-smithy-types = {version = "1.1.2", optional = true } -base64 = "0.21.7" -bcder = "0.7.4" -bitflags = "2.4.1" -bytes = "1.5.0" -clap = { version = "4.4.17", features = ["derive"] } -chrono = "0.4.31" -cryptographic-message-syntax = "0.26.0" -der = { version = "0.7.8", features = ["alloc"] } -dialoguer = "0.11.0" +anyhow = "1.0.71" +aws-config = { version = "0.56.0", optional = true } +aws-sdk-s3 = { version = "0.29.0", optional = true } +aws-smithy-client = { version = "0.56.1", features = ["rustls", "client-hyper"] } +aws-smithy-http = {version = "0.56.1", optional = true } +base64 = "0.21.2" +bcder = "0.7.2" +bitflags = "2.3.1" +bytes = "1.4.0" +clap = { version = "4.3.1", features = ["derive"] } +chrono = "0.4.26" +cryptographic-message-syntax = "0.23.0" +der = "0.7.6" +dialoguer = "0.10.4" difference = "2.0.0" digest = "0.10.7" dirs = "5.0.1" @@ -40,11 +40,12 @@ filetime = "0.2.23" glob = "0.3.1" goblin = "0.8.0" hex = "0.4.3" -log = "0.4.20" -md-5 = "0.10.6" -minicbor = { version = "0.20.0", features = ["derive", "std"] } -num-traits = "0.2.17" -object = { version = "0.32.2", features = ["write"] } +headers = "0.3.8" +hyper = { version = "0.14.27", features = ["client"] } +hyper-proxy = "0.9.1" +log = "0.4.18" +md-5 = "0.10.5" +minicbor = { version = "0.19.1", features = ["derive", "std"] } oid-registry = "0.6.1" once_cell = "1.19.0" p12 = "0.6.3" @@ -54,19 +55,19 @@ pkcs1 = { version = "0.7.5", features = ["alloc", "std", "pkcs8"] } pkcs8 = { version = "0.10.2", features = ["alloc", "std"] } plist = "1.6.0" rand = "0.8.5" -rasn = "0.12.4" -rayon = "1.8.0" -regex = "1.10.2" -reqwest = { version = "0.11.23", default-features = false, features = ["blocking", "json", "rustls-tls-native-roots"] } -ring = "0.17.7" -rsa = "0.9.6" -scroll = "0.12.0" -sha2 = "0.10.8" -semver = "1.0.21" -serde = { version = "1.0.195", features = ["derive"] } -serde_json = "1.0.111" -serde_yaml = "0.9.30" -signature = { version = "2.2.0", features = ["std"] } +rasn = "0.7.0" +rayon = "1.7.0" +regex = "1.8.3" +reqwest = { version = "0.11.18", default-features = false, features = ["blocking", "json", "rustls-tls-native-roots"] } +ring = "0.16.20" +rsa = "0.8.2" +scroll = "0.11.0" +sha2 = "0.10.6" +semver = "1.0.17" +serde = { version = "1.0.163", features = ["derive"] } +serde_json = "1.0.96" +serde_yaml = "0.9.21" +signature = { version = "2.1.0", features = ["std"] } simple-file-manifest = "0.11.0" spake2 = "0.4.0" spki = { version = "0.7.3", features = ["pem"] } diff --git a/apple-codesign/src/notarization.rs b/apple-codesign/src/notarization.rs index 09e9b9fa..692e9f70 100644 --- a/apple-codesign/src/notarization.rs +++ b/apple-codesign/src/notarization.rs @@ -22,6 +22,9 @@ use { headers::Authorization, hyper::Uri, hyper_proxy::{Proxy, Intercept, ProxyConnector}, + headers::Authorization, + hyper::Uri, + hyper_proxy::{Proxy, Intercept, ProxyConnector}, log::warn, sha2::Digest, std::{