Merge branch 'main' into vsp_enable_logging

.github/workflows/ci.yml

@@ -11,9 +11,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-          rust: [1.60.0, stable, nightly]
+          rust: [1.68.2, stable, nightly]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: dtolnay/rust-toolchain@master
       with:
         toolchain: ${{matrix.rust}}
@@ -24,7 +24,7 @@ jobs:
     name: Clippy
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: dtolnay/rust-toolchain@stable
     - uses: Swatinem/rust-cache@v2
     - run: rustup component add clippy
@@ -34,7 +34,7 @@ jobs:
     name: Rustfmt
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: dtolnay/rust-toolchain@stable
     - uses: Swatinem/rust-cache@v2
     - run: rustup component add rustfmt
@@ -44,7 +44,7 @@ jobs:
     name: Check dependencies for security issues
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: dtolnay/rust-toolchain@stable
     - uses: Swatinem/rust-cache@v2
     - run: cargo install --locked --version "~0.17" cargo-audit
@@ -56,7 +56,7 @@ jobs:
     outputs:
       license_changed: ${{ steps.license_diff.outputs.license_changed }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: dtolnay/rust-toolchain@stable
     - uses: Swatinem/rust-cache@v2
     - run: cargo install --locked --version "~0.5" cargo-about

.github/workflows/license_update.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
       # Clone the repository and check if THIRD_PARTY_LICENSES_RUST_CRATES.html
       # is up-to-date.
-      - uses: actions/checkout@v3.5.0
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
       - run: cargo install --locked --version "~0.5" cargo-about

.github/workflows/summary.yml

@@ -9,7 +9,7 @@ jobs:
     if: ${{ github.repository == "aws/aws-nitro-enclaves-cli" }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: create summary
         run: |
           # Get list of open PRs through GH CLI formatting by columns

Cargo.toml

@@ -4,7 +4,7 @@ version = "1.2.3"
 authors = ["The AWS Nitro Enclaves Team <[email protected]>"]
 edition = "2018"
 license = "Apache-2.0"
-rust-version = "1.60"
+rust-version = "1.68"
 
 [dependencies]
 serde = { version = ">=1.0", features = ["derive"] }

README.md

@@ -1,6 +1,6 @@
 ![msrv]
 
-[msrv]: https://img.shields.io/badge/MSRV-1.60.0-blue
+[msrv]: https://img.shields.io/badge/MSRV-1.68.2-blue
 
 ## Nitro Enclaves Command Line Interface (Nitro CLI)
 

SPECS/aws-nitro-enclaves-cli.spec

@@ -31,8 +31,8 @@ Source0: aws-nitro-enclaves-cli.tar.gz
 Source1: nitro-cli-dependencies.tar.gz
 
 BuildRequires: openssl-devel
-BuildRequires: rust >= 1.60
-BuildRequires: cargo >= 1.60
+BuildRequires: rust >= 1.68
+BuildRequires: cargo >= 1.68
 BuildRequires: make
 BuildRequires: llvm
 BuildRequires: clang

driver-bindings/Cargo.toml

@@ -4,4 +4,4 @@ version = "0.1.0"
 authors = ["The AWS Nitro Enclaves Team <[email protected]>"]
 edition = "2018"
 description = "Rust FFI bindings to Linux Nitro Enclaves driver generated using bindgen."
-rust-version = "1.60"
+rust-version = "1.68"

eif_loader/Cargo.toml

@@ -3,7 +3,7 @@ name = "eif_loader"
 version = "0.1.0"
 authors = ["The AWS Nitro Enclaves Team <[email protected]>"]
 edition = "2018"
-rust-version = "1.60"
+rust-version = "1.68"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

enclave_build/Cargo.toml

@@ -3,7 +3,7 @@ name = "enclave_build"
 version = "0.1.0"
 authors = ["The AWS Nitro Enclaves Team <[email protected]>"]
 edition = "2018"
-rust-version = "1.60"
+rust-version = "1.68"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

samples/command_executer/Cargo.toml

@@ -3,7 +3,7 @@ name = "command-executer"
 version = "0.1.0"
 authors = ["The AWS Nitro Enclaves Team <[email protected]>"]
 edition = "2018"
-rust-version = "1.60"
+rust-version = "1.68"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

src/common/mod.rs

@@ -56,8 +56,9 @@ const SOCKETS_DIR_PATH: &str = "/run/nitro_enclaves";
 const BACKTRACE_VAR: &str = "BACKTRACE";
 
 /// All possible errors which may occur.
-#[derive(Debug, Clone, Copy, Hash, PartialEq)]
+#[derive(Debug, Default, Clone, Copy, Hash, PartialEq)]
 pub enum NitroCliErrorEnum {
+    #[default]
     /// Unspecified error (should avoid using it thoughout the code).
     UnspecifiedError = 0,
     /// Error for handling missing arguments.
@@ -180,12 +181,6 @@ pub enum NitroCliErrorEnum {
     EIFSignatureCheckerError,
 }
 
-impl Default for NitroCliErrorEnum {
-    fn default() -> NitroCliErrorEnum {
-        NitroCliErrorEnum::UnspecifiedError
-    }
-}
-
 impl Eq for NitroCliErrorEnum {}
 
 /// The type of commands that can be sent to an enclave process.

src/enclave_proc/connection.rs

@@ -12,7 +12,6 @@ use std::collections::HashMap;
 use std::io::Write;
 use std::os::unix::io::AsRawFd;
 use std::os::unix::net::UnixStream;
-use std::string::ToString;
 use std::sync::{Arc, Mutex};
 
 use crate::common::{receive_from_stream, write_u64_le};

src/enclave_proc/resource_manager.rs

@@ -11,7 +11,6 @@ use eif_loader::{enclave_ready, TIMEOUT_MINUTE_MS};
 use libc::c_int;
 use log::{debug, info};
 use std::collections::BTreeMap;
-use std::convert::{From, Into};
 use std::fs::{File, OpenOptions};
 use std::io::prelude::*;
 use std::io::Error;
@@ -109,8 +108,9 @@ pub struct MemoryRegion {
 }
 
 /// The state an enclave may be in.
-#[derive(Clone)]
+#[derive(Clone, Default)]
 pub enum EnclaveState {
+    #[default]
     /// The enclave is not running (it's either not started or has been terminated).
     Empty,
     /// The enclave is running.
@@ -180,12 +180,6 @@ impl ToString for EnclaveState {
     }
 }
 
-impl Default for EnclaveState {
-    fn default() -> Self {
-        EnclaveState::Empty
-    }
-}
-
 impl Default for EnclaveBuildInfo {
     fn default() -> Self {
         EnclaveBuildInfo::new(BTreeMap::new())

tools/Dockerfile

@@ -30,7 +30,7 @@ RUN cd /tmp/openssl_src/openssl-${OPENSSL_VERSION} &&  \
 	make install_sw
 
 # Setup the right rust ver
-ENV RUST_VERSION=1.60.0
+ENV RUST_VERSION=1.68.2
 RUN  source $HOME/.cargo/env && \
 	ARCH=$(uname -m) && \
 	rustup toolchain install ${RUST_VERSION}-${ARCH}-unknown-linux-gnu && \

vsock_proxy/Cargo.toml

@@ -3,7 +3,7 @@ name = "vsock-proxy"
 version = "0.1.0"
 authors = ["The AWS Nitro Enclaves Team <[email protected]>"]
 edition = "2018"
-rust-version = "1.60"
+rust-version = "1.68"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html