Merge main

Author: ameba23

.github/workflows/test.yml

@@ -0,0 +1,34 @@
+name: Test
+
+on: [push, pull_request]
+
+jobs:
+  build_and_test:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
+
+    - name: Set up Rust
+      uses: dtolnay/rust-toolchain@stable
+      with:
+        toolchain: stable
+        components: rustfmt, clippy
+
+    - name: Cache dependencies
+      uses: actions/cache@v3
+      with:
+        path: |
+          ~/.cargo/registry
+          ~/.cargo/git
+          target
+        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-cargo-
+
+    - name: Run cargo clippy
+      run: cargo clippy -- -D warnings
+
+    - name: Run cargo test
+      run: cargo test

src/lib.rs

@@ -57,17 +57,15 @@ impl<L: AttestationPlatform, R: AttestationPlatform> ProxyServer<L, R> {
             .with_single_cert(cert_chain.clone(), key)
             .expect("Failed to create rustls server config");
 
-        let server = Self::new_with_tls_config(
+        Self::new_with_tls_config(
             cert_chain,
             server_config.into(),
             local,
             target,
             local_attestation_platform,
             remote_attestation_platform,
         )
-        .await;
-
-        server
+        .await
     }
 
     /// Start with preconfigured TLS
@@ -184,16 +182,15 @@ impl<L: AttestationPlatform, R: AttestationPlatform> ProxyClient<L, R> {
             .with_root_certificates(root_store)
             .with_no_client_auth();
 
-        let client = Self::new_with_tls_config(
+        Self::new_with_tls_config(
             client_config.into(),
             address,
             server_address,
             server_name,
             local_attestation_platform,
             remote_attestation_platform,
         )
-        .await;
-        client
+        .await
     }
 
     pub async fn new_with_tls_config(
@@ -215,7 +212,12 @@ impl<L: AttestationPlatform, R: AttestationPlatform> ProxyClient<L, R> {
         Self {
             inner,
             connector,
+<<<<<<< HEAD
             target: target.into(),
+=======
+            listener,
+            target,
+>>>>>>> main
             target_name,
         }
     }