From 4f29e6a09a0622acd37a12e8574c6ef1a15b9d6c Mon Sep 17 00:00:00 2001
From: roblabla <unfiltered@roblab.la>
Date: Wed, 16 Aug 2023 01:36:37 +0200
Subject: [PATCH 1/9] Update aws-smithy/s3 to 0.56.0

This allows using the same version of rustls betwen apple-codesign and
the AWS SDK, which allows enabling the native-tls features of rustls
inside the S3 client.
---
 Cargo.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3a5dd6d2..62785c5d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -408,7 +408,7 @@ dependencies = [
  "aws-smithy-types",
  "aws-types",
  "bytes",
- "fastrand",
+ "fastrand 2.0.0",
  "hex",
  "http 0.2.11",
  "hyper",

From 96ee719e88ffd45e53210e133ad1cc1d191ae62d Mon Sep 17 00:00:00 2001
From: Austin Sasko <austintyler0239@yahoo.com>
Date: Thu, 14 Sep 2023 11:43:11 -0400
Subject: [PATCH 2/9] feat: add code to use proxy client

---
 apple-codesign/src/notarization.rs | 31 +++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/apple-codesign/src/notarization.rs b/apple-codesign/src/notarization.rs
index 20c8b7b6..0fb30d76 100644
--- a/apple-codesign/src/notarization.rs
+++ b/apple-codesign/src/notarization.rs
@@ -19,9 +19,13 @@ use {
     apple_bundles::DirectoryBundle,
     aws_sdk_s3::config::{Credentials, Region},
     aws_smithy_types::byte_stream::ByteStream,
+    headers::Authorization,
+    hyper::Uri,
+    hyper_proxy::{Proxy, Intercept, ProxyConnector},
     log::warn,
     sha2::Digest,
     std::{
+        env
         fs::File,
         io::{Read, Seek, SeekFrom, Write},
         path::{Path, PathBuf},
@@ -310,8 +314,33 @@ impl Notarizer {
                 .load(),
         );
 
-        let s3_client = aws_sdk_s3::Client::new(&config);
+        let proxy = {
+          let http_proxy = env::var_os("http_proxy");
+          let proxy_uri = http_proxy.unwrap().to_str().unwrap().parse::<Uri>().unwrap();
+          let mut proxy = Proxy::new(Intercept::All, proxy_uri);
 
+          let proxy_user = env::var_os("proxy_user");
+          let proxy_password = env::var_os("proxy_password");
+
+          match (proxy_user, proxy_password) {
+            (Some(user), Some(password)) => {
+              proxy.set_authorization(Authorization::basic(user.to_str().unwrap(), password.to_str().unwrap()));
+            }
+            _ => {}
+          }
+
+          let connector = hyper::client::HttpConnector::new();
+          let proxy_connector = ProxyConnector::from_proxy(connector, proxy).unwrap();
+          proxy_connector
+        };        
+
+        let hyper_client = aws_smithy_client::hyper_ext::Adapter::builder()
+          .build(proxy);
+        // let hyper_client = hyper_ext::Adapter::builder().build(proxy);
+        let proxy_config = aws_sdk_s3::config::Builder::from(&config).http_connector(hyper_client).build();
+        let s3_client = aws_sdk_s3::client::Client::from_conf(proxy_config);
+        //let s3_client = aws_sdk_s3::Client::new(&config);
+        
         warn!(
             "uploading asset to s3://{}/{}",
             submission.data.attributes.bucket, submission.data.attributes.object

From dbc2b126057dea69841a92667c764b2639dbcc04 Mon Sep 17 00:00:00 2001
From: Austin Sasko <austintyler0239@yahoo.com>
Date: Thu, 14 Sep 2023 13:40:09 -0400
Subject: [PATCH 3/9] fix: typo - left out trailing comma

---
 apple-codesign/src/notarization.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apple-codesign/src/notarization.rs b/apple-codesign/src/notarization.rs
index 0fb30d76..84edbb04 100644
--- a/apple-codesign/src/notarization.rs
+++ b/apple-codesign/src/notarization.rs
@@ -25,7 +25,7 @@ use {
     log::warn,
     sha2::Digest,
     std::{
-        env
+        env,
         fs::File,
         io::{Read, Seek, SeekFrom, Write},
         path::{Path, PathBuf},

From d2be2034a0fb718c5b8fc953a511d64ceadd0192 Mon Sep 17 00:00:00 2001
From: Austin Sasko <austintyler0239@yahoo.com>
Date: Wed, 5 Jun 2024 12:44:28 -0400
Subject: [PATCH 4/9] fix: support case insensitive proxy vars and conditional
 proxy usage

---
 apple-codesign/src/notarization.rs | 31 +++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/apple-codesign/src/notarization.rs b/apple-codesign/src/notarization.rs
index 84edbb04..09e9b9fa 100644
--- a/apple-codesign/src/notarization.rs
+++ b/apple-codesign/src/notarization.rs
@@ -314,8 +314,11 @@ impl Notarizer {
                 .load(),
         );
 
-        let proxy = {
-          let http_proxy = env::var_os("http_proxy");
+        let http_proxy = env::var_os("HTTP_PROXY").or(env::var_os("http_proxy"));
+        if http_proxy.is_some() {
+          debug!("using proxy: {:?}", http_proxy);
+
+          let proxy = {
           let proxy_uri = http_proxy.unwrap().to_str().unwrap().parse::<Uri>().unwrap();
           let mut proxy = Proxy::new(Intercept::All, proxy_uri);
 
@@ -323,24 +326,26 @@ impl Notarizer {
           let proxy_password = env::var_os("proxy_password");
 
           match (proxy_user, proxy_password) {
-            (Some(user), Some(password)) => {
+              (Some(user), Some(password)) => {
               proxy.set_authorization(Authorization::basic(user.to_str().unwrap(), password.to_str().unwrap()));
-            }
-            _ => {}
+              }
+              _ => {}
           }
 
           let connector = hyper::client::HttpConnector::new();
           let proxy_connector = ProxyConnector::from_proxy(connector, proxy).unwrap();
           proxy_connector
-        };        
-
-        let hyper_client = aws_smithy_client::hyper_ext::Adapter::builder()
+          };
+          let hyper_client = aws_smithy_client::hyper_ext::Adapter::builder()
           .build(proxy);
-        // let hyper_client = hyper_ext::Adapter::builder().build(proxy);
-        let proxy_config = aws_sdk_s3::config::Builder::from(&config).http_connector(hyper_client).build();
-        let s3_client = aws_sdk_s3::client::Client::from_conf(proxy_config);
-        //let s3_client = aws_sdk_s3::Client::new(&config);
-        
+          let proxy_config = aws_sdk_s3::config::Builder::from(&config).http_connector(hyper_client).build();
+          let s3_client = aws_sdk_s3::client::Client::from_conf(proxy_config);
+        }
+        else
+        {
+          debug!("no proxy configured");
+          let s3_client = aws_sdk_s3::Client::new(&config);
+        }
         warn!(
             "uploading asset to s3://{}/{}",
             submission.data.attributes.bucket, submission.data.attributes.object

From 233d1145f61a48c77a4fadf989933bd2414405f3 Mon Sep 17 00:00:00 2001
From: Austin Sasko <austin.sasko@aexp.com>
Date: Wed, 5 Jun 2024 13:18:36 -0400
Subject: [PATCH 5/9] fix: merge conflict for smithy

---
 apple-codesign/Cargo.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apple-codesign/Cargo.toml b/apple-codesign/Cargo.toml
index 73f5cbed..4dfcec86 100644
--- a/apple-codesign/Cargo.toml
+++ b/apple-codesign/Cargo.toml
@@ -19,6 +19,7 @@ path = "src/main.rs"
 anyhow = "1.0.79"
 aws-config = { version = "1.1.2", optional = true }
 aws-sdk-s3 = { version = "1.12.0", optional = true }
+aws-smithy-client = { version = "0.60.2", features = ["rustls", "client-hyper"] }
 aws-smithy-http = {version = "0.60.2", optional = true }
 aws-smithy-types = {version = "1.1.2", optional = true }
 base64 = "0.21.7"

From af26a156805ba737d3cfc805026a82a44355cc83 Mon Sep 17 00:00:00 2001
From: Austin Sasko <austin.sasko@aexp.com>
Date: Wed, 12 Jun 2024 15:18:03 -0400
Subject: [PATCH 6/9] fix: support for proxy with newer versions of code w
 conditional

---
 apple-codesign/Cargo.toml          |  8 ++-
 apple-codesign/src/notarization.rs | 81 +++++++++++++++++++-----------
 2 files changed, 57 insertions(+), 32 deletions(-)

diff --git a/apple-codesign/Cargo.toml b/apple-codesign/Cargo.toml
index 4dfcec86..7d54f84b 100644
--- a/apple-codesign/Cargo.toml
+++ b/apple-codesign/Cargo.toml
@@ -19,8 +19,9 @@ path = "src/main.rs"
 anyhow = "1.0.79"
 aws-config = { version = "1.1.2", optional = true }
 aws-sdk-s3 = { version = "1.12.0", optional = true }
-aws-smithy-client = { version = "0.60.2", features = ["rustls", "client-hyper"] }
-aws-smithy-http = {version = "0.60.2", optional = true }
+aws-smithy-client = { version = "0.56.1", features = ["rustls", "client-hyper"] }
+aws-smithy-http = {version = "0.56.1", optional = true }
+aws-smithy-runtime = { version = "1.5.5" }
 aws-smithy-types = {version = "1.1.2", optional = true }
 base64 = "0.21.7"
 bcder = "0.7.4"
@@ -40,7 +41,10 @@ figment = { version = "0.10.13", features = ["env", "toml"] }
 filetime = "0.2.23"
 glob = "0.3.1"
 goblin = "0.8.0"
+headers = "0.3.8"
 hex = "0.4.3"
+hyper = { version = "0.14.27", features = ["client"] }
+hyper-proxy = "0.9.1"
 log = "0.4.20"
 md-5 = "0.10.6"
 minicbor = { version = "0.20.0", features = ["derive", "std"] }
diff --git a/apple-codesign/src/notarization.rs b/apple-codesign/src/notarization.rs
index 09e9b9fa..b1598c21 100644
--- a/apple-codesign/src/notarization.rs
+++ b/apple-codesign/src/notarization.rs
@@ -21,6 +21,7 @@ use {
     aws_smithy_types::byte_stream::ByteStream,
     headers::Authorization,
     hyper::Uri,
+    hyper::client::HttpConnector,
     hyper_proxy::{Proxy, Intercept, ProxyConnector},
     log::warn,
     sha2::Digest,
@@ -296,9 +297,10 @@ impl Notarizer {
             UploadKind::Path(path) => rt.block_on(ByteStream::from_path(path))?,
         };
 
+
         // upload using s3 api
         warn!("resolving AWS S3 configuration from Apple-provided credentials");
-        let config = rt.block_on(
+        let mut config = rt.block_on(
             aws_config::defaults(aws_config::BehaviorVersion::latest())
                 .credentials_provider(Credentials::new(
                     submission.data.attributes.aws_access_key_id.clone(),
@@ -313,39 +315,58 @@ impl Notarizer {
                 .region(Region::new("us-west-2"))
                 .load(),
         );
-
-        let http_proxy = env::var_os("HTTP_PROXY").or(env::var_os("http_proxy"));
-        if http_proxy.is_some() {
-          debug!("using proxy: {:?}", http_proxy);
-
-          let proxy = {
-          let proxy_uri = http_proxy.unwrap().to_str().unwrap().parse::<Uri>().unwrap();
-          let mut proxy = Proxy::new(Intercept::All, proxy_uri);
-
-          let proxy_user = env::var_os("proxy_user");
-          let proxy_password = env::var_os("proxy_password");
-
-          match (proxy_user, proxy_password) {
-              (Some(user), Some(password)) => {
-              proxy.set_authorization(Authorization::basic(user.to_str().unwrap(), password.to_str().unwrap()));
-              }
-              _ => {}
-          }
-
-          let connector = hyper::client::HttpConnector::new();
-          let proxy_connector = ProxyConnector::from_proxy(connector, proxy).unwrap();
-          proxy_connector
-          };
-          let hyper_client = aws_smithy_client::hyper_ext::Adapter::builder()
-          .build(proxy);
-          let proxy_config = aws_sdk_s3::config::Builder::from(&config).http_connector(hyper_client).build();
-          let s3_client = aws_sdk_s3::client::Client::from_conf(proxy_config);
+        warn!("test");
+        // check if proxy env var is set
+        if env::var("https_proxy").is_err() {
+            warn!("no proxy set");
         }
         else
         {
-          debug!("no proxy configured");
-          let s3_client = aws_sdk_s3::Client::new(&config);
+            warn!("proxy set");
+            pub fn determine_proxy() -> Option<ProxyConnector<HttpConnector>> {
+                // let proxy_url: Url = std::env::var("https_proxy").ok()?.parse().ok()?;
+                let proxy_uri: Uri = std::env::var("https_proxy").ok()?.parse().ok()?;
+                let mut proxy = Proxy::new(Intercept::All, proxy_uri);
+            
+                let proxy_user = env::var_os("proxy_user");
+                let proxy_password = env::var_os("proxy_password");
+                match (proxy_user, proxy_password) {
+                    (Some(user), Some(password)) => {
+                    proxy.set_authorization(Authorization::basic(user.to_str().unwrap(), password.to_str().unwrap()));
+                    }
+                    _ => {}
+                }
+            
+                let connector = HttpConnector::new();
+                Some(ProxyConnector::from_proxy(connector, proxy).unwrap())
+            }
+
+            let proxy = determine_proxy().unwrap();
+            let client = aws_smithy_runtime::client::http::hyper_014::HyperClientBuilder::new().build(proxy);
+
+             // upload using s3 api
+            warn!("resolving AWS S3 configuration from Apple-provided credentials");
+            config = rt.block_on(
+                aws_config::defaults(aws_config::BehaviorVersion::latest())
+                    .credentials_provider(Credentials::new(
+                        submission.data.attributes.aws_access_key_id.clone(),
+                        submission.data.attributes.aws_secret_access_key.clone(),
+                        Some(submission.data.attributes.aws_session_token.clone()),
+                        None,
+                        "apple-codesign",
+                    ))
+                    // The region is not given anywhere in the Apple documentation. From
+                    // manually testing all available regions, it appears to be
+                    // us-west-2.
+                    .http_client(client.clone())
+                    .region(Region::new("us-west-2"))
+                    .load(),
+            );
         }
+
+
+        let s3_client = aws_sdk_s3::Client::new(&config);
+
         warn!(
             "uploading asset to s3://{}/{}",
             submission.data.attributes.bucket, submission.data.attributes.object

From e7f57fe46591bf967e2bdb8742a3a3f24d47c7ab Mon Sep 17 00:00:00 2001
From: Austin Sasko <austin.sasko@aexp.com>
Date: Wed, 12 Jun 2024 15:18:28 -0400
Subject: [PATCH 7/9] fix: add cargo lock

---
 Cargo.lock | 473 ++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 414 insertions(+), 59 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 62785c5d..ad944bb3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -185,8 +185,10 @@ dependencies = [
  "apple-xar",
  "aws-config",
  "aws-sdk-s3",
- "aws-smithy-http",
- "aws-smithy-types",
+ "aws-smithy-client",
+ "aws-smithy-http 0.56.1",
+ "aws-smithy-runtime",
+ "aws-smithy-types 1.1.10",
  "base64",
  "bcder",
  "bitflags 2.4.1",
@@ -206,7 +208,10 @@ dependencies = [
  "flate2",
  "glob",
  "goblin",
+ "headers",
  "hex",
+ "hyper",
+ "hyper-proxy",
  "indoc",
  "log",
  "md-5",
@@ -400,15 +405,15 @@ dependencies = [
  "aws-sdk-sso",
  "aws-sdk-ssooidc",
  "aws-sdk-sts",
- "aws-smithy-async",
- "aws-smithy-http",
+ "aws-smithy-async 1.2.1",
+ "aws-smithy-http 0.60.8",
  "aws-smithy-json",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
- "aws-smithy-types",
+ "aws-smithy-types 1.1.10",
  "aws-types",
  "bytes",
- "fastrand 2.0.0",
+ "fastrand",
  "hex",
  "http 0.2.11",
  "hyper",
@@ -425,9 +430,9 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a7cb3510b95492bd9014b60e2e3bee3e48bc516e220316f8e6b60df18b47331"
 dependencies = [
- "aws-smithy-async",
+ "aws-smithy-async 1.2.1",
  "aws-smithy-runtime-api",
- "aws-smithy-types",
+ "aws-smithy-types 1.1.10",
  "zeroize",
 ]
 
@@ -438,11 +443,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a95d41abe4e941399fdb4bc2f54713eac3c839d98151875948bb24e66ab658f2"
 dependencies = [
  "aws-smithy-runtime-api",
- "aws-smithy-types",
+ "aws-smithy-types 1.1.10",
  "aws-types",
  "bytes",
  "http 0.2.11",
- "http-body",
+ "http-body 0.4.6",
  "pin-project-lite",
  "tracing",
 ]
@@ -456,11 +461,11 @@ dependencies = [
  "aws-credential-types",
  "aws-http",
  "aws-sigv4",
- "aws-smithy-async",
+ "aws-smithy-async 1.2.1",
  "aws-smithy-eventstream",
- "aws-smithy-http",
+ "aws-smithy-http 0.60.8",
  "aws-smithy-runtime-api",
- "aws-smithy-types",
+ "aws-smithy-types 1.1.10",
  "aws-types",
  "fastrand",
  "http 0.2.11",
@@ -479,19 +484,19 @@ dependencies = [
  "aws-http",
  "aws-runtime",
  "aws-sigv4",
- "aws-smithy-async",
+ "aws-smithy-async 1.2.1",
  "aws-smithy-checksums",
  "aws-smithy-eventstream",
- "aws-smithy-http",
+ "aws-smithy-http 0.60.8",
  "aws-smithy-json",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
- "aws-smithy-types",
+ "aws-smithy-types 1.1.10",
  "aws-smithy-xml",
  "aws-types",
  "bytes",
  "http 0.2.11",
- "http-body",
+ "http-body 0.4.6",
  "once_cell",
  "percent-encoding",
  "regex-lite",
@@ -508,12 +513,12 @@ dependencies = [
  "aws-credential-types",
  "aws-http",
  "aws-runtime",
- "aws-smithy-async",
- "aws-smithy-http",
+ "aws-smithy-async 1.2.1",
+ "aws-smithy-http 0.60.8",
  "aws-smithy-json",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
- "aws-smithy-types",
+ "aws-smithy-types 1.1.10",
  "aws-types",
  "bytes",
  "http 0.2.11",
@@ -531,12 +536,12 @@ dependencies = [
  "aws-credential-types",
  "aws-http",
  "aws-runtime",
- "aws-smithy-async",
- "aws-smithy-http",
+ "aws-smithy-async 1.2.1",
+ "aws-smithy-http 0.60.8",
  "aws-smithy-json",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
- "aws-smithy-types",
+ "aws-smithy-types 1.1.10",
  "aws-types",
  "bytes",
  "http 0.2.11",
@@ -554,13 +559,13 @@ dependencies = [
  "aws-credential-types",
  "aws-http",
  "aws-runtime",
- "aws-smithy-async",
- "aws-smithy-http",
+ "aws-smithy-async 1.2.1",
+ "aws-smithy-http 0.60.8",
  "aws-smithy-json",
  "aws-smithy-query",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
- "aws-smithy-types",
+ "aws-smithy-types 1.1.10",
  "aws-smithy-xml",
  "aws-types",
  "http 0.2.11",
@@ -577,9 +582,9 @@ checksum = "b92384b39aedb258aa734fe0e7b2ffcd13f33e68227251a72cd2635e0acc8f1a"
 dependencies = [
  "aws-credential-types",
  "aws-smithy-eventstream",
- "aws-smithy-http",
+ "aws-smithy-http 0.60.8",
  "aws-smithy-runtime-api",
- "aws-smithy-types",
+ "aws-smithy-types 1.1.10",
  "bytes",
  "crypto-bigint 0.5.5",
  "form_urlencoded",
@@ -599,9 +604,21 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-async"
-version = "1.1.2"
+version = "0.56.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71d8e1c0904f78c76846a9dad41c28b41d330d97741c3e70d003d9a747d95e2a"
+checksum = "2cdb73f85528b9d19c23a496034ac53703955a59323d581c06aa27b4e4e247af"
+dependencies = [
+ "futures-util",
+ "pin-project-lite",
+ "tokio",
+ "tokio-stream",
+]
+
+[[package]]
+name = "aws-smithy-async"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62220bc6e97f946ddd51b5f1361f78996e704677afc518a4ff66b7a72ea1378c"
 dependencies = [
  "futures-util",
  "pin-project-lite",
@@ -614,14 +631,14 @@ version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62d59ef74bf94562512e570eeccb81e9b3879f9136b2171ed4bf996ffa609955"
 dependencies = [
- "aws-smithy-http",
- "aws-smithy-types",
+ "aws-smithy-http 0.60.8",
+ "aws-smithy-types 1.1.10",
  "bytes",
  "crc32c",
  "crc32fast",
  "hex",
  "http 0.2.11",
- "http-body",
+ "http-body 0.4.6",
  "md-5",
  "pin-project-lite",
  "sha1",
@@ -629,31 +646,75 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "aws-smithy-client"
+version = "0.56.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c27b2756264c82f830a91cb4d2d485b2d19ad5bea476d9a966e03d27f27ba59a"
+dependencies = [
+ "aws-smithy-async 0.56.1",
+ "aws-smithy-http 0.56.1",
+ "aws-smithy-http-tower",
+ "aws-smithy-types 0.56.1",
+ "bytes",
+ "fastrand",
+ "http 0.2.11",
+ "http-body 0.4.6",
+ "hyper",
+ "hyper-rustls",
+ "lazy_static",
+ "pin-project-lite",
+ "rustls 0.21.10",
+ "tokio",
+ "tower",
+ "tracing",
+]
+
 [[package]]
 name = "aws-smithy-eventstream"
-version = "0.60.2"
+version = "0.60.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31cf0466890a20988b9b2864250dd907f769bd189af1a51ba67beec86f7669fb"
+checksum = "e6363078f927f612b970edf9d1903ef5cef9a64d1e8423525ebb1f0a1633c858"
 dependencies = [
- "aws-smithy-types",
+ "aws-smithy-types 1.1.10",
  "bytes",
  "crc32fast",
 ]
 
 [[package]]
 name = "aws-smithy-http"
-version = "0.60.2"
+version = "0.56.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54cdcf365d8eee60686885f750a34c190e513677db58bbc466c44c588abf4199"
+dependencies = [
+ "aws-smithy-types 0.56.1",
+ "bytes",
+ "bytes-utils",
+ "futures-core",
+ "http 0.2.11",
+ "http-body 0.4.6",
+ "hyper",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "pin-utils",
+ "tracing",
+]
+
+[[package]]
+name = "aws-smithy-http"
+version = "0.60.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "568a3b159001358dd96143378afd7470e19baffb6918e4b5016abe576e553f9c"
+checksum = "4a7de001a1b9a25601016d8057ea16e31a45fdca3751304c8edf4ad72e706c08"
 dependencies = [
  "aws-smithy-eventstream",
  "aws-smithy-runtime-api",
- "aws-smithy-types",
+ "aws-smithy-types 1.1.10",
  "bytes",
  "bytes-utils",
  "futures-core",
  "http 0.2.11",
- "http-body",
+ "http-body 0.4.6",
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
@@ -661,13 +722,29 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "aws-smithy-http-tower"
+version = "0.56.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "822de399d0ce62829a69dfa8c5cd08efdbe61a7426b953e2268f8b8b52a607bd"
+dependencies = [
+ "aws-smithy-http 0.56.1",
+ "aws-smithy-types 0.56.1",
+ "bytes",
+ "http 0.2.11",
+ "http-body 0.4.6",
+ "pin-project-lite",
+ "tower",
+ "tracing",
+]
+
 [[package]]
 name = "aws-smithy-json"
 version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f12bfb23370a069f8facbfd53ce78213461b0a8570f6c81488030f5ab6f8cc4e"
 dependencies = [
- "aws-smithy-types",
+ "aws-smithy-types 1.1.10",
 ]
 
 [[package]]
@@ -676,25 +753,26 @@ version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b1adc06e0175c175d280267bb8fd028143518013fcb869e1c3199569a2e902a"
 dependencies = [
- "aws-smithy-types",
+ "aws-smithy-types 1.1.10",
  "urlencoding",
 ]
 
 [[package]]
 name = "aws-smithy-runtime"
-version = "1.1.2"
+version = "1.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cf0f6845d2d97b953cea791b0ee37191c5509f2897ec7eb7580a0e7a594e98b"
+checksum = "d0d3965f6417a92a6d1009c5958a67042f57e46342afb37ca58f9ad26744ec73"
 dependencies = [
- "aws-smithy-async",
- "aws-smithy-http",
+ "aws-smithy-async 1.2.1",
+ "aws-smithy-http 0.60.8",
  "aws-smithy-runtime-api",
- "aws-smithy-types",
+ "aws-smithy-types 1.1.10",
  "bytes",
  "fastrand",
  "h2",
  "http 0.2.11",
- "http-body",
+ "http-body 0.4.6",
+ "http-body 1.0.0",
  "hyper",
  "hyper-rustls",
  "once_cell",
@@ -707,14 +785,15 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-runtime-api"
-version = "1.1.2"
+version = "1.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47798ba97a33979c80e837519cf837f18fd6df0adb02dd5286a75d9891c6e671"
+checksum = "4179bd8a1c943e1aceb46c5b9fc014a561bd6c35a2153e816ba29076ee49d245"
 dependencies = [
- "aws-smithy-async",
- "aws-smithy-types",
+ "aws-smithy-async 1.2.1",
+ "aws-smithy-types 1.1.10",
  "bytes",
  "http 0.2.11",
+ "http 1.0.0",
  "pin-project-lite",
  "tokio",
  "tracing",
@@ -723,16 +802,33 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-types"
-version = "1.1.2"
+version = "0.56.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e9a85eafeaf783b2408e35af599e8b96f2c49d9a5d13ad3a887fbdefb6bc744"
+checksum = "d90dbc8da2f6be461fa3c1906b20af8f79d14968fe47f2b7d29d086f62a51728"
+dependencies = [
+ "base64-simd",
+ "itoa",
+ "num-integer",
+ "ryu",
+ "serde",
+ "time",
+]
+
+[[package]]
+name = "aws-smithy-types"
+version = "1.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b6764ba7e1c5ede1c9f9e4046645534f06c2581402461c559b481a420330a83"
 dependencies = [
  "base64-simd",
  "bytes",
  "bytes-utils",
  "futures-core",
  "http 0.2.11",
- "http-body",
+ "http 1.0.0",
+ "http-body 0.4.6",
+ "http-body 1.0.0",
+ "http-body-util",
  "itoa",
  "num-integer",
  "pin-project-lite",
@@ -760,9 +856,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8549aa62c5b7db5c57ab915200ee214b4f5d8f19b29a4a8fa0b3ad3bca1380e3"
 dependencies = [
  "aws-credential-types",
- "aws-smithy-async",
+ "aws-smithy-async 1.2.1",
  "aws-smithy-runtime-api",
- "aws-smithy-types",
+ "aws-smithy-types 1.1.10",
  "http 0.2.11",
  "rustc_version",
  "tracing",
@@ -1599,6 +1695,21 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
 [[package]]
 name = "form_urlencoded"
 version = "1.2.1"
@@ -1623,6 +1734,21 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
+[[package]]
+name = "futures"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
 [[package]]
 name = "futures-channel"
 version = "0.3.30"
@@ -1630,6 +1756,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
 dependencies = [
  "futures-core",
+ "futures-sink",
 ]
 
 [[package]]
@@ -1638,12 +1765,34 @@ version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
 
+[[package]]
+name = "futures-executor"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
 [[package]]
 name = "futures-io"
 version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
 
+[[package]]
+name = "futures-macro"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
 [[package]]
 name = "futures-sink"
 version = "0.3.30"
@@ -1662,8 +1811,11 @@ version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
 dependencies = [
+ "futures-channel",
  "futures-core",
  "futures-io",
+ "futures-macro",
+ "futures-sink",
  "futures-task",
  "memchr",
  "pin-project-lite",
@@ -1780,6 +1932,30 @@ dependencies = [
  "ahash",
 ]
 
+[[package]]
+name = "headers"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270"
+dependencies = [
+ "base64",
+ "bytes",
+ "headers-core",
+ "http 0.2.11",
+ "httpdate",
+ "mime",
+ "sha1",
+]
+
+[[package]]
+name = "headers-core"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429"
+dependencies = [
+ "http 0.2.11",
+]
+
 [[package]]
 name = "heck"
 version = "0.4.1"
@@ -1849,6 +2025,29 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "http-body"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
+dependencies = [
+ "bytes",
+ "http 1.0.0",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "http 1.0.0",
+ "http-body 1.0.0",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "httparse"
 version = "1.8.0"
@@ -1889,7 +2088,7 @@ dependencies = [
  "futures-util",
  "h2",
  "http 0.2.11",
- "http-body",
+ "http-body 0.4.6",
  "httparse",
  "httpdate",
  "itoa",
@@ -1901,6 +2100,24 @@ dependencies = [
  "want",
 ]
 
+[[package]]
+name = "hyper-proxy"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca815a891b24fdfb243fa3239c86154392b0953ee584aa1a2a1f66d20cbe75cc"
+dependencies = [
+ "bytes",
+ "futures",
+ "headers",
+ "http 0.2.11",
+ "hyper",
+ "hyper-tls",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+]
+
 [[package]]
 name = "hyper-rustls"
 version = "0.24.2"
@@ -1917,6 +2134,19 @@ dependencies = [
  "tokio-rustls",
 ]
 
+[[package]]
+name = "hyper-tls"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
+dependencies = [
+ "bytes",
+ "hyper",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+]
+
 [[package]]
 name = "iana-time-zone"
 version = "0.1.59"
@@ -2211,6 +2441,23 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "native-tls"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
+dependencies = [
+ "libc",
+ "log",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "security-framework",
+ "security-framework-sys",
+ "tempfile",
+]
+
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -2347,12 +2594,50 @@ version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
+[[package]]
+name = "openssl"
+version = "0.10.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
+dependencies = [
+ "bitflags 2.4.1",
+ "cfg-if",
+ "foreign-types",
+ "libc",
+ "once_cell",
+ "openssl-macros",
+ "openssl-sys",
+]
+
+[[package]]
+name = "openssl-macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
 [[package]]
 name = "openssl-probe"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
+[[package]]
+name = "openssl-sys"
+version = "0.9.102"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
 [[package]]
 name = "option-ext"
 version = "0.2.0"
@@ -2504,6 +2789,26 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
+[[package]]
+name = "pin-project"
+version = "1.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
 [[package]]
 name = "pin-project-lite"
 version = "0.2.13"
@@ -2820,7 +3125,7 @@ dependencies = [
  "futures-util",
  "h2",
  "http 0.2.11",
- "http-body",
+ "http-body 0.4.6",
  "hyper",
  "hyper-rustls",
  "ipnet",
@@ -3685,6 +3990,16 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "tokio-native-tls"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
+dependencies = [
+ "native-tls",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-rustls"
 version = "0.24.1"
@@ -3695,6 +4010,17 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "tokio-stream"
+version = "0.1.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-util"
 version = "0.7.10"
@@ -3756,6 +4082,28 @@ dependencies = [
  "winnow",
 ]
 
+[[package]]
+name = "tower"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project",
+ "pin-project-lite",
+ "tokio",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tower-layer"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
+
 [[package]]
 name = "tower-service"
 version = "0.3.2"
@@ -3768,6 +4116,7 @@ version = "0.1.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
 dependencies = [
+ "log",
  "pin-project-lite",
  "tracing-attributes",
  "tracing-core",
@@ -3960,6 +4309,12 @@ dependencies = [
  "getrandom",
 ]
 
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
 [[package]]
 name = "version_check"
 version = "0.9.4"

From f856d2534b8ea4bb10b3c5d3c962b21766df394e Mon Sep 17 00:00:00 2001
From: Christopher Backen <cbacken@gmail.com>
Date: Wed, 19 Jun 2024 15:18:58 -0700
Subject: [PATCH 8/9] build(deps): update hyper-proxy to use rustls

---
 apple-codesign/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apple-codesign/Cargo.toml b/apple-codesign/Cargo.toml
index 7d54f84b..1c6019de 100644
--- a/apple-codesign/Cargo.toml
+++ b/apple-codesign/Cargo.toml
@@ -44,7 +44,7 @@ goblin = "0.8.0"
 headers = "0.3.8"
 hex = "0.4.3"
 hyper = { version = "0.14.27", features = ["client"] }
-hyper-proxy = "0.9.1"
+hyper-proxy = { version = "0.9.1", default-features = false, features = ["rustls"] }
 log = "0.4.20"
 md-5 = "0.10.6"
 minicbor = { version = "0.20.0", features = ["derive", "std"] }

From 4596cdfa119f5792b68a2d458b95a1518811dc3a Mon Sep 17 00:00:00 2001
From: Austin Sasko <austin.sasko@aexp.com>
Date: Sat, 20 Jul 2024 13:28:15 -0400
Subject: [PATCH 9/9] chore: updating time package to fix dependency failures

---
 Cargo.lock | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ad944bb3..6e9577c4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2503,6 +2503,12 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
 [[package]]
 name = "num-integer"
 version = "0.1.45"
@@ -3910,12 +3916,13 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.31"
+version = "0.3.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
 dependencies = [
  "deranged",
  "itoa",
+ "num-conv",
  "powerfmt",
  "serde",
  "time-core",
@@ -3930,10 +3937,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.16"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
 dependencies = [
+ "num-conv",
  "time-core",
 ]