diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..e8d486ab --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,11 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates + +version: 2 +updates: + - package-ecosystem: "cargo" # See documentation for possible values + directory: "/" # Location of package manifests + schedule: + interval: "weekly" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 00000000..857d0bdd --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,52 @@ +name: CI + +on: [push, pull_request] + +env: + RUSTFLAGS: -Dwarnings + +jobs: + build: + name: Test on rust ${{matrix.rust}} (keys ${{ matrix.key_feature_set }}) + runs-on: ubuntu-latest + strategy: + matrix: + rust: [1.60.0, stable, nightly] + steps: + - uses: actions/checkout@v3 + - uses: dtolnay/rust-toolchain@master + with: + toolchain: ${{matrix.rust}} + - uses: Swatinem/rust-cache@v2 + - run: cargo build --all --locked + + clippy: + name: Clippy + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: dtolnay/rust-toolchain@stable + - uses: Swatinem/rust-cache@v2 + - run: rustup component add clippy + - run: cargo clippy --all + + fmt: + name: Rustfmt + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: dtolnay/rust-toolchain@stable + - uses: Swatinem/rust-cache@v2 + - run: rustup component add rustfmt + - run: cargo fmt --all -- --check + + audit: + name: Check dependencies for security issues + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: dtolnay/rust-toolchain@stable + - uses: Swatinem/rust-cache@v2 + - run: cargo install --locked --version "~0.17" cargo-audit + - run: cargo audit --ignore RUSTSEC-2020-0159 --ignore RUSTSEC-2020-0071 + diff --git a/.github/workflows/event.yml b/.github/workflows/event.yml index 22febf5b..4c0f4c6f 100644 --- a/.github/workflows/event.yml +++ b/.github/workflows/event.yml @@ -9,6 +9,7 @@ on: jobs: build: + if: ${{ github.repository == "aws/aws-nitro-enclaves-cli" }} runs-on: ubuntu-latest steps: - name: if_pr @@ -23,4 +24,4 @@ jobs: echo "EVENT_URL=${{ github.event.issue.html_url }}" >> $GITHUB_ENV - name: notify run: | - curl -d '{ "type": "${{ env.EVENT_TYPE }}", "url": "${{ env.EVENT_URL }}" }' ${{ secrets.EVENT_WEBHOOK_URL }} \ No newline at end of file + curl -d '{ "type": "${{ env.EVENT_TYPE }}", "url": "${{ env.EVENT_URL }}" }' ${{ secrets.EVENT_WEBHOOK_URL }} diff --git a/.github/workflows/license_update.yml b/.github/workflows/license_update.yml new file mode 100644 index 00000000..fb201d50 --- /dev/null +++ b/.github/workflows/license_update.yml @@ -0,0 +1,54 @@ +name: Update THIRD_PARTY_LICENSES_RUST_CRATES.html +on: + schedule: + # Run the job every midnight. + - cron: '0 0 * * *' + workflow_dispatch: + +permissions: + contents: read + +jobs: + update_license: + name: Update THIRD_PARTY_LICENSES_RUST_CRATES.html + permissions: + contents: write + pull-requests: write + runs-on: ubuntu-latest + steps: + # Clone the repository and check if THIRD_PARTY_LICENSES_RUST_CRATES.html + # is up-to-date. + - uses: actions/checkout@v3.5.0 + with: + persist-credentials: false + - run: cargo install --locked --version "~0.5" cargo-about + - run: cargo about generate --workspace --output-file THIRD_PARTY_LICENSES_RUST_CRATES.html about.hbs + - id: checkgitdiff # Early exit if there is no diff. + run: | + git diff --exit-code --quiet + [ $? -eq 0 ] && { + echo "THIRD_PARTY_LICENSES_RUST_CRATES.html is up-to-date." + gh run cancel ${{ github.run_id }} + gh run watch ${{ github.run_id }} + } + continue-on-error: true + # Delete existing rust-crates-license-update branch. + - uses: dawidd6/action-delete-branch@v3 + with: + github_token: ${{github.token}} + branches: rust-crates-license-update + # Create a new PR. + - uses: gr2m/create-or-update-pull-request-action@v1.x + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + # https://github.com/actions/checkout/pull/1184 + author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> + branch: rust-crates-license-update + title: 'doc: update THIRD_PARTY_LICENSES_RUST_CRATES.html' + body: > + THIRD_PARTY_LICENSES_RUST_CRATES.html needs an update. This is an automatically generated PR by + a GitHub Action. + commit-message: 'doc: update THIRD_PARTY_LICENSES_RUST_CRATES.html' + + diff --git a/.github/workflows/summary.yml b/.github/workflows/summary.yml index 124660e8..63b932ce 100644 --- a/.github/workflows/summary.yml +++ b/.github/workflows/summary.yml @@ -6,6 +6,7 @@ on: jobs: build: + if: ${{ github.repository == "aws/aws-nitro-enclaves-cli" }} runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -33,4 +34,4 @@ jobs: - name: notify run: | # Send open PRs and issues lists from corresponding environment variables to a dedicated webhook URL - curl -d '{ "repo": "${{ env.REPOSITORY_NAME }}", "prs": "${{ env.PRS_CONTENT }}", "issues": "${{ env.ISSUES_CONTENT }}" }' ${{ secrets.SUMMARY_WEBHOOK_URL }} \ No newline at end of file + curl -d '{ "repo": "${{ env.REPOSITORY_NAME }}", "prs": "${{ env.PRS_CONTENT }}", "issues": "${{ env.ISSUES_CONTENT }}" }' ${{ secrets.SUMMARY_WEBHOOK_URL }} diff --git a/Cargo.lock b/Cargo.lock index 5aba8e6a..f4715890 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -18,12 +18,18 @@ dependencies = [ ] [[package]] -name = "ansi_term" -version = "0.12.1" +name = "android-tzdata" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" dependencies = [ - "winapi", + "libc", ] [[package]] @@ -32,7 +38,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", "winapi", ] @@ -45,9 +51,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "aws-nitro-enclaves-cose" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2fe3e862758ef5bb5d89868141ab28781d96347522b60eb6abeaf7f9acd4bc" +checksum = "5ce1d9954a5cb2841ad8ab206a050cd07ed34200ea6aafb7fa73a33771aaf48c" dependencies = [ "openssl", "serde", @@ -59,9 +65,9 @@ dependencies = [ [[package]] name = "aws-nitro-enclaves-image-format" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae4ad15a7bad78c69c0df3e1fa4e71b2f3958c24c3ed6831316a383da425b782" +checksum = "c24e2101441ce8f8dd0799ce7e36c68571ecf5e3731190b277c63765aaed8c1c" dependencies = [ "aws-nitro-enclaves-cose", "byteorder", @@ -80,30 +86,36 @@ dependencies = [ [[package]] name = "base64" -version = "0.13.0" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "bindgen" -version = "0.59.2" +version = "0.68.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" +checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" dependencies = [ - "bitflags", + "bitflags 2.4.0", "cexpr", "clang-sys", - "clap", - "env_logger 0.9.0", "lazy_static", "lazycell", "log", "peeking_take_while", + "prettyplease", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", + "syn 2.0.37", "which", ] @@ -113,6 +125,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" + [[package]] name = "block-buffer" version = "0.9.0" @@ -128,6 +146,12 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4ae4235e6dac0694637c763029ecea1a2ec9e4e06ec2729bd21ba4d9c863eb7" +[[package]] +name = "bumpalo" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" + [[package]] name = "byteorder" version = "1.4.3" @@ -169,16 +193,17 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.19" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ - "libc", - "num-integer", + "android-tzdata", + "iana-time-zone", + "js-sys", "num-traits", "serde", - "time", - "winapi", + "wasm-bindgen", + "windows-targets 0.48.5", ] [[package]] @@ -194,24 +219,49 @@ dependencies = [ [[package]] name = "clap" -version = "2.34.0" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ - "ansi_term", "atty", - "bitflags", + "bitflags 1.3.2", + "clap_lex", + "indexmap", "strsim", + "termcolor", "textwrap", +] + +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", "unicode-width", - "vec_map", ] +[[package]] +name = "core-foundation-sys" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + [[package]] name = "cpufeatures" -version = "0.2.1" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" dependencies = [ "libc", ] @@ -234,6 +284,50 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "cxx" +version = "1.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e599641dff337570f6aa9c304ecca92341d30bf72e1c50287869ed6a36615a6" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60e2434bc22249c056e12d2e87db46380730da0f2648471edea3e8e11834a892" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn 1.0.109", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3894ad0c6d517cb5a4ce8ec20b37cd0ea31b480fe582a104c5db67ae21270853" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34fa7e395dc1c001083c7eed28c8f0f0b5a225610f3b6284675f444af6fab86b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "digest" version = "0.9.0" @@ -265,7 +359,7 @@ version = "0.1.0" dependencies = [ "aws-nitro-enclaves-image-format", "libc", - "nix", + "nix 0.26.2", "sha2", "tempfile", "vsock", @@ -282,7 +376,7 @@ name = "enclave_build" version = "0.1.0" dependencies = [ "aws-nitro-enclaves-image-format", - "base64", + "base64 0.21.4", "clap", "futures", "log", @@ -298,28 +392,47 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.7.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" dependencies = [ - "atty", - "humantime 1.3.0", + "humantime", + "is-terminal", "log", "regex", "termcolor", ] [[package]] -name = "env_logger" -version = "0.9.0" +name = "errno" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" dependencies = [ - "atty", - "humantime 2.1.0", - "log", - "regex", - "termcolor", + "errno-dragonfly", + "libc", + "winapi", +] + +[[package]] +name = "errno" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.45.0", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", ] [[package]] @@ -339,7 +452,7 @@ checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.2.11", "winapi", ] @@ -357,18 +470,18 @@ dependencies = [ [[package]] name = "flexi_logger" -version = "0.15.12" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaab3caedb4149800f91e8e4899f29cd9ddf3b569b04c365ca9334f92f7542bf" +checksum = "6eae57842a8221ef13f1f207632d786a175dd13bd8fbdc8be9d852f7c9cf1046" dependencies = [ - "atty", "chrono", "glob", + "is-terminal", "lazy_static", "log", + "nu-ansi-term", "regex", "thiserror", - "yansi", ] [[package]] @@ -394,19 +507,18 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" dependencies = [ - "matches", "percent-encoding", ] [[package]] name = "futures" -version = "0.3.21" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -419,9 +531,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.21" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -429,15 +541,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.21" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.21" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -446,38 +558,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.21" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-macro" -version = "0.3.21" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.37", ] [[package]] name = "futures-sink" -version = "0.3.21" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.21" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-util" -version = "0.3.21" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-channel", "futures-core", @@ -515,13 +627,13 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.1.16" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ "cfg-if", "libc", - "wasi 0.9.0+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -551,6 +663,12 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + [[package]] name = "hex" version = "0.4.3" @@ -581,9 +699,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9100414882e15fb7feccb4897e5f0ff0ff1ca7d1a86a23208ada4d7a18e6c6c4" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" @@ -591,15 +709,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" -[[package]] -name = "humantime" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -dependencies = [ - "quick-error", -] - [[package]] name = "humantime" version = "2.1.0" @@ -608,9 +717,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.17" +version = "0.14.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043f0e083e9901b6cc658a77d1eb86f4fc650bbb977a4337dd63192826aa85dd" +checksum = "abfba89e19b959ca163c7752ba59d737c1ceea53a5d31a149c805446fc958064" dependencies = [ "bytes 1.1.0", "futures-channel", @@ -660,13 +769,36 @@ dependencies = [ "tokio", ] +[[package]] +name = "iana-time-zone" +version = "0.1.53" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "winapi", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +dependencies = [ + "cxx", + "cxx-build", +] + [[package]] name = "idna" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" dependencies = [ - "matches", "unicode-bidi", "unicode-normalization", ] @@ -683,11 +815,11 @@ dependencies = [ [[package]] name = "inotify" -version = "0.9.6" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +checksum = "abf888f9575c290197b2c948dc9e9ff10bd1a39ad1ea8585f734585fa6b9d3f9" dependencies = [ - "bitflags", + "bitflags 1.3.2", "futures-core", "inotify-sys", "libc", @@ -712,12 +844,43 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "io-lifetimes" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfa919a82ea574332e2de6e74b4c36e74d41982b335080fa59d4ef31be20fdf3" +dependencies = [ + "libc", + "windows-sys 0.45.0", +] + +[[package]] +name = "is-terminal" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8687c819457e979cc940d09cb16e42a1bf70aa6b60a549de6d3a62a0ee90c69e" +dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes", + "rustix 0.36.9", + "windows-sys 0.45.0", +] + [[package]] name = "itoa" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" +[[package]] +name = "js-sys" +version = "0.3.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3fac17f7123a73ca62df411b1bf727ccc805daa070338fda671c86dac1bdc27" +dependencies = [ + "wasm-bindgen", +] + [[package]] name = "lazy_static" version = "1.4.0" @@ -732,9 +895,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.120" +version = "0.2.142" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad5c14e80759d0939d013e6ca49930e59fc53dd8e5009132f76240c179380c09" +checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" [[package]] name = "libloading" @@ -746,6 +909,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "link-cplusplus" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" +dependencies = [ + "cc", +] + [[package]] name = "linked-hash-map" version = "0.5.4" @@ -761,6 +933,18 @@ dependencies = [ "linked-hash-map", ] +[[package]] +name = "linux-raw-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + +[[package]] +name = "linux-raw-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" + [[package]] name = "lock_api" version = "0.4.6" @@ -772,19 +956,13 @@ dependencies = [ [[package]] name = "log" -version = "0.4.14" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ "cfg-if", ] -[[package]] -name = "matches" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" - [[package]] name = "memchr" version = "2.4.1" @@ -800,6 +978,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + [[package]] name = "mime" version = "0.3.16" @@ -824,30 +1011,19 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.2" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" dependencies = [ "libc", "log", - "miow", - "ntapi", - "wasi 0.11.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi", + "wasi", + "windows-sys 0.45.0", ] [[package]] name = "nitro-cli" -version = "1.2.0" +version = "1.2.2" dependencies = [ "aws-nitro-enclaves-image-format", "bindgen", @@ -862,7 +1038,7 @@ dependencies = [ "lazy_static", "libc", "log", - "nix", + "nix 0.26.2", "num-derive", "num-traits", "openssl", @@ -879,15 +1055,28 @@ dependencies = [ [[package]] name = "nix" -version = "0.23.1" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ - "bitflags", - "cc", + "bitflags 1.3.2", "cfg-if", "libc", - "memoffset", + "memoffset 0.6.5", +] + +[[package]] +name = "nix" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.7.1", + "pin-utils", + "static_assertions", ] [[package]] @@ -901,11 +1090,12 @@ dependencies = [ ] [[package]] -name = "ntapi" -version = "0.3.7" +name = "nu-ansi-term" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" dependencies = [ + "overload", "winapi", ] @@ -917,24 +1107,14 @@ checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ "proc-macro2", "quote", - "syn", -] - -[[package]] -name = "num-integer" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" -dependencies = [ - "autocfg", - "num-traits", + "syn 1.0.109", ] [[package]] name = "num-traits" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", ] @@ -945,7 +1125,7 @@ version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", ] @@ -963,36 +1143,59 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.38" +version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95" +checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags", + "bitflags 2.4.0", "cfg-if", "foreign-types", "libc", "once_cell", + "openssl-macros", "openssl-sys", ] +[[package]] +name = "openssl-macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "openssl-sys" -version = "0.9.72" +version = "0.9.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb" +checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" dependencies = [ - "autocfg", "cc", "libc", "pkg-config", "vcpkg", ] +[[package]] +name = "os_str_bytes" +version = "6.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + [[package]] name = "page_size" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eebde548fbbf1ea81a99b128872779c437752fb99f217c45245e1a61dcd9edcd" +checksum = "1b7663cbd190cfd818d08efa8497f6cd383076688c49a391ef7c0d03cd12b561" dependencies = [ "libc", "winapi", @@ -1016,9 +1219,9 @@ checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.2.11", "smallvec", - "windows-sys", + "windows-sys 0.32.0", ] [[package]] @@ -1029,9 +1232,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "percent-encoding" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pin-project" @@ -1059,7 +1262,7 @@ checksum = "044964427019eed9d49d9d5bbce6047ef18f37100ea400912a9fa4a3523ab12a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1070,7 +1273,7 @@ checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1098,47 +1301,49 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" [[package]] -name = "proc-macro2" -version = "1.0.36" +name = "prettyplease" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" +checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ - "unicode-xid", + "proc-macro2", + "syn 2.0.37", ] [[package]] -name = "quick-error" -version = "1.2.3" +name = "proc-macro2" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" +checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +dependencies = [ + "unicode-ident", +] [[package]] name = "quote" -version = "1.0.16" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4af2ec4714533fcdf07e886f17025ace8b997b9ce51204ee69b6da831c3da57" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] [[package]] name = "rand" -version = "0.7.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ - "getrandom", "libc", "rand_chacha", "rand_core", - "rand_hc", ] [[package]] name = "rand_chacha" -version = "0.2.2" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", "rand_core", @@ -1146,29 +1351,29 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.5.1" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ "getrandom", ] [[package]] -name = "rand_hc" -version = "0.2.0" +name = "redox_syscall" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +checksum = "8380fe0152551244f0747b1bf41737e0f8a74f97a14ccefd1148187271634f3c" dependencies = [ - "rand_core", + "bitflags 1.3.2", ] [[package]] name = "redox_syscall" -version = "0.2.11" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8380fe0152551244f0747b1bf41737e0f8a74f97a14ccefd1148187271634f3c" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -1189,19 +1394,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" [[package]] -name = "remove_dir_all" -version = "0.5.3" +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustix" +version = "0.36.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" dependencies = [ - "winapi", + "bitflags 1.3.2", + "errno 0.2.8", + "io-lifetimes", + "libc", + "linux-raw-sys 0.1.4", + "windows-sys 0.45.0", ] [[package]] -name = "rustc-hash" -version = "1.1.0" +name = "rustix" +version = "0.37.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +checksum = "d097081ed288dfe45699b72f5b5d648e5f15d64d900c7080273baa20c16a6849" +dependencies = [ + "bitflags 1.3.2", + "errno 0.3.0", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.1", + "windows-sys 0.45.0", +] [[package]] name = "rustversion" @@ -1221,11 +1445,17 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +[[package]] +name = "scratch" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" + [[package]] name = "serde" -version = "1.0.136" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] @@ -1251,20 +1481,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.136" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.37", ] [[package]] name = "serde_json" -version = "1.0.79" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" dependencies = [ "itoa", "ryu", @@ -1279,7 +1509,7 @@ checksum = "98d0516900518c29efa217c298fa1f4e6c6ffc85ae29fd7f4ee48f176e1a9ed5" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1294,9 +1524,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.8.23" +version = "0.8.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a521f2940385c165a24ee286aa8599633d162077a54bdcae2a6fd5a7bfa7a0" +checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" dependencies = [ "indexmap", "ryu", @@ -1323,7 +1553,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e468265908f45299c26571dad9a2e5cb3656eceb51cd58f1441cf61aa71aad6" dependencies = [ - "base64", + "base64 0.13.1", "byteorder", "bytes 1.1.0", "chrono", @@ -1352,9 +1582,9 @@ checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" [[package]] name = "signal-hook" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "647c97df271007dcea485bb74ffdb57f2e683f1306c854f468a0c244badabf2d" +checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" dependencies = [ "libc", "signal-hook-registry", @@ -1383,29 +1613,46 @@ checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" [[package]] name = "socket2" -version = "0.4.4" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi", ] +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + [[package]] name = "strsim" -version = "0.8.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] [[package]] name = "syn" -version = "1.0.89" +version = "2.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea297be220d52398dcc07ce15a209fce436d361735ac1db700cab3b6cdfb9f54" +checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" dependencies = [ "proc-macro2", "quote", - "unicode-xid", + "unicode-ident", ] [[package]] @@ -1421,16 +1668,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.3.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" dependencies = [ "cfg-if", "fastrand", - "libc", - "redox_syscall", - "remove_dir_all", - "winapi", + "redox_syscall 0.3.5", + "rustix 0.37.6", + "windows-sys 0.45.0", ] [[package]] @@ -1444,12 +1690,9 @@ dependencies = [ [[package]] name = "textwrap" -version = "0.11.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" @@ -1468,7 +1711,7 @@ checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1480,17 +1723,6 @@ dependencies = [ "num_cpus", ] -[[package]] -name = "time" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - [[package]] name = "tinyvec" version = "1.5.1" @@ -1508,16 +1740,17 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.17.0" +version = "1.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee" +checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" dependencies = [ + "autocfg", "libc", "mio", "num_cpus", "pin-project-lite", "socket2", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -1582,6 +1815,12 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" +[[package]] +name = "unicode-ident" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" + [[package]] name = "unicode-normalization" version = "0.1.19" @@ -1597,21 +1836,14 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" -[[package]] -name = "unicode-xid" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" - [[package]] name = "url" -version = "2.2.2" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" dependencies = [ "form_urlencoded", "idna", - "matches", "percent-encoding", ] @@ -1621,12 +1853,6 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - [[package]] name = "version_check" version = "0.9.4" @@ -1635,22 +1861,22 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "vmm-sys-util" -version = "0.8.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cf11afbc4ebc0d5c7a7748a77d19e2042677fc15faa2f4ccccb27c18a60605" +checksum = "dd64fe09d8e880e600c324e7d664760a17f56e9672b7495a86381b49e4f72f46" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", ] [[package]] name = "vsock" -version = "0.2.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e32675ee2b3ce5df274c0ab52d19b28789632406277ca26bffee79a8e27dc133" +checksum = "4c8e1df0bf1e1b28095c24564d1b90acae64ca69b097ed73896e342fa6649c57" dependencies = [ "libc", - "nix", + "nix 0.24.3", ] [[package]] @@ -1659,10 +1885,10 @@ version = "0.1.0" dependencies = [ "clap", "dns-lookup", - "env_logger 0.7.1", + "env_logger", "idna", "log", - "nix", + "nix 0.26.2", "rand", "tempfile", "threadpool", @@ -1682,21 +1908,63 @@ dependencies = [ [[package]] name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" +version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" +name = "wasm-bindgen" +version = "0.2.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" +checksum = "7c53b543413a17a202f4be280a7e5c62a1c69345f5de525ee64f8cfdbc954994" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] [[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +name = "wasm-bindgen-backend" +version = "0.2.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "5491a68ab4500fa6b4d726bd67408630c3dbe9c4fe7bda16d5c82a1fd8c7340a" +dependencies = [ + "bumpalo", + "lazy_static", + "log", + "proc-macro2", + "quote", + "syn 1.0.109", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c441e177922bc58f1e12c022624b6216378e5febc2f0533e41ba443d505b80aa" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d94ac45fcf608c1f45ef53e748d35660f168490c10b23704c7779ab8f5c3048" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a89911bd99e5f3659ec4acf9c4d93b0a90fe4a2a11f15328472058edc5261be" [[package]] name = "which" @@ -1746,43 +2014,175 @@ version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3df6e476185f92a12c072be4a189a0210dcdcf512a1891d6dff9edb874deadc6" dependencies = [ - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_msvc", + "windows_aarch64_msvc 0.32.0", + "windows_i686_gnu 0.32.0", + "windows_i686_msvc 0.32.0", + "windows_x86_64_gnu 0.32.0", + "windows_x86_64_msvc 0.32.0", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.1", ] +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +dependencies = [ + "windows_aarch64_gnullvm 0.42.1", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", + "windows_x86_64_gnullvm 0.42.1", + "windows_x86_64_msvc 0.42.1", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + [[package]] name = "windows_aarch64_msvc" version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + [[package]] name = "windows_i686_gnu" version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" +[[package]] +name = "windows_i686_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + [[package]] name = "windows_i686_msvc" version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" +[[package]] +name = "windows_i686_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + [[package]] name = "windows_x86_64_gnu" version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + [[package]] name = "windows_x86_64_msvc" version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + [[package]] name = "xattr" version = "0.2.2" @@ -1800,9 +2200,3 @@ checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" dependencies = [ "linked-hash-map", ] - -[[package]] -name = "yansi" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc79f4a1e39857fc00c3f662cbf2651c771f00e9c15fe2abc341806bd46bd71" diff --git a/Cargo.toml b/Cargo.toml index fbefeff4..66988c11 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,30 +1,31 @@ [package] name = "nitro-cli" -version = "1.2.0" +version = "1.2.2" authors = ["The AWS Nitro Enclaves Team "] edition = "2018" license = "Apache-2.0" +rust-version = "1.60" [dependencies] serde = { version = ">=1.0", features = ["derive"] } chrono = "0.4" -clap = "2.33" -inotify = "0.9" +clap = "3.2" +inotify = "0.10" serde_json = "1.0" -nix = "0.23" +nix = "0.26" log = "0.4" libc = { version = ">=0.2.69" } -flexi_logger = "0.15" -page_size = "0.4" +flexi_logger = "0.25" +page_size = "0.5" signal-hook = "0.3" serde_cbor = "0.11" driver-bindings = { path = "./driver-bindings" } -aws-nitro-enclaves-image-format = "0.1" +aws-nitro-enclaves-image-format = "0.2" eif_loader = { path = "./eif_loader" } enclave_build = { path = "./enclave_build" } openssl = "0.10" -vsock = "0.2" -vmm-sys-util = "0.8.0" +vsock = "0.3" +vmm-sys-util = "0.11.1" sha2 = "0.9.5" hex = "0.4" @@ -37,7 +38,7 @@ bindgen = { version=">=0.54" } log = "0.4" num-derive = "0.3" num-traits = "0.2" -tempfile = "3.1" +tempfile = "3.5" [workspace] members = [".", "driver-bindings", "eif_loader", "enclave_build", "vsock_proxy"] diff --git a/Makefile b/Makefile index 6fc88dc1..a65c37ec 100644 --- a/Makefile +++ b/Makefile @@ -105,16 +105,8 @@ driver-deps: echo "Warning: kernel-header were not installed") \ && echo "Successfully installed the driver deps" -# In order to avoid executing the same rule everytime, -# the build rules are prefixed by dot and are generating -# a file with the same name via the touch command. This -# change is required in order to capture the timestamp -# of the rule. -.build-container: tools/Dockerfile1804.${HOST_MACHINE} - docker image build -t $(CONTAINER_TAG) -f tools/Dockerfile1804.${HOST_MACHINE} tools/ - touch $@ - -build-container: .build-container +build-container: + @docker image build --pull -t $(CONTAINER_TAG) -f tools/Dockerfile tools/ $(OBJ_PATH): $(MKDIR) -p $(OBJ_PATH) diff --git a/README.md b/README.md index d97670e1..ced005fb 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,7 @@ +![msrv] + +[msrv]: https://img.shields.io/badge/MSRV-1.60.0-blue + ## Nitro Enclaves Command Line Interface (Nitro CLI) This repository contains a collection of tools and commands used for managing the lifecycle of enclaves. The Nitro CLI needs to be installed on the parent instance, and it can be used to start, manage, and terminate enclaves. diff --git a/SPECS/aws-nitro-enclaves-cli.spec b/SPECS/aws-nitro-enclaves-cli.spec index 64d541c1..32edfb8a 100644 --- a/SPECS/aws-nitro-enclaves-cli.spec +++ b/SPECS/aws-nitro-enclaves-cli.spec @@ -1,4 +1,4 @@ -# Copyright 2020-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# Copyright 2020-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. # SPDX-License-Identifier: Apache-2.0 %define ne_name nitro_enclaves @@ -17,7 +17,7 @@ Summary: AWS Nitro Enclaves tools for managing enclaves Name: aws-nitro-enclaves-cli -Version: 1.2.0 +Version: 1.2.2 Release: 0%{?dist} License: Apache 2.0 @@ -28,8 +28,8 @@ Source0: aws-nitro-enclaves-cli.tar.gz Source1: nitro-cli-dependencies.tar.gz BuildRequires: openssl-devel -BuildRequires: rust >= 1.47 -BuildRequires: cargo >= 1.47 +BuildRequires: rust >= 1.60 +BuildRequires: cargo >= 1.60 BuildRequires: make BuildRequires: llvm BuildRequires: clang @@ -192,6 +192,63 @@ fi %{ne_include_dir}/* %changelog +* Tue Mar 07 2023 Petre Eftime - 1.2.2-0 +- update third party crates license file +- update clap +- update bindgen +- update cpufeatures +- update chrono +- update tempfile +- update hyper +- Fix fmt issues +- Fix clippy issues after tokio update. +- build(deps): bump tokio from 1.18.4 to 1.18.5 +- ci: reserve 2 cpus, not specific cpus +- ci: mark logs as plaintext +- CI: prevent tests from getting stuck +- CI: use get-login-password instead of get-login +- build(deps): bump tokio from 1.17.0 to 1.18.4 +- clippy: fix minor issue +- cli/enclave_proc: handle EINTR for epoll_wait() +- use ubuntu from the public ECR gallery +- Update THIRD_PARTY_LICENSES_RUST_CRATES.html +- nitro-enclaves-allocator: Set local language to English +- do not re-run Actions checks during tests +- add license checks +- add audit step +- ci: add workflows build, clippy and format workflows +- fix clippy::explicit_auto_deref +- fix clippy::partialeq_to_none +- regenerate driver-bindings with Default +- enclave_build: Fix clippy warning (clippy::needless_borrow) +- vsock-proxy: Add "ap-southeast-3" endpoints to config + +* Tue Oct 25 2022 Andra Paraschiv - 1.2.1-0 +- Fix nitro-cli debug mode, when using attach_console and debug_mode options. +- Refactor Dockerfiles for faster builds and remove duplication. +- Mock input in nitro-cli unit tests to allow running them on systems without + Nitro Enclaves support or having various CPU configurations. +- Refactor console disconnect timeout feature. +- Fix race condition in nitro-cli on command dispatch. +- Allow NITRO_CLI_INSTALL_DIR to be overriden in nitro-cli-env.sh. +- Use aws-nitro-enclaves-image-format crate. +- Allow NITRO_CLI_INSTALL_DIR be set for path to allocator.yaml. +- Use DOCKER_HOST env variable properly when interacting with the shiplift + library. +- Update linuxkit blobs to v0.8+. +- Create driver-bindings crate with static bindings for the Nitro Enclaves + kernel driver. +- Remove custom metadata structure restriction for EIF images. +- Add symlinks for the blobs used by the command executer sample. +- Fix clippy warnings. +- Bump Rust version to 1.58.1. +- Bump socket2 from 0.3.11 to 0.3.19 in vsock_proxy. +- Bump smallvec from 0.6.13 to 0.6.14 in vsock_proxy. +- Update clap crate to 3.2. +- Update nitro-cli crates dependencies to the latest version. +- Fix broken nitro-cli enclave proc doctest. +- Fix typos in the nitro-cli documentation. + * Tue Feb 22 2022 Eugene Koira - 1.2.0-0 - Add support of building EIF with custom name, version and metadata. - Add support of checking EIF metadata within describe-eif and describe-enclave commands. diff --git a/THIRD_PARTY_LICENSES_RUST_CRATES.html b/THIRD_PARTY_LICENSES_RUST_CRATES.html index 6d5d58ff..dd081df2 100644 --- a/THIRD_PARTY_LICENSES_RUST_CRATES.html +++ b/THIRD_PARTY_LICENSES_RUST_CRATES.html @@ -44,8 +44,8 @@

Third Party Licenses

Overview of licenses:

@@ -56,8 +56,8 @@

All license text:

Apache License 2.0

Used by:

                                  Apache License
@@ -639,7 +639,7 @@ 
Used by:

                 
Apache License 2.0

                 
Used by:

                 
                 
                                  Apache License
@@ -1049,6 +1049,9 @@ 
Used by:

                 
Apache License 2.0

                 
Used by:

                 
    
+                    
  • clap 3.2.23
    • 
+                    
  • clap_lex 0.2.4
    • 
+                    
  • os_str_bytes 6.3.0
    • 
                     
  • ryu 1.0.9
    • 
                     
  • vmm-sys-util 0.8.0
    • 
                     
  • vmm-sys-util 0.8.0
    • 
@@ -1893,7 +1896,7 @@ 
    Used by:
    
                 
    Apache License 2.0
    
                 
    Used by:
    
                 
                 
                                  Apache License
                         Version 2.0, January 2004
@@ -3113,6 +3116,215 @@ 
    Used by:
    
 
 Copyright 2018 The pin-utils authors
 
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
    
+            
+            
  • 
+                
    Apache License 2.0
    
+                
    Used by:
    
+                
+                
                                  Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright 2020 Andrew Straw
+
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
@@ -3354,13 +3566,15 @@ 
    Used by:
    
                     
  • form_urlencoded 1.0.1
    • 
                     
  • glob 0.3.0
    • 
                     
  • hashbrown 0.11.2
    • 
-                    
  • httparse 1.6.0
    • 
+                    
  • httparse 1.8.0
    • 
                     
  • hyper-openssl 0.9.2
    • 
                     
  • idna 0.2.3
    • 
                     
  • indexmap 1.8.0
    • 
+                    
  • io-lifetimes 1.0.6
    • 
                     
  • itoa 1.0.1
    • 
                     
  • lazy_static 1.4.0
    • 
                     
  • lazycell 1.3.0
    • 
+                    
  • linux-raw-sys 0.1.4
    • 
                     
  • lock_api 0.4.6
    • 
                     
  • mime 0.3.16
    • 
                     
  • num-derive 0.3.3
    • 
@@ -3378,6 +3592,7 @@ 
    Used by:
    
                     
  • regex 1.5.5
    • 
                     
  • regex-syntax 0.6.25
    • 
                     
  • rustc-hash 1.1.0
    • 
+                    
  • rustix 0.36.9
    • 
                     
  • rustversion 1.0.6
    • 
                     
  • scopeguard 1.1.0
    • 
                     
  • serde 1.0.136
    • 
@@ -3394,13 +3609,12 @@ 
    Used by:
    
                     
  • socket2 0.4.4
    • 
                     
  • syn 1.0.89
    • 
                     
  • tar 0.4.38
    • 
-                    
  • tempfile 3.3.0
    • 
+                    
  • tempfile 3.4.0
    • 
                     
  • thiserror 1.0.30
    • 
                     
  • thiserror-impl 1.0.30
    • 
                     
  • time 0.1.44
    • 
                     
  • unicode-bidi 0.3.7
    • 
                     
  • unicode-normalization 0.1.19
    • 
-                    
  • unicode-width 0.1.9
    • 
                     
  • unicode-xid 0.2.2
    • 
                     
  • url 2.2.2
    • 
                     
  • version_check 0.9.4
    • 
@@ -3617,7 +3831,6 @@ 
    Used by:
    
                 
                 
                                  Apache License
                         Version 2.0, January 2004
@@ -3827,7 +4040,7 @@ 
    Apache License 2.0
    
                 
    Used by:
    
                 
      
                     
    • block-buffer 0.9.0
      • 
-                    
    • cpufeatures 0.2.1
      • 
+                    
    • cpufeatures 0.2.5
      • 
                     
    • digest 0.9.0
      • 
                     
    • opaque-debug 0.3.0
      • 
                     
    • sha2 0.9.9
      • 
@@ -4457,206 +4670,7 @@ 
      Used by:
      
                 
      Apache License 2.0
      
                 
      Used by:
      
                 
-                
                                    Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-Copyright 2017 Aaron Power
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-
      
-            
-            
    • 
-                
      Apache License 2.0
      
-                
      Used by:
      
-                
                 
      Apache License
 Version 2.0, January 2004
@@ -4865,7 +4879,6 @@ 
      Used by:
      
                 
      Apache License 2.0
      
                 
      Used by:
      
                 
@@ -4993,7 +5006,6 @@ 
      Apache License 2.0
      
                 
      Used by:
      
                 
                 
      Licensed under the Apache License, Version 2.0
@@ -5003,6 +5015,262 @@ 
      Used by:
      
 at your option. All files in the project carrying such
 notice may not be copied, modified, or distributed except
 according to those terms.
+
      
+            
      • 
+            
    • 
+                
      Apache License 2.0
      
+                
      Used by:
      
+                
+                
      MIT OR Apache-2.0
      
+            
      • 
+            
    • 
+                
      Apache License 2.0
      
+                
      Used by:
      
+                
+                
      Rust-chrono is dual-licensed under The MIT License [1] and
+Apache 2.0 License [2]. Copyright (c) 2014--2017, Kang Seonghoon and
+contributors.
+
+Nota Bene: This is same as the Rust Project's own license.
+
+
+[1]: <http://opensource.org/licenses/MIT>, which is reproduced below:
+
+~~~~
+The MIT License (MIT)
+
+Copyright (c) 2014, Kang Seonghoon.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+~~~~
+
+
+[2]: <http://www.apache.org/licenses/LICENSE-2.0>, which is reproduced below:
+
+~~~~
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+~~~~
+
 
      
             
      • 
             
    • 
@@ -5044,7 +5312,7 @@ 
      Used by:
      
                 
      BSD 3-Clause "New" or "Revised" License
      
                 
      Used by:
      
                 
                 
      BSD 3-Clause License
 
@@ -5263,7 +5531,7 @@ 
      Used by:
      
                 
      MIT License
      
                 
      Used by:
      
                 
                 
      Copyright (c) 2014-2021 Sean McArthur
 
@@ -5650,7 +5918,7 @@ 
      Used by:
      
                 
      MIT License
      
                 
      Used by:
      
                 
                 
      Copyright (c) 2022 Tokio Contributors
 
@@ -5683,7 +5951,7 @@ 
      Used by:
      
                 
      MIT License
      
                 
      Used by:
      
                 
                 
      MIT License
 
@@ -5728,35 +5996,6 @@ 
      Used by:
      
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
      
-            
      • 
-            
    • 
-                
      MIT License
      
-                
      Used by:
      
-                
-                
      The MIT License (MIT)
-
-Copyright (c) 2014 Benjamin Sago
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -5831,42 +6070,13 @@ 
      Used by:
      
                 
      MIT License
      
                 
      Used by:
      
                 
                 
      The MIT License (MIT)
 
 Copyright (c) 2015 Danny Guo
 Copyright (c) 2016 Titus Wormer <tituswormer@gmail.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
      
-            
      • 
-            
    • 
-                
      MIT License
      
-                
      Used by:
      
-                
-                
      The MIT License (MIT)
-
-Copyright (c) 2015-2016 Kevin B. Knapp
+Copyright (c) 2018 Akash Kurdekar
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/about.toml b/about.toml
index 79ebf471..512c2cd6 100644
--- a/about.toml
+++ b/about.toml
@@ -4,6 +4,7 @@ accepted = [
     "Zlib",
     "BSD-3-Clause",
     "ISC",
+    "Unicode-DFS-2016",
 ]
 
 targets = [
diff --git a/bootstrap/allocator.yaml b/bootstrap/allocator.yaml
index f31b8126..a29be92c 100644
--- a/bootstrap/allocator.yaml
+++ b/bootstrap/allocator.yaml
@@ -7,7 +7,7 @@ memory_mib: 512
 # How many CPUs to reserve for enclaves.
 cpu_count: 2
 #
-# Alternatively, the exact CPUs to be reserved for the enclave can be explicitely
+# Alternatively, the exact CPUs to be reserved for the enclave can be explicitly
 # configured by using `cpu_pool` (like below), instead of `cpu_count`.
 # Note: cpu_count and cpu_pool conflict with each other. Only use exactly one of them.
 # Example of reserving CPUs 2, 3, and 6 through 9:
diff --git a/bootstrap/nitro-enclaves-allocator b/bootstrap/nitro-enclaves-allocator
index f6ff4966..2140ae22 100755
--- a/bootstrap/nitro-enclaves-allocator
+++ b/bootstrap/nitro-enclaves-allocator
@@ -5,6 +5,11 @@
 # Its purpose is to reserve the requested memory and CPUs (specified in
 # /etc/nitro_enclaves/allocator.yaml).
 
+# Set language to English. This way the parsing logic from the current script
+# works properly when a different language is set in the locale configuration
+# (e.g. /etc/locale.conf).
+LANG=en_US.UTF-8
+
 # The file which holds the CPU pool.
 CPU_POOL_FILE="/sys/module/nitro_enclaves/parameters/ne_cpus"
 
diff --git a/ci_entrypoint.sh b/ci_entrypoint.sh
index a49030ce..241b9cae 100755
--- a/ci_entrypoint.sh
+++ b/ci_entrypoint.sh
@@ -51,7 +51,7 @@ set +e
 TEST_RESULTS=$?
 set -e
 
-aws s3 cp test_logs.out s3://aws-nitro-enclaves-cli/${LOGS_PATH}
+aws s3 cp --content-type 'text/plain' test_logs.out s3://aws-nitro-enclaves-cli/${LOGS_PATH}
 
 STATE="success"
 if [[ "${TEST_RESULTS}" != "0" ]];then
diff --git a/docs/centos_stream_8_how_to_install_nitro_cli_from_github_sources.md b/docs/centos_stream_8_how_to_install_nitro_cli_from_github_sources.md
index a3f3a292..acb83ade 100644
--- a/docs/centos_stream_8_how_to_install_nitro_cli_from_github_sources.md
+++ b/docs/centos_stream_8_how_to_install_nitro_cli_from_github_sources.md
@@ -181,7 +181,7 @@ memory_mib: 512
 # How many CPUs to reserve for enclaves.
 cpu_count: 2
 #
-# Alternatively, the exact CPUs to be reserved for the enclave can be explicitely
+# Alternatively, the exact CPUs to be reserved for the enclave can be explicitly
 # configured by using `cpu_pool` (like below), instead of `cpu_count`.
 # Note: cpu_count and cpu_pool conflict with each other. Only use exactly one of them.
 # Example of reserving CPUs 2, 3, and 6 through 9:
diff --git a/docs/fedora_34_how_to_install_nitro_cli_from_github_sources.md b/docs/fedora_34_how_to_install_nitro_cli_from_github_sources.md
index 8395078b..2d6bd26f 100644
--- a/docs/fedora_34_how_to_install_nitro_cli_from_github_sources.md
+++ b/docs/fedora_34_how_to_install_nitro_cli_from_github_sources.md
@@ -189,7 +189,7 @@ memory_mib: 512
 # How many CPUs to reserve for enclaves.
 cpu_count: 2
 #
-# Alternatively, the exact CPUs to be reserved for the enclave can be explicitely
+# Alternatively, the exact CPUs to be reserved for the enclave can be explicitly
 # configured by using `cpu_pool` (like below), instead of `cpu_count`.
 # Note: cpu_count and cpu_pool conflict with each other. Only use exactly one of them.
 # Example of reserving CPUs 2, 3, and 6 through 9:
diff --git a/docs/rhel_8.4_how_to_install_nitro_cli_from_github_sources.md b/docs/rhel_8.4_how_to_install_nitro_cli_from_github_sources.md
index 4af9c6f6..ce42e3aa 100644
--- a/docs/rhel_8.4_how_to_install_nitro_cli_from_github_sources.md
+++ b/docs/rhel_8.4_how_to_install_nitro_cli_from_github_sources.md
@@ -185,7 +185,7 @@ memory_mib: 512
 # How many CPUs to reserve for enclaves.
 cpu_count: 2
 #
-# Alternatively, the exact CPUs to be reserved for the enclave can be explicitely
+# Alternatively, the exact CPUs to be reserved for the enclave can be explicitly
 # configured by using `cpu_pool` (like below), instead of `cpu_count`.
 # Note: cpu_count and cpu_pool conflict with each other. Only use exactly one of them.
 # Example of reserving CPUs 2, 3, and 6 through 9:
diff --git a/docs/ubuntu_20.04_how_to_install_nitro_cli_from_github_sources.md b/docs/ubuntu_20.04_how_to_install_nitro_cli_from_github_sources.md
index f3011d2d..d8878ce6 100644
--- a/docs/ubuntu_20.04_how_to_install_nitro_cli_from_github_sources.md
+++ b/docs/ubuntu_20.04_how_to_install_nitro_cli_from_github_sources.md
@@ -188,7 +188,7 @@ memory_mib: 512
 # How many CPUs to reserve for enclaves.
 cpu_count: 2
 #
-# Alternatively, the exact CPUs to be reserved for the enclave can be explicitely
+# Alternatively, the exact CPUs to be reserved for the enclave can be explicitly
 # configured by using `cpu_pool` (like below), instead of `cpu_count`.
 # Note: cpu_count and cpu_pool conflict with each other. Only use exactly one of them.
 # Example of reserving CPUs 2, 3, and 6 through 9:
diff --git a/driver-bindings/Cargo.toml b/driver-bindings/Cargo.toml
index ed6d370d..76d301cd 100644
--- a/driver-bindings/Cargo.toml
+++ b/driver-bindings/Cargo.toml
@@ -4,3 +4,4 @@ version = "0.1.0"
 authors = ["The AWS Nitro Enclaves Team "]
 edition = "2018"
 description = "Rust FFI bindings to Linux Nitro Enclaves driver generated using bindgen."
+rust-version = "1.60"
diff --git a/driver-bindings/README.md b/driver-bindings/README.md
index ba33244a..2d9bc384 100644
--- a/driver-bindings/README.md
+++ b/driver-bindings/README.md
@@ -37,7 +37,7 @@ Supported Linux versions:
 Generate bindings for a new Linux version:
 
 ```
-bindgen --allowlist-type "ne_.*" --allowlist-var "NE_ERR_.*" -o bindings.rs \
+bindgen --with-derive-default --allowlist-type "ne_.*" --allowlist-var "NE_ERR_.*" -o bindings.rs \
 		/usr/src/kernels/$(uname -r)/include/uapi/linux/nitro_enclaves.h -- \
 		-fretain-comments-from-system-headers -fparse-all-comments
 ```
diff --git a/driver-bindings/src/bindings.rs b/driver-bindings/src/bindings.rs
index 52580b85..8eb81dab 100644
--- a/driver-bindings/src/bindings.rs
+++ b/driver-bindings/src/bindings.rs
@@ -1,4 +1,4 @@
-/* automatically generated by rust-bindgen 0.59.2 */
+/* automatically generated by rust-bindgen 0.62.0 */
 
 pub const NE_ERR_VCPU_ALREADY_USED: u32 = 256;
 pub const NE_ERR_VCPU_NOT_IN_CPU_POOL: u32 = 257;
@@ -28,13 +28,15 @@ pub type __u64 = ::std::os::raw::c_ulonglong;
 #[doc = " @memory_offset:\tOffset in enclave memory where to start placing the"]
 #[doc = "\t\t\tenclave image (out)."]
 #[repr(C)]
-#[derive(Debug, Copy, Clone)]
+#[derive(Debug, Default, Copy, Clone)]
 pub struct ne_image_load_info {
     pub flags: __u64,
     pub memory_offset: __u64,
 }
 #[test]
 fn bindgen_test_layout_ne_image_load_info() {
+    const UNINIT: ::std::mem::MaybeUninit = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::(),
         16usize,
@@ -46,7 +48,7 @@ fn bindgen_test_layout_ne_image_load_info() {
         concat!("Alignment of ", stringify!(ne_image_load_info))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::())).flags as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -56,9 +58,7 @@ fn bindgen_test_layout_ne_image_load_info() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::())).memory_offset as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).memory_offset) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -75,7 +75,7 @@ fn bindgen_test_layout_ne_image_load_info() {
 #[doc = " @userspace_addr:\tThe start address of the userspace allocated memory of"]
 #[doc = "\t\t\tthe memory region to set for an enclave (in)."]
 #[repr(C)]
-#[derive(Debug, Copy, Clone)]
+#[derive(Debug, Default, Copy, Clone)]
 pub struct ne_user_memory_region {
     pub flags: __u64,
     pub memory_size: __u64,
@@ -83,6 +83,9 @@ pub struct ne_user_memory_region {
 }
 #[test]
 fn bindgen_test_layout_ne_user_memory_region() {
+    const UNINIT: ::std::mem::MaybeUninit =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::(),
         24usize,
@@ -94,7 +97,7 @@ fn bindgen_test_layout_ne_user_memory_region() {
         concat!("Alignment of ", stringify!(ne_user_memory_region))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::())).flags as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -104,9 +107,7 @@ fn bindgen_test_layout_ne_user_memory_region() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::())).memory_size as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).memory_size) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -116,9 +117,7 @@ fn bindgen_test_layout_ne_user_memory_region() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::())).userspace_addr as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).userspace_addr) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -134,13 +133,16 @@ fn bindgen_test_layout_ne_user_memory_region() {
 #[doc = "\t\t\tinput, the CID is autogenerated by the hypervisor and"]
 #[doc = "\t\t\treturned back as output by the driver (in / out)."]
 #[repr(C)]
-#[derive(Debug, Copy, Clone)]
+#[derive(Debug, Default, Copy, Clone)]
 pub struct ne_enclave_start_info {
     pub flags: __u64,
     pub enclave_cid: __u64,
 }
 #[test]
 fn bindgen_test_layout_ne_enclave_start_info() {
+    const UNINIT: ::std::mem::MaybeUninit =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::(),
         16usize,
@@ -152,7 +154,7 @@ fn bindgen_test_layout_ne_enclave_start_info() {
         concat!("Alignment of ", stringify!(ne_enclave_start_info))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::())).flags as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -162,9 +164,7 @@ fn bindgen_test_layout_ne_enclave_start_info() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::())).enclave_cid as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).enclave_cid) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
diff --git a/driver-bindings/src/lib.rs b/driver-bindings/src/lib.rs
index ead0d408..e7f0f903 100644
--- a/driver-bindings/src/lib.rs
+++ b/driver-bindings/src/lib.rs
@@ -7,9 +7,5 @@
 #![allow(missing_docs)]
 #![allow(non_camel_case_types)]
 
-// Keep this until https://github.com/rust-lang/rust-bindgen/issues/1651 is fixed.
-#[cfg_attr(test, allow(deref_nullptr))]
 mod bindings;
 pub use self::bindings::*;
-mod wrappers;
-pub use self::wrappers::*;
diff --git a/driver-bindings/src/wrappers.rs b/driver-bindings/src/wrappers.rs
deleted file mode 100644
index 37bbf9c1..00000000
--- a/driver-bindings/src/wrappers.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::bindings::ne_enclave_start_info;
-
-impl Default for ne_enclave_start_info {
-    fn default() -> Self {
-        Self {
-            flags: 0,
-            enclave_cid: 0,
-        }
-    }
-}
diff --git a/drivers/virt/nitro_enclaves/Kconfig b/drivers/virt/nitro_enclaves/Kconfig
index 2d3d9815..dc4d25c2 100644
--- a/drivers/virt/nitro_enclaves/Kconfig
+++ b/drivers/virt/nitro_enclaves/Kconfig
@@ -16,8 +16,9 @@ config NITRO_ENCLAVES
 	  The module will be called nitro_enclaves.
 
 config NITRO_ENCLAVES_MISC_DEV_TEST
-	bool "Tests for the misc device functionality of the Nitro Enclaves"
+	bool "Tests for the misc device functionality of the Nitro Enclaves" if !KUNIT_ALL_TESTS
 	depends on NITRO_ENCLAVES && KUNIT=y
+	default KUNIT_ALL_TESTS
 	help
 	  Enable KUnit tests for the misc device functionality of the Nitro
 	  Enclaves. Select this option only if you will boot the kernel for
diff --git a/drivers/virt/nitro_enclaves/ne_misc_dev.c b/drivers/virt/nitro_enclaves/ne_misc_dev.c
index 4fa2ee32..aa5fb8b6 100644
--- a/drivers/virt/nitro_enclaves/ne_misc_dev.c
+++ b/drivers/virt/nitro_enclaves/ne_misc_dev.c
@@ -1844,35 +1844,10 @@ static long ne_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 
 #if defined(CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST)
 #include "ne_misc_dev_test.c"
-
-static inline int ne_misc_dev_test_init(void)
-{
-	return __kunit_test_suites_init(ne_misc_dev_test_suites);
-}
-
-static inline void ne_misc_dev_test_exit(void)
-{
-	__kunit_test_suites_exit(ne_misc_dev_test_suites);
-}
-#else
-static inline int ne_misc_dev_test_init(void)
-{
-	return 0;
-}
-
-static inline void ne_misc_dev_test_exit(void)
-{
-}
 #endif
 
 static int __init ne_init(void)
 {
-	int rc = 0;
-
-	rc = ne_misc_dev_test_init();
-	if (rc < 0)
-		return rc;
-
 	mutex_init(&ne_cpu_pool.mutex);
 
 	return pci_register_driver(&ne_pci_driver);
@@ -1883,8 +1858,6 @@ static void __exit ne_exit(void)
 	pci_unregister_driver(&ne_pci_driver);
 
 	ne_teardown_cpu_pool();
-
-	ne_misc_dev_test_exit();
 }
 
 module_init(ne_init);
diff --git a/drivers/virt/nitro_enclaves/ne_misc_dev_test.c b/drivers/virt/nitro_enclaves/ne_misc_dev_test.c
index 265797be..74df43b9 100644
--- a/drivers/virt/nitro_enclaves/ne_misc_dev_test.c
+++ b/drivers/virt/nitro_enclaves/ne_misc_dev_test.c
@@ -151,7 +151,4 @@ static struct kunit_suite ne_misc_dev_test_suite = {
 	.test_cases = ne_misc_dev_test_cases,
 };
 
-static struct kunit_suite *ne_misc_dev_test_suites[] = {
-	&ne_misc_dev_test_suite,
-	NULL
-};
+kunit_test_suite(ne_misc_dev_test_suite);
diff --git a/eif_loader/Cargo.toml b/eif_loader/Cargo.toml
index c16b696b..a2394a62 100644
--- a/eif_loader/Cargo.toml
+++ b/eif_loader/Cargo.toml
@@ -3,18 +3,19 @@ name = "eif_loader"
 version = "0.1.0"
 authors = ["The AWS Nitro Enclaves Team "]
 edition = "2018"
+rust-version = "1.60"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-aws-nitro-enclaves-image-format = "0.1"
-nix = "0.23"
+aws-nitro-enclaves-image-format = "0.2"
+nix = "0.26"
 libc = "0.2"
-vsock = "0.2"
+vsock = "0.3"
 
 [dev-dependencies]
 sha2 = "0.9.5"
-tempfile = "3.1"
+tempfile = "3.5"
 
 [lib]
 name = "eif_loader"
diff --git a/eif_loader/src/lib.rs b/eif_loader/src/lib.rs
index 3db546bf..f2a2a893 100644
--- a/eif_loader/src/lib.rs
+++ b/eif_loader/src/lib.rs
@@ -18,7 +18,7 @@ pub const TIMEOUT_MINUTE_MS: i32 = 90 * TIMEOUT_SECOND_MS;
 
 const HEART_BEAT: u8 = 0xB7;
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
 /// Internal errors while sending an Eif file
 pub enum EifLoaderError {
     SocketPollingError,
diff --git a/enclave_build/Cargo.toml b/enclave_build/Cargo.toml
index dccbed28..f86b7487 100644
--- a/enclave_build/Cargo.toml
+++ b/enclave_build/Cargo.toml
@@ -3,21 +3,22 @@ name = "enclave_build"
 version = "0.1.0"
 authors = ["The AWS Nitro Enclaves Team "]
 edition = "2018"
+rust-version = "1.60"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-clap = "2.33"
+clap = "3.2"
 serde = { version = "1.0", features = ["derive"] }
 serde_yaml = "0.8"
 serde_json = "1.0"
 shiplift = "0.7"
-tempfile = "3.1.0"
-tokio = { version = "1.0", features = ["rt-multi-thread"] }
-base64 = "0.13"
+tempfile = "3.5.0"
+tokio = { version = "1.27", features = ["rt-multi-thread"] }
+base64 = "0.21"
 log = "0.4"
-url = "2.1"
+url = "2.3"
 sha2 = "0.9.5"
-futures = "0.3.13"
+futures = "0.3.28"
 
-aws-nitro-enclaves-image-format = "0.1"
+aws-nitro-enclaves-image-format = "0.2"
diff --git a/enclave_build/src/docker.rs b/enclave_build/src/docker.rs
index 7e0aac29..31436ca6 100644
--- a/enclave_build/src/docker.rs
+++ b/enclave_build/src/docker.rs
@@ -1,7 +1,8 @@
-// Copyright 2019-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// Copyright 2019-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::docker::DockerError::CredentialsError;
+use base64::{engine::general_purpose, Engine as _};
 use futures::stream::StreamExt;
 use log::{debug, error, info};
 use serde_json::{json, Value};
@@ -18,7 +19,7 @@ use url::Url;
 pub const DOCKER_ARCH_ARM64: &str = "arm64";
 pub const DOCKER_ARCH_AMD64: &str = "amd64";
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
 pub enum DockerError {
     BuildError,
     InspectError,
@@ -66,7 +67,7 @@ impl DockerUtil {
         } else {
             // Some Docker URIs don't have the protocol included, so just use
             // a dummy one to trick Url that it's a properly defined Uri.
-            let uri = format!("dummy://{}", image);
+            let uri = format!("dummy://{image}");
             if let Ok(uri) = Url::parse(&uri) {
                 uri.host().map(|s| s.to_string())
             } else {
@@ -78,7 +79,7 @@ impl DockerUtil {
             let config_file = self.get_config_file()?;
 
             let config_json: serde_json::Value = serde_json::from_reader(&config_file)
-                .map_err(|err| CredentialsError(format!("JSON was not well-formatted: {}", err)))?;
+                .map_err(|err| CredentialsError(format!("JSON was not well-formatted: {err}")))?;
 
             let auths = config_json.get("auths").ok_or_else(|| {
                 CredentialsError("Could not find auths key in config JSON".to_string())
@@ -97,12 +98,12 @@ impl DockerUtil {
                         })?
                         .to_string();
 
-                    let auth = auth.replace(r#"""#, "");
-                    let decoded = base64::decode(&auth).map_err(|err| {
-                        CredentialsError(format!("Invalid Base64 encoding for auth: {}", err))
+                    let auth = auth.replace('"', "");
+                    let decoded = general_purpose::STANDARD.decode(auth).map_err(|err| {
+                        CredentialsError(format!("Invalid Base64 encoding for auth: {err}"))
                     })?;
                     let decoded = std::str::from_utf8(&decoded).map_err(|err| {
-                        CredentialsError(format!("Invalid utf8 encoding for auth: {}", err))
+                        CredentialsError(format!("Invalid utf8 encoding for auth: {err}"))
                     })?;
 
                     if let Some(index) = decoded.rfind(':') {
@@ -127,14 +128,13 @@ impl DockerUtil {
             let config_file = File::open(file).map_err(|err| {
                 DockerError::CredentialsError(format!(
                     "Could not open file pointed by env\
-                     DOCKER_CONFIG: {}",
-                    err
+                     DOCKER_CONFIG: {err}"
                 ))
             })?;
             Ok(config_file)
         } else {
             if let Ok(home_dir) = std::env::var("HOME") {
-                let default_config_path = format!("{}/.docker/config.json", home_dir);
+                let default_config_path = format!("{home_dir}/.docker/config.json");
                 let config_path = Path::new(&default_config_path);
                 if config_path.exists() {
                     let config_file = File::open(config_path).map_err(|err| {
@@ -391,7 +391,7 @@ fn write_config(config: Vec) -> Result {
     let mut file = NamedTempFile::new().map_err(|_| DockerError::TempfileError)?;
 
     for line in config {
-        file.write_fmt(format_args!("{}\n", line))
+        file.write_fmt(format_args!("{line}\n"))
             .map_err(|_| DockerError::TempfileError)?;
     }
 
@@ -406,14 +406,7 @@ mod tests {
     /// Test extracted configuration is as expected
     #[test]
     fn test_config() {
-        #[cfg(target_arch = "x86_64")]
-        let docker = DockerUtil::new(String::from(
-            "667861386598.dkr.ecr.us-east-1.amazonaws.com/enclaves-samples:vsock-sample-server-x86_64",
-        ));
-        #[cfg(target_arch = "aarch64")]
-        let docker = DockerUtil::new(String::from(
-            "667861386598.dkr.ecr.us-east-1.amazonaws.com/enclaves-samples:vsock-sample-server-aarch64",
-        ));
+        let docker = DockerUtil::new(String::from("public.ecr.aws/aws-nitro-enclaves/hello:v1"));
 
         let (cmd_file, env_file) = docker.load().unwrap();
         let mut cmd_file = File::open(cmd_file.path()).unwrap();
@@ -421,18 +414,14 @@ mod tests {
 
         let mut cmd = String::new();
         cmd_file.read_to_string(&mut cmd).unwrap();
-        assert_eq!(
-            cmd,
-            "/bin/sh\n\
-             -c\n\
-             ./vsock-sample server --port 5005\n"
-        );
+        assert_eq!(cmd, "/bin/hello.sh\n");
 
         let mut env = String::new();
         env_file.read_to_string(&mut env).unwrap();
         assert_eq!(
             env,
-            "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\n"
+            "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\n\
+             HELLO=Hello from the enclave side!\n"
         );
     }
 }
diff --git a/enclave_build/src/lib.rs b/enclave_build/src/lib.rs
index d0f466df..d8d41a19 100644
--- a/enclave_build/src/lib.rs
+++ b/enclave_build/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// Copyright 2019-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 #![allow(clippy::too_many_arguments)]
 
@@ -37,7 +37,7 @@ pub struct Docker2Eif<'a> {
     build_info: EifBuildInfo,
 }
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
 pub enum Docker2EifError {
     DockerError,
     DockerfilePathError,
@@ -98,7 +98,7 @@ impl<'a> Docker2Eif<'a> {
             (None, None) => None,
             (Some(cert_path), Some(key_path)) => Some(
                 SignEnclaveInfo::new(cert_path, key_path)
-                    .map_err(|err| Docker2EifError::SignImageError(format!("{:?}", err)))?,
+                    .map_err(|err| Docker2EifError::SignImageError(format!("{err:?}")))?,
             ),
             _ => return Err(Docker2EifError::SignArgsError),
         };
@@ -123,7 +123,7 @@ impl<'a> Docker2Eif<'a> {
 
     pub fn pull_docker_image(&self) -> Result<(), Docker2EifError> {
         self.docker.pull_image().map_err(|e| {
-            eprintln!("Docker error: {:?}", e);
+            eprintln!("Docker error: {e:?}");
             Docker2EifError::DockerError
         })?;
 
@@ -135,7 +135,7 @@ impl<'a> Docker2Eif<'a> {
             return Err(Docker2EifError::DockerfilePathError);
         }
         self.docker.build_image(dockerfile_dir).map_err(|e| {
-            eprintln!("Docker error: {:?}", e);
+            eprintln!("Docker error: {e:?}");
             Docker2EifError::DockerError
         })?;
 
@@ -143,9 +143,10 @@ impl<'a> Docker2Eif<'a> {
     }
 
     fn generate_identity_info(&self) -> Result {
-        let docker_info = self.docker.inspect_image().map_err(|e| {
-            Docker2EifError::MetadataError(format!("Docker inspect error: {:?}", e))
-        })?;
+        let docker_info = self
+            .docker
+            .inspect_image()
+            .map_err(|e| Docker2EifError::MetadataError(format!("Docker inspect error: {e:?}")))?;
 
         let uri_split: Vec<&str> = self.docker_image.split(':').collect();
         if uri_split.is_empty() {
@@ -193,7 +194,7 @@ impl<'a> Docker2Eif<'a> {
 
     pub fn create(&mut self) -> Result, Docker2EifError> {
         let (cmd_file, env_file) = self.docker.load().map_err(|e| {
-            eprintln!("Docker error: {:?}", e);
+            eprintln!("Docker error: {e:?}");
             Docker2EifError::DockerError
         })?;
 
@@ -206,11 +207,11 @@ impl<'a> Docker2Eif<'a> {
         );
 
         let ramfs_config_file = yaml_generator.get_bootstrap_ramfs().map_err(|e| {
-            eprintln!("Ramfs error: {:?}", e);
+            eprintln!("Ramfs error: {e:?}");
             Docker2EifError::RamfsError
         })?;
         let ramfs_with_rootfs_config_file = yaml_generator.get_customer_ramfs().map_err(|e| {
-            eprintln!("Ramfs error: {:?}", e);
+            eprintln!("Ramfs error: {e:?}");
             Docker2EifError::RamfsError
         })?;
 
@@ -218,7 +219,7 @@ impl<'a> Docker2Eif<'a> {
         let customer_ramfs = format!("{}/customer-initrd.img", self.artifacts_prefix);
 
         let output = Command::new(&self.linuxkit_path)
-            .args(&[
+            .args([
                 "build",
                 "-name",
                 &bootstrap_ramfs,
@@ -238,7 +239,7 @@ impl<'a> Docker2Eif<'a> {
 
         // Prefix the docker image filesystem, as expected by init
         let output = Command::new(&self.linuxkit_path)
-            .args(&[
+            .args([
                 "build",
                 "-docker",
                 "-name",
@@ -260,7 +261,7 @@ impl<'a> Docker2Eif<'a> {
         }
 
         let arch = self.docker.architecture().map_err(|e| {
-            eprintln!("Docker error: {:?}", e);
+            eprintln!("Docker error: {e:?}");
             Docker2EifError::DockerError
         })?;
 
@@ -280,8 +281,8 @@ impl<'a> Docker2Eif<'a> {
         );
 
         // Linuxkit adds -initrd.img sufix to the file names.
-        let bootstrap_ramfs = format!("{}-initrd.img", bootstrap_ramfs);
-        let customer_ramfs = format!("{}-initrd.img", customer_ramfs);
+        let bootstrap_ramfs = format!("{bootstrap_ramfs}-initrd.img");
+        let customer_ramfs = format!("{customer_ramfs}-initrd.img");
 
         build.add_ramdisk(Path::new(&bootstrap_ramfs));
         build.add_ramdisk(Path::new(&customer_ramfs));
diff --git a/enclave_build/src/main.rs b/enclave_build/src/main.rs
index 400fee47..52af2265 100644
--- a/enclave_build/src/main.rs
+++ b/enclave_build/src/main.rs
@@ -13,7 +13,7 @@ fn main() {
         .setting(AppSettings::DisableVersion)
         .arg(
             Arg::with_name("docker_image")
-                .short("t")
+                .short('t')
                 .long("tag")
                 .help("Docker image tag")
                 .takes_value(true)
@@ -21,7 +21,7 @@ fn main() {
         )
         .arg(
             Arg::with_name("init_path")
-                .short("i")
+                .short('i')
                 .long("init")
                 .help("Path to a binary representing the init process for the enclave")
                 .takes_value(true)
@@ -29,7 +29,7 @@ fn main() {
         )
         .arg(
             Arg::with_name("nsm_path")
-                .short("n")
+                .short('n')
                 .long("nsm")
                 .help("Path to the NitroSecureModule Kernel Driver")
                 .takes_value(true)
@@ -37,7 +37,7 @@ fn main() {
         )
         .arg(
             Arg::with_name("kernel_img_path")
-                .short("k")
+                .short('k')
                 .long("kernel")
                 .help("Path to a bzImage/Image file for x86_64/aarch64 linux kernel")
                 .takes_value(true)
@@ -45,7 +45,6 @@ fn main() {
         )
         .arg(
             Arg::with_name("kernel_cfg_path")
-                .short("k")
                 .long("kernel_config")
                 .help("Path to a bzImage.config/Image.config file for x86_64/aarch64 linux kernel config")
                 .takes_value(true)
@@ -53,7 +52,7 @@ fn main() {
         )
         .arg(
             Arg::with_name("cmdline")
-                .short("c")
+                .short('c')
                 .long("cmdline")
                 .help("Cmdline for kernel")
                 .takes_value(true)
@@ -61,7 +60,7 @@ fn main() {
         )
         .arg(
             Arg::with_name("linuxkit_path")
-                .short("l")
+                .short('l')
                 .long("linuxkit")
                 .help("Linuxkit executable path")
                 .takes_value(true)
@@ -69,7 +68,7 @@ fn main() {
         )
         .arg(
             Arg::with_name("output")
-                .short("o")
+                .short('o')
                 .long("output")
                 .help("Output file for EIF image")
                 .takes_value(true)
@@ -89,7 +88,7 @@ fn main() {
         )
         .arg(
             Arg::with_name("build")
-                .short("b")
+                .short('b')
                 .long("build")
                 .help("Build image from Dockerfile")
                 .takes_value(true)
@@ -97,7 +96,7 @@ fn main() {
         )
         .arg(
             Arg::with_name("pull")
-                .short("p")
+                .short('p')
                 .long("pull")
                 .help("Pull the Docker image before generating EIF")
                 .required(false)
diff --git a/enclave_build/src/yaml_generator.rs b/enclave_build/src/yaml_generator.rs
index 2c21fff9..cf54b355 100644
--- a/enclave_build/src/yaml_generator.rs
+++ b/enclave_build/src/yaml_generator.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// Copyright 2019-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 use serde::{Deserialize, Serialize};
@@ -39,7 +39,7 @@ struct DirTemplate {
     mode: String,
 }
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
 pub enum YamlGeneratorError {
     TempfileError,
 }
diff --git a/run_tests.sh b/run_tests.sh
index be08ee86..c9afa7c5 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -14,7 +14,7 @@ export NITRO_CLI_BLOBS="${SCRIPTDIR}/blobs"
 export NITRO_CLI_ARTIFACTS="${SCRIPTDIR}/build"
 ARCH="$(uname -m)"
 
-$(aws ecr get-login --no-include-email --region us-east-1)
+AWS_ACCOUNT_ID=667861386598
 
 # Indicate that the test suite has failed
 function register_test_fail() {
@@ -26,8 +26,9 @@ function clean_up_and_exit() {
 	[ "$(lsmod | grep -cw nitro_enclaves)" -eq 0 ] || rmmod nitro_enclaves || register_test_fail
 	make clean
 	rm -rf test_images
+
 	# Cleanup pulled images during testing
-	docker rmi 667861386598.dkr.ecr.us-east-1.amazonaws.com/enclaves-samples:vsock-sample-server-"${ARCH}" 2> /dev/null || true
+	docker rmi public.ecr.aws/aws-nitro-enclaves/hello:v1 2> /dev/null || true
 	docker rmi hello-world:latest 2> /dev/null || true
 
 	rm -rf examples/"${ARCH}"/hello-entrypoint
@@ -54,7 +55,7 @@ function configure_ne_driver() {
 		# Preallocate 2046 Mb, that should be enough for all the tests. We explicitly
 		# pick this value to have both 1 GB and 2 MB pages if the system allows it.
 		source build/install/etc/profile.d/nitro-cli-env.sh || test_failed
-		./build/install/etc/profile.d/nitro-cli-config -m 2046 -p 1,3 || test_failed
+		./build/install/etc/profile.d/nitro-cli-config -m 2046 -t 2 || test_failed
 	fi
 }
 
@@ -64,22 +65,6 @@ pytest-3 tests/integration/test_installation.py || test_failed
 # Clean up build artefacts
 make clean
 
-# Run 'cargo fmt'
-echo "=================== cargo fmt ========================="
-make nitro-format || test_failed
-
-# Run 'cargo clippy'
-echo "=================== cargo clippy ==========================="
-make nitro-clippy || test_failed
-
-# Run 'cargo audit'
-echo "=================== cargo audit ==========================="
-make nitro-audit || test_failed
-
-# Check Rust licenses
-echo "=================== cargo about ==========================="
-make nitro-about || test_failed
-
 # Setup the environement with everything needed to run the integration tests
 make command-executer || test_failed
 make nitro-tests || test_failed
@@ -100,8 +85,8 @@ mkdir -p test_images || test_failed
 export HOME="/root"
 
 # Simple EIF
-nitro-cli build-enclave --docker-uri 667861386598.dkr.ecr.us-east-1.amazonaws.com/enclaves-samples:vsock-sample-server-"${ARCH}" \
-	--output-file test_images/vsock-sample-server-"${ARCH}".eif || test_failed
+nitro-cli build-enclave --docker-uri public.ecr.aws/aws-nitro-enclaves/hello:v1 \
+	--output-file test_images/hello.eif || test_failed
 
 # Generate signing certificate
 openssl ecparam -name secp384r1 -genkey -out test_images/key.pem || test_failed
@@ -110,8 +95,8 @@ openssl req -new -key test_images/key.pem -sha384 -nodes \
 openssl x509 -req -days 20  -in test_images/csr.pem -out test_images/cert.pem \
 	-sha384 -signkey test_images/key.pem || test_failed
 # Signed EIF
-nitro-cli build-enclave --docker-uri 667861386598.dkr.ecr.us-east-1.amazonaws.com/enclaves-samples:vsock-sample-server-"${ARCH}" \
-	--output-file test_images/vsock-sample-server-"${ARCH}"-signed.eif \
+nitro-cli build-enclave --docker-uri public.ecr.aws/aws-nitro-enclaves/hello:v1 \
+	--output-file test_images/hello-signed.eif \
 	--private-key test_images/key.pem --signing-certificate test_images/cert.pem || test_failed
 
 
@@ -133,6 +118,7 @@ do
 
 	configure_ne_driver
 
+	timeout 5m \
 	./build/nitro_cli/"${ARCH}"-unknown-linux-musl/release/deps/"${test_exec_name}" \
 		--test-threads=1 --nocapture || test_failed
 done < <(grep -v '^ *#' < build/test_executables.txt)
diff --git a/samples/command_executer/Cargo.lock b/samples/command_executer/Cargo.lock
index 3b4565f2..8a5fe227 100644
--- a/samples/command_executer/Cargo.lock
+++ b/samples/command_executer/Cargo.lock
@@ -1,29 +1,23 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-[[package]]
-name = "ansi_term"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
-dependencies = [
- "winapi",
-]
+version = 3
 
 [[package]]
 name = "atty"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
 dependencies = [
+ "hermit-abi",
  "libc",
  "winapi",
 ]
 
 [[package]]
 name = "autocfg"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
@@ -33,21 +27,15 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "byteorder"
-version = "1.3.2"
+version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
+checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
 [[package]]
 name = "cc"
-version = "1.0.47"
+version = "1.0.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa87058dce70a3ff5621797f1506cb837edd02ac4c0ae642b4542dce802908b8"
-
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
 
 [[package]]
 name = "cfg-if"
@@ -57,17 +45,26 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "2.33.0"
+version = "3.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
+checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750"
 dependencies = [
- "ansi_term",
  "atty",
  "bitflags",
+ "clap_lex",
+ "indexmap",
  "strsim",
+ "termcolor",
  "textwrap",
- "unicode-width",
- "vec_map",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
+dependencies = [
+ "os_str_bytes",
 ]
 
 [[package]]
@@ -85,45 +82,70 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "indexmap"
+version = "1.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
+dependencies = [
+ "autocfg",
+ "hashbrown",
+]
+
 [[package]]
 name = "itoa"
-version = "0.4.4"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
+checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754"
 
 [[package]]
 name = "libc"
-version = "0.2.108"
+version = "0.2.133"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8521a1b57e76b1ec69af7599e75e38e7b7fad6610f037db8c79b127201b5d119"
+checksum = "c0f80d65747a3e43d1596c7c5492d95d5edddaabd45a7fcdb02b95f644164966"
 
 [[package]]
 name = "log"
-version = "0.4.8"
+version = "0.4.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
+checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if",
 ]
 
 [[package]]
 name = "memoffset"
-version = "0.6.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
+checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "nix"
-version = "0.23.0"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f305c2c2e4c39a82f7bf0bf65fb557f9070ce06781d4f2454295cc34b1c43188"
+checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6"
 dependencies = [
  "bitflags",
  "cc",
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "memoffset",
 ]
@@ -144,9 +166,9 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f115de20ad793e857f76da2563ff4a09fbcfd6fe93cca0c5d996ab5f3ee38d"
+checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304"
 dependencies = [
  "autocfg",
  "num-integer",
@@ -165,9 +187,9 @@ dependencies = [
 
 [[package]]
 name = "num-derive"
-version = "0.3.0"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c8b15b261814f992e33760b1fca9fe8b693d8a65299f20c9901688636cfb746"
+checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -176,9 +198,9 @@ dependencies = [
 
 [[package]]
 name = "num-integer"
-version = "0.1.42"
+version = "0.1.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba"
+checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
 dependencies = [
  "autocfg",
  "num-traits",
@@ -186,9 +208,9 @@ dependencies = [
 
 [[package]]
 name = "num-iter"
-version = "0.1.40"
+version = "0.1.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfb0800a0291891dd9f4fe7bd9c19384f98f7fbe0cd0f39a2c6b88b9868bbc00"
+checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
 dependencies = [
  "autocfg",
  "num-integer",
@@ -197,9 +219,9 @@ dependencies = [
 
 [[package]]
 name = "num-rational"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da4dc79f9e6c81bef96148c8f6b8e72ad4541caa4a24373e900a36da07de03a3"
+checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef"
 dependencies = [
  "autocfg",
  "num-bigint",
@@ -209,51 +231,57 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.11"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096"
+checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
 dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "os_str_bytes"
+version = "6.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff"
+
 [[package]]
 name = "proc-macro2"
-version = "1.0.6"
+version = "1.0.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27"
+checksum = "7bd7356a8122b6c4a24a82b278680c73357984ca2fc79a0f9fa6dea7dced7c58"
 dependencies = [
- "unicode-xid",
+ "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.2"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
+checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "ryu"
-version = "1.0.2"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8"
+checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
 
 [[package]]
 name = "serde"
-version = "1.0.103"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1217f97ab8e8904b57dd22eb61cde455fa7446a9c1cf43966066da047c1f3702"
+checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.103"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8c6faef9a2e64b0064f48570289b4bf8823b7581f1d6157c1b52152306651d0"
+checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -262,9 +290,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.42"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a3351dcbc1f067e2c92ab7c3c1f288ad1a4cffc470b5aaddb4c2e0a3ae80043"
+checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44"
 dependencies = [
  "itoa",
  "ryu",
@@ -273,53 +301,47 @@ dependencies = [
 
 [[package]]
 name = "strsim"
-version = "0.8.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
 name = "syn"
-version = "1.0.11"
+version = "1.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dff0acdb207ae2fe6d5976617f887eb1e35a2ba52c13c7234c790960cdad9238"
+checksum = "52205623b1b0f064a4e71182c3b18ae902267282930c6d5462c91b859668426e"
 dependencies = [
  "proc-macro2",
  "quote",
- "unicode-xid",
+ "unicode-ident",
 ]
 
 [[package]]
-name = "textwrap"
-version = "0.11.0"
+name = "termcolor"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
 dependencies = [
- "unicode-width",
+ "winapi-util",
 ]
 
 [[package]]
-name = "unicode-width"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.0"
+name = "textwrap"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
+checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16"
 
 [[package]]
-name = "vec_map"
-version = "0.8.1"
+name = "unicode-ident"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
+checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd"
 
 [[package]]
 name = "winapi"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
 dependencies = [
  "winapi-i686-pc-windows-gnu",
  "winapi-x86_64-pc-windows-gnu",
@@ -331,6 +353,15 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
+[[package]]
+name = "winapi-util"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
diff --git a/samples/command_executer/Cargo.toml b/samples/command_executer/Cargo.toml
index f982c1e3..d8b01ed7 100644
--- a/samples/command_executer/Cargo.toml
+++ b/samples/command_executer/Cargo.toml
@@ -3,11 +3,12 @@ name = "command-executer"
 version = "0.1.0"
 authors = ["The AWS Nitro Enclaves Team "]
 edition = "2018"
+rust-version = "1.60"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-clap = "2.33"
+clap = "3.2"
 log = "0.4"
 nix = "0.23"
 serde = { version = ">=1.0", features = ["derive"] }
diff --git a/samples/command_executer/resources/Dockerfile b/samples/command_executer/resources/Dockerfile
index b5d97e36..9289901c 100644
--- a/samples/command_executer/resources/Dockerfile
+++ b/samples/command_executer/resources/Dockerfile
@@ -1,5 +1,4 @@
-FROM ubuntu:latest
-  COPY command-executer .
-  RUN apt-get update && apt-get install -y \
-      apt-utils
-  CMD ./command-executer listen --port 5005
+FROM public.ecr.aws/ubuntu/ubuntu:20.04
+
+COPY command-executer .
+CMD ./command-executer listen --port 5005
diff --git a/samples/command_executer/src/main.rs b/samples/command_executer/src/main.rs
index 3a506358..ea2678b8 100644
--- a/samples/command_executer/src/main.rs
+++ b/samples/command_executer/src/main.rs
@@ -2,7 +2,6 @@ use clap::{App, AppSettings, Arg, SubCommand};
 
 use command_executer::command_parser::{FileArgs, ListenArgs, RunArgs};
 use command_executer::create_app;
-use command_executer::utils::ExitGracefully;
 use command_executer::{listen, recv_file, run, send_file};
 
 fn main() {
@@ -10,23 +9,23 @@ fn main() {
     let args = app.get_matches();
 
     match args.subcommand() {
-        ("listen", Some(args)) => {
-            let listen_args = ListenArgs::new_with(args).ok_or_exit(args.usage());
-            listen(listen_args).ok_or_exit(args.usage());
+        Some(("listen", args)) => {
+            let listen_args = ListenArgs::new_with(args).unwrap();
+            listen(listen_args).unwrap();
         }
-        ("run", Some(args)) => {
-            let run_args = RunArgs::new_with(args).ok_or_exit(args.usage());
-            let rc = run(run_args).ok_or_exit(args.usage());
+        Some(("run", args)) => {
+            let run_args = RunArgs::new_with(args).unwrap();
+            let rc = run(run_args).unwrap();
             std::process::exit(rc);
         }
-        ("recv-file", Some(args)) => {
-            let subcmd_args = FileArgs::new_with(args).ok_or_exit(args.usage());
-            recv_file(subcmd_args).ok_or_exit(args.usage());
+        Some(("recv-file", args)) => {
+            let subcmd_args = FileArgs::new_with(args).unwrap();
+            recv_file(subcmd_args).unwrap();
         }
-        ("send-file", Some(args)) => {
-            let subcmd_args = FileArgs::new_with(args).ok_or_exit(args.usage());
-            send_file(subcmd_args).ok_or_exit(args.usage());
+        Some(("send-file", args)) => {
+            let subcmd_args = FileArgs::new_with(args).unwrap();
+            send_file(subcmd_args).unwrap();
         }
-        (&_, _) => {}
+        Some(_) | None => {}
     }
 }
diff --git a/sources b/sources
index 9f143837..a6a69552 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-241f8e32c95e600497f6323d651e8a9261c05875  nitro-cli-dependencies.tar.gz
+4e96c6c0307d915245dd3f0f19ab09faf9bd0f2f  nitro-cli-dependencies.tar.gz
diff --git a/src/common/commands_parser.rs b/src/common/commands_parser.rs
index e254b22a..0da9a7a1 100644
--- a/src/common/commands_parser.rs
+++ b/src/common/commands_parser.rs
@@ -9,6 +9,7 @@ use libc::VMADDR_CID_HOST;
 use libc::VMADDR_CID_LOCAL;
 use serde::{Deserialize, Serialize};
 use std::fs::File;
+use std::str::FromStr;
 
 use crate::common::{NitroCliErrorEnum, NitroCliFailure, NitroCliResult, VMADDR_CID_PARENT};
 use crate::get_id_by_name;
@@ -27,8 +28,10 @@ pub struct RunEnclavesArgs {
     /// An optional list of CPU IDs that will be given to the enclave.
     pub cpu_ids: Option>,
     /// A flag indicating if the enclave will be started in debug mode.
-    pub debug_mode: Option,
+    #[serde(default)]
+    pub debug_mode: bool,
     /// Attach to the console immediately if using debug mode.
+    #[serde(default)]
     pub attach_console: bool,
     /// The number of CPUs that the enclave will receive.
     pub cpu_count: Option,
@@ -48,13 +51,13 @@ impl RunEnclavesArgs {
                 .add_info(vec![config_file, "Open"])
             })?;
 
-            let json: RunEnclavesArgs = serde_json::from_reader(file).map_err(|err| {
+            let mut json: RunEnclavesArgs = serde_json::from_reader(file).map_err(|err| {
                 new_nitro_cli_failure!(
                     &format!("Invalid JSON format for config file: {:?}", err),
                     NitroCliErrorEnum::SerdeError
                 )
             })?;
-            if json.cpu_count == None && json.cpu_ids == None {
+            if json.cpu_count.is_none() && json.cpu_ids.is_none() {
                 return Err(new_nitro_cli_failure!(
                     "Missing both `cpu-count` and `cpu-ids`",
                     NitroCliErrorEnum::MissingArgument
@@ -67,6 +70,9 @@ impl RunEnclavesArgs {
                 ));
             }
 
+            // attach_console implies debug_mode
+            json.debug_mode = json.debug_mode || json.attach_console;
+
             Ok(json)
         } else {
             Ok(RunEnclavesArgs {
@@ -285,21 +291,74 @@ fn parse_file_path(args: &ArgMatches, val_name: &str) -> NitroCliResult
     Ok(path.to_string())
 }
 
+#[derive(Debug)]
+enum MemoryUnit {
+    Mebibytes,
+    Gibibytes,
+    Tebibytes,
+}
+
+#[derive(Debug)]
+struct UnknownMemoryUnitErr;
+
+impl MemoryUnit {
+    fn to_mebibytes(&self) -> u64 {
+        match self {
+            MemoryUnit::Mebibytes => 1,
+            MemoryUnit::Gibibytes => 1024,
+            MemoryUnit::Tebibytes => 1024 * 1024,
+        }
+    }
+}
+
+impl FromStr for MemoryUnit {
+    type Err = UnknownMemoryUnitErr;
+
+    fn from_str(s: &str) -> Result {
+        match s {
+            "M" | "m" | "" => Ok(MemoryUnit::Mebibytes),
+            "G" | "g" => Ok(MemoryUnit::Gibibytes),
+            "T" | "t" => Ok(MemoryUnit::Tebibytes),
+            _ => Err(UnknownMemoryUnitErr),
+        }
+    }
+}
+
 /// Parse the requested amount of enclave memory from the command-line arguments.
-fn parse_memory(args: &ArgMatches) -> NitroCliResult {
+/// It can be just a number like 123, or it can end in a size indicator like 100M or 10G.
+/// If the size indicator is missing, it defaults to M.
+/// If the size indicator is not M, G or T, it returns an error.
+///
+/// # Arguments
+/// * `args` - The command-line arguments.
+pub fn parse_memory(args: &ArgMatches) -> NitroCliResult {
     let memory = args.value_of("memory").ok_or_else(|| {
         new_nitro_cli_failure!(
             "`memory` argument not found",
             NitroCliErrorEnum::MissingArgument
         )
     })?;
-    memory.parse().map_err(|_| {
+
+    let (num_str, size_str) = match memory.find(|c: char| !c.is_numeric()) {
+        Some(index) => memory.split_at(index),
+        None => (memory, ""),
+    };
+    let num = num_str.parse::().map_err(|_| {
         new_nitro_cli_failure!(
-            "`memory` is not a number",
+            "`memory` argument does not contain a number",
             NitroCliErrorEnum::InvalidArgument
         )
         .add_info(vec!["memory", memory])
-    })
+    })?;
+
+    let unit = size_str.parse::().map_err(|_| {
+        new_nitro_cli_failure!(
+            "`memory` argument does not contain a valid size indicator",
+            NitroCliErrorEnum::InvalidArgument
+        )
+        .add_info(vec!["memory", memory])
+    })?;
+    Ok(num * unit.to_mebibytes())
 }
 
 /// Parse the Docker tag from the command-line arguments.
@@ -468,13 +527,8 @@ fn parse_output(args: &ArgMatches) -> Option {
 }
 
 /// Parse the debug-mode flag from the command-line arguments.
-fn debug_mode(args: &ArgMatches) -> Option {
-    let val = args.is_present("debug-mode");
-    if val {
-        Some(val)
-    } else {
-        None
-    }
+fn debug_mode(args: &ArgMatches) -> bool {
+    args.is_present("debug-mode") || args.is_present("attach-console")
 }
 
 /// Parse the attach-console flag from the command-line arguments.
@@ -565,6 +619,102 @@ mod tests {
             let err_str = construct_error_message(&err_info);
             assert!(err_str.contains("Invalid argument provided"))
         }
+
+        let app = create_app!();
+        let args = vec![
+            "nitro-cli",
+            "run-enclave",
+            "--memory",
+            "256",
+            "--cpu-count",
+            "2",
+            "--eif-path",
+            "non_existing_eif.eif",
+        ];
+
+        let matches = app.get_matches_from_safe(args);
+        assert!(matches.is_ok());
+
+        let result = parse_memory(
+            matches
+                .as_ref()
+                .unwrap()
+                .subcommand_matches("run-enclave")
+                .unwrap(),
+        );
+        assert_eq!(result, Ok(256));
+
+        let app = create_app!();
+        let args = vec![
+            "nitro-cli",
+            "run-enclave",
+            "--memory",
+            "100M",
+            "--cpu-count",
+            "2",
+            "--eif-path",
+            "non_existing_eif.eif",
+        ];
+
+        let matches = app.get_matches_from_safe(args);
+        assert!(matches.is_ok());
+
+        let result = parse_memory(
+            matches
+                .as_ref()
+                .unwrap()
+                .subcommand_matches("run-enclave")
+                .unwrap(),
+        );
+        assert_eq!(result, Ok(100));
+
+        let app = create_app!();
+        let args = vec![
+            "nitro-cli",
+            "run-enclave",
+            "--memory",
+            "10G",
+            "--cpu-count",
+            "2",
+            "--eif-path",
+            "non_existing_eif.eif",
+        ];
+
+        let matches = app.get_matches_from_safe(args);
+        assert!(matches.is_ok());
+
+        let result = parse_memory(
+            matches
+                .as_ref()
+                .unwrap()
+                .subcommand_matches("run-enclave")
+                .unwrap(),
+        );
+        assert_eq!(result, Ok(10_240));
+
+        let app = create_app!();
+        let args = vec![
+            "nitro-cli",
+            "run-enclave",
+            "--memory",
+            "2T",
+            "--cpu-count",
+            "2",
+            "--eif-path",
+            "non_existing_eif.eif",
+        ];
+
+        let matches = app.get_matches_from_safe(args);
+        assert!(matches.is_ok());
+
+        let result = parse_memory(
+            matches
+                .as_ref()
+                .unwrap()
+                .subcommand_matches("run-enclave")
+                .unwrap(),
+        );
+        assert_eq!(result, Ok(2 * 1024 * 1024));
     }
 
     #[test]
@@ -1095,8 +1245,7 @@ mod tests {
                 .subcommand_matches("run-enclave")
                 .unwrap(),
         );
-        assert!(result.is_some());
-        assert!(result.unwrap());
+        assert!(result);
     }
 
     #[test]
@@ -1122,7 +1271,35 @@ mod tests {
                 .subcommand_matches("run-enclave")
                 .unwrap(),
         );
-        assert!(result.is_none());
+        assert!(!result);
+    }
+
+    #[test]
+    fn test_attach_console_supplied() {
+        let app = create_app!();
+        let args = vec![
+            "nitro-cli",
+            "run-enclave",
+            "--attach-console",
+            "--memory",
+            "64",
+            "--cpu-count",
+            "2",
+            "--eif-path",
+            "non_existing_eif.eif",
+        ];
+        let matches = app.get_matches_from_safe(args);
+        assert!(matches.is_ok());
+
+        let matches = matches
+            .as_ref()
+            .unwrap()
+            .subcommand_matches("run-enclave")
+            .unwrap();
+        let attach_console = attach_console(matches);
+        let debug_mode = debug_mode(matches);
+        assert!(attach_console);
+        assert!(debug_mode);
     }
 
     #[test]
diff --git a/src/common/document_errors.rs b/src/common/document_errors.rs
index fe9548f6..3244a741 100644
--- a/src/common/document_errors.rs
+++ b/src/common/document_errors.rs
@@ -217,7 +217,7 @@ pub fn get_detailed_info(error_code_str: String, additional_info: &[String]) ->
             } else {
                 ret.push_str(
                     format!(
-                        "Insufficient memory requested. User provided `{}` is {} MB, and memory should be greated than 0 MB.",
+                        "Insufficient memory requested. User provided `{}` is {} MB, and memory should be greater than 0 MB.",
                         additional_info.get(0).unwrap_or(&info_placeholder),
                         additional_info.get(1).unwrap_or(&info_placeholder)
                     ).as_str(),
@@ -227,7 +227,7 @@ pub fn get_detailed_info(error_code_str: String, additional_info: &[String]) ->
         "E27" => {
             ret.push_str(
                 format!(
-                    "Insufficient memory available. User provided `{}` is {} MB, which is more than the available hugepage memory.\nYou can increase the available memory by editing the `memory_mib` value from '/etc/nitro_enclaves/allocator.yaml' and then enable the nitro-enclaves-allocator.service.",
+                    "Insufficient memory available. User provided `{}` is {} MB, which is more than the available hugepage memory.\nYou can increase the available memory by editing the `memory_mib` value from '/etc/nitro_enclaves/allocator.yaml' and then restart the nitro-enclaves-allocator.service.",
                     additional_info.get(0).unwrap_or(&info_placeholder),
                     additional_info.get(1).unwrap_or(&info_placeholder)
                 ).as_str(),
diff --git a/src/common/logger.rs b/src/common/logger.rs
index 2f55d184..8fe7f6c1 100644
--- a/src/common/logger.rs
+++ b/src/common/logger.rs
@@ -6,7 +6,7 @@
 use chrono::offset::{Local, Utc};
 use chrono::DateTime;
 use flexi_logger::writers::LogWriter;
-use flexi_logger::{DeferredNow, LogTarget, Record};
+use flexi_logger::{DeferredNow, Record};
 use nix::unistd::Uid;
 use std::env;
 use std::fs::{File, OpenOptions, Permissions};
@@ -89,7 +89,7 @@ impl EnclaveProcLogWriter {
     /// Generate a single message string.
     fn create_msg(&self, now: &DateTime, record: &Record) -> NitroCliResult {
         // UTC timestamp according to RFC 2822
-        let timestamp = DateTime::::from_utc(now.naive_utc(), Utc)
+        let timestamp = DateTime::::from_naive_utc_and_offset(now.naive_utc(), Utc)
             .to_rfc3339_opts(chrono::SecondsFormat::Millis, true);
         let logger_id = self.logger_id.lock().map_err(|e| {
             new_nitro_cli_failure!(
@@ -225,8 +225,14 @@ pub fn init_logger() -> NitroCliResult {
     let log_writer = EnclaveProcLogWriter::new()?;
 
     // Initialize logging with the new log writer.
-    flexi_logger::Logger::with_env_or_str(DEFAULT_LOG_LEVEL)
-        .log_target(LogTarget::Writer(Box::new(log_writer.clone())))
+    flexi_logger::Logger::try_with_env_or_str(DEFAULT_LOG_LEVEL)
+        .map_err(|e| {
+            new_nitro_cli_failure!(
+                &format!("Failed to initialize enclave process logger: {:?}", e),
+                NitroCliErrorEnum::LoggerError
+            )
+        })?
+        .log_to_writer(Box::new(log_writer.clone()))
         .start()
         .map_err(|e| {
             new_nitro_cli_failure!(
diff --git a/src/common/mod.rs b/src/common/mod.rs
index 77fb6280..90c63ce5 100644
--- a/src/common/mod.rs
+++ b/src/common/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// Copyright 2020-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 #![deny(missing_docs)]
 #![deny(warnings)]
@@ -189,7 +189,7 @@ impl Default for NitroCliErrorEnum {
 impl Eq for NitroCliErrorEnum {}
 
 /// The type of commands that can be sent to an enclave process.
-#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
 pub enum EnclaveProcessCommandType {
     /// Launch (run) an enclave (sent by the CLI).
     Run = 0,
@@ -225,7 +225,7 @@ pub enum EnclaveProcessReply {
 }
 
 /// Struct that is passed along the backtrace and accumulates error messages.
-#[derive(Debug, Default)]
+#[derive(Debug, Default, PartialEq)]
 pub struct NitroCliFailure {
     /// Main action which was attempted and failed.
     pub action: String,
diff --git a/src/common/signal_handler.rs b/src/common/signal_handler.rs
index 5b12c780..733fe0a1 100644
--- a/src/common/signal_handler.rs
+++ b/src/common/signal_handler.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// Copyright 2020-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 #![deny(missing_docs)]
 #![deny(warnings)]
@@ -37,7 +37,7 @@ impl SignalHandler {
 
     /// Mask (block) all signals covered by the handler.
     pub fn mask_all(self) -> NitroCliResult {
-        for set in self.sig_set.iter() {
+        if let Some(set) = self.sig_set {
             set.thread_block().map_err(|e| {
                 new_nitro_cli_failure!(
                     &format!("Masking signals covered by handler failed: {:?}", e),
@@ -51,7 +51,7 @@ impl SignalHandler {
 
     /// Unmask (unblock) all signals covered by the handler.
     pub fn unmask_all(self) -> NitroCliResult {
-        for set in self.sig_set.iter() {
+        if let Some(set) = self.sig_set {
             set.thread_unblock().map_err(|e| {
                 new_nitro_cli_failure!(
                     &format!("Unmasking signals covered by handler failed: {:?}", e),
diff --git a/src/enclave_proc/commands.rs b/src/enclave_proc/commands.rs
index 5f4b02e4..30c23b41 100644
--- a/src/enclave_proc/commands.rs
+++ b/src/enclave_proc/commands.rs
@@ -34,7 +34,7 @@ pub struct DescribeThreadResult {
 /// Thread handle from parallel computing of PCRs and fetching of metadata
 pub type DescribeThread = Option>>;
 
-/// Information retuned by run_enclave function.
+/// Information returned by run_enclave function.
 pub struct RunEnclaveResult {
     /// Manager structure describing the enclave.
     pub enclave_manager: EnclaveManager,
@@ -77,7 +77,7 @@ pub fn run_enclaves(
         args.memory_mib,
         cpu_ids,
         eif_file,
-        args.debug_mode.unwrap_or(false),
+        args.debug_mode,
         enclave_name.to_string(),
     )
     .map_err(|e| {
diff --git a/src/enclave_proc/connection_listener.rs b/src/enclave_proc/connection_listener.rs
index 67c2a7da..562b7f13 100644
--- a/src/enclave_proc/connection_listener.rs
+++ b/src/enclave_proc/connection_listener.rs
@@ -233,16 +233,16 @@ impl ConnectionListener {
     pub fn get_next_connection(&self, enc_fd: Option) -> NitroCliResult {
         // Wait on epoll until a valid event is received.
         let mut events = [EpollEvent::empty(); 1];
-
         loop {
-            let num_events = epoll::epoll_wait(self.epoll_fd, &mut events, -1).map_err(|e| {
-                new_nitro_cli_failure!(
-                    &format!("Failed to wait on epoll: {:?}", e),
-                    NitroCliErrorEnum::EpollError
-                )
-            })?;
-            if num_events > 0 {
-                break;
+            match epoll::epoll_wait(self.epoll_fd, &mut events, -1) {
+                Ok(_) => break,
+                Err(nix::errno::Errno::EINTR) => continue,
+                Err(e) => {
+                    return Err(new_nitro_cli_failure!(
+                        &format!("Failed to wait on epoll: {:?}", e),
+                        NitroCliErrorEnum::EpollError
+                    ))
+                }
             }
         }
 
diff --git a/src/enclave_proc/cpu_info.rs b/src/enclave_proc/cpu_info.rs
index bcd701d1..2bfd70fd 100644
--- a/src/enclave_proc/cpu_info.rs
+++ b/src/enclave_proc/cpu_info.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// Copyright 2019-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 #![deny(missing_docs)]
 #![deny(warnings)]
@@ -15,7 +15,7 @@ use crate::new_nitro_cli_failure;
 const POOL_FILENAME: &str = "/sys/module/nitro_enclaves/parameters/ne_cpus";
 
 /// The CPU configuration requested by the user.
-#[derive(Clone, PartialEq)]
+#[derive(Clone, PartialEq, Eq)]
 pub enum EnclaveCpuConfig {
     /// A list with the desired CPU IDs.
     List(Vec),
@@ -39,8 +39,22 @@ impl Default for EnclaveCpuConfig {
 impl CpuInfo {
     /// Create a new `CpuInfo` instance from the current system configuration.
     pub fn new() -> NitroCliResult {
+        let pool_file = File::open(POOL_FILENAME).map_err(|e| {
+            new_nitro_cli_failure!(
+                &format!("Failed to open CPU pool file: {}", e),
+                NitroCliErrorEnum::FileOperationFailure
+            )
+            .add_info(vec![POOL_FILENAME, "Open"])
+        })?;
+        let file_reader = BufReader::new(pool_file);
+
+        CpuInfo::from_reader(file_reader)
+    }
+
+    /// Create a new `CpuInfo` instance from a buffered reader
+    pub(crate) fn from_reader(reader: B) -> NitroCliResult {
         Ok(CpuInfo {
-            cpu_ids: CpuInfo::get_cpu_info()?,
+            cpu_ids: CpuInfo::get_cpu_info(reader)?,
         })
     }
 
@@ -159,18 +173,10 @@ impl CpuInfo {
     }
 
     /// Parse the CPU pool and build the list of off-line CPUs.
-    fn get_cpu_info() -> NitroCliResult> {
-        let pool_file = File::open(POOL_FILENAME).map_err(|e| {
-            new_nitro_cli_failure!(
-                &format!("Failed to open CPU pool file: {}", e),
-                NitroCliErrorEnum::FileOperationFailure
-            )
-            .add_info(vec![POOL_FILENAME, "Open"])
-        })?;
-        let file_reader = BufReader::new(pool_file);
+    fn get_cpu_info(reader: B) -> NitroCliResult> {
         let mut result: Vec = Vec::new();
 
-        for line in file_reader.lines() {
+        for line in reader.lines() {
             let line_str = line.map_err(|e| {
                 new_nitro_cli_failure!(
                     &format!("Failed to read line from CPU pool file: {}", e),
@@ -269,12 +275,12 @@ mod tests {
 
     #[test]
     fn test_get_cpu_config_invalid_input() {
-        let cpu_info = CpuInfo::new().unwrap();
+        let cpu_info = CpuInfo::from_reader("1".as_bytes()).unwrap();
         let mut run_args = RunEnclavesArgs {
             eif_path: String::new(),
             enclave_cid: None,
             memory_mib: 0,
-            debug_mode: None,
+            debug_mode: false,
             attach_console: false,
             cpu_ids: None,
             cpu_count: Some(343),
@@ -302,12 +308,12 @@ mod tests {
 
     #[test]
     fn test_get_cpu_config_valid_input() {
-        let cpu_info = CpuInfo::new().unwrap();
+        let cpu_info = CpuInfo::from_reader("1,3".as_bytes()).unwrap();
         let mut run_args = RunEnclavesArgs {
             eif_path: String::new(),
             enclave_cid: None,
             memory_mib: 0,
-            debug_mode: None,
+            debug_mode: false,
             attach_console: false,
             cpu_ids: None,
             cpu_count: Some(2),
@@ -328,7 +334,7 @@ mod tests {
 
     #[test]
     fn test_get_cpu_candidates() {
-        let cpu_info = CpuInfo::new().unwrap();
+        let cpu_info = CpuInfo::from_reader("1".as_bytes()).unwrap();
         let candidate_cpus = cpu_info.get_cpu_candidates();
 
         assert!(!candidate_cpus.is_empty());
@@ -336,7 +342,7 @@ mod tests {
 
     #[test]
     fn test_check_cpu_ids() {
-        let cpu_info = CpuInfo::new().unwrap();
+        let cpu_info = CpuInfo::from_reader("1,3".as_bytes()).unwrap();
         let mut cpu_ids: Vec = vec![1];
 
         let mut result = cpu_info.check_cpu_ids(&cpu_ids);
diff --git a/src/enclave_proc/resource_manager.rs b/src/enclave_proc/resource_manager.rs
index 13f2f8b8..5454d134 100644
--- a/src/enclave_proc/resource_manager.rs
+++ b/src/enclave_proc/resource_manager.rs
@@ -14,14 +14,13 @@ use std::collections::BTreeMap;
 use std::convert::{From, Into};
 use std::fs::{File, OpenOptions};
 use std::io::prelude::*;
-use std::io::{Error, SeekFrom};
+use std::io::Error;
 use std::mem::size_of;
 use std::os::unix::io::{AsRawFd, RawFd};
 use std::str;
 use std::sync::{Arc, Mutex};
 use std::time::Duration;
-use vsock::SockAddr;
-use vsock::VsockListener;
+use vsock::{VsockAddr, VsockListener};
 
 use crate::common::json_output::EnclaveBuildInfo;
 use crate::common::{construct_error_message, notify_error};
@@ -387,7 +386,7 @@ impl ResourceAllocator {
         // larger-page allocations (Ex: if we have 1 x 1 GB page and 1 x 2 MB page, but
         // we want to allocate only 512 MB, the above algorithm will have allocated only
         // the 2 MB page, since the 1 GB page was too large for what was needed; we now
-        // need to allocate in increasing order of page size in order to reduce westage).
+        // need to allocate in increasing order of page size in order to reduce wastage).
 
         if needed_mem > 0 {
             for (_, page_info) in HUGE_PAGE_MAP.iter().rev().enumerate() {
@@ -403,7 +402,7 @@ impl ResourceAllocator {
             }
         }
 
-        // If we still have memory to alocate, it means we have insufficient resources.
+        // If we still have memory to allocate, it means we have insufficient resources.
         if needed_mem > 0 {
             return Err(new_nitro_cli_failure!(
                 &format!(
@@ -565,7 +564,7 @@ impl EnclaveHandle {
         self.init_cpus()
             .map_err(|e| e.add_subaction("vCPUs initialization issue".to_string()))?;
 
-        let sockaddr = SockAddr::new_vsock(VMADDR_CID_PARENT, ENCLAVE_READY_VSOCK_PORT);
+        let sockaddr = VsockAddr::new(VMADDR_CID_PARENT, ENCLAVE_READY_VSOCK_PORT);
         let listener = VsockListener::bind(&sockaddr).map_err(|_| {
             new_nitro_cli_failure!(
                 "Enclave boot heartbeat vsock connection - vsock bind error",
@@ -757,7 +756,7 @@ impl EnclaveHandle {
                 .map_err(|e| e.add_subaction("Failed to release used memory".to_string()))?;
             info!("Enclave terminated.");
 
-            // Mark enclave as termiated.
+            // Mark enclave as terminated.
             self.clear();
         }
 
@@ -1113,7 +1112,7 @@ fn write_eif_to_regions(
         })?
         .len() as usize;
 
-    eif_file.seek(SeekFrom::Start(0)).map_err(|_| {
+    eif_file.rewind().map_err(|_| {
         new_nitro_cli_failure!(
             "Failed to seek to the beginning of the EIF file",
             NitroCliErrorEnum::FileOperationFailure
@@ -1145,7 +1144,7 @@ fn write_eif_to_regions(
             })?;
 
         if written_plus_region_size <= image_write_offset {
-            // All bytes need to be skiped to get to the image write offset.
+            // All bytes need to be skipped to get to the image write offset.
         } else {
             let region_offset = image_write_offset.saturating_sub(total_written);
             let file_offset = total_written.saturating_sub(image_write_offset);
@@ -1200,10 +1199,12 @@ pub fn between_packets_delay() -> Option {
 /// # Examples
 ///
 /// ```
+/// use nitro_cli::enclave_proc::resource_manager::calculate_necessary_timeout;
+/// use nitro_cli::enclave_proc::utils::GiB;
 /// // Returns the timeout based on the 8GiB EIF size
 /// let timeout = calculate_necessary_timeout(8 * GiB);
 /// ```
-fn calculate_necessary_timeout(eif_size: u64) -> c_int {
+pub fn calculate_necessary_timeout(eif_size: u64) -> c_int {
     // in case we have a valid eif_size give TIMEOUT_MINUTE_MS ms for each 6GiB
     let poll_timeout: c_int =
         ((1 + (eif_size - 1) / (6 * GiB)) as i32).saturating_mul(TIMEOUT_MINUTE_MS);
diff --git a/src/enclave_proc/utils.rs b/src/enclave_proc/utils.rs
index b787f4bd..60723766 100644
--- a/src/enclave_proc/utils.rs
+++ b/src/enclave_proc/utils.rs
@@ -121,8 +121,9 @@ pub fn get_slot_id(enclave_id: String) -> Result {
     let tokens: Vec<&str> = enclave_id.split("-enc").collect();
 
     match tokens.get(1) {
-        Some(slot_id) => u64::from_str_radix(*slot_id, 16)
-            .map_err(|_err| "Invalid enclave id format".to_string()),
+        Some(slot_id) => {
+            u64::from_str_radix(slot_id, 16).map_err(|_err| "Invalid enclave id format".to_string())
+        }
         None => Err("Invalid enclave_id.".to_string()),
     }
 }
diff --git a/src/enclave_proc_comm.rs b/src/enclave_proc_comm.rs
index a098614f..7fd12e7c 100644
--- a/src/enclave_proc_comm.rs
+++ b/src/enclave_proc_comm.rs
@@ -190,7 +190,7 @@ where
 
     // Get the number of expected replies.
     let mut num_replies_expected = comms.len() - num_errors;
-    let mut events = vec![EpollEvent::empty(); 1];
+    let mut events = [EpollEvent::empty(); 1];
 
     while num_replies_expected > 0 {
         let num_events = loop {
diff --git a/src/lib.rs b/src/lib.rs
index 5fd32874..169e64b0 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -609,7 +609,10 @@ macro_rules! create_app {
                     .arg(
                         Arg::with_name("memory")
                             .long("memory")
-                            .help("Memory to allocate for the enclave in MB")
+                            .help(
+                                "Memory to allocate for the enclave in MB. Depending on the available \
+                                pages, more might be allocated."
+                            )
                             .required_unless("config")
                             .takes_value(true)
                             .conflicts_with("config"),
@@ -637,7 +640,7 @@ macro_rules! create_app {
                                 "Starts enclave in debug-mode. This makes the console of the enclave \
                                 available over vsock at CID: VMADDR_CID_HYPERVISOR (0), port: \
                                 enclave_cid + 10000. \n The stream could be accessed with the console \
-                                sub-command" ,
+                                sub-command"
                             )
                             .conflicts_with("config"),
                     )
@@ -647,9 +650,8 @@ macro_rules! create_app {
                             .takes_value(false)
                             .help(
                                 "Attach the enclave console immediately after starting the enclave. \
-                                (debug-mode only)"
+                                (implies debug-mode)"
                             )
-                            .requires("debug-mode"),
                     )
                     .arg(
                         Arg::with_name("enclave-name")
diff --git a/src/main.rs b/src/main.rs
index 6742bb14..3c46d6b4 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -63,7 +63,7 @@ fn main() {
     info!("Start Nitro CLI");
 
     match args.subcommand() {
-        ("run-enclave", Some(args)) => {
+        Some(("run-enclave", args)) => {
             let mut run_args = RunEnclavesArgs::new_with(args)
                 .map_err(|err| {
                     err.add_subaction("Failed to construct RunEnclave arguments".to_string())
@@ -135,7 +135,7 @@ fn main() {
                     .ok_or_exit_with_errno(None);
             }
         }
-        ("terminate-enclave", Some(args)) => {
+        Some(("terminate-enclave", args)) => {
             if args.is_present("all") {
                 terminate_all_enclaves()
                     .map_err(|e| {
@@ -185,7 +185,7 @@ fn main() {
                 .ok_or_exit_with_errno(None);
             }
         }
-        ("describe-enclaves", Some(args)) => {
+        Some(("describe-enclaves", args)) => {
             let describe_args = DescribeEnclavesArgs::new_with(args);
             let (comms, comm_errors) = enclave_proc_command_send_all::(
                 EnclaveProcessCommandType::Describe,
@@ -213,7 +213,7 @@ fn main() {
             })
             .ok_or_exit_with_errno(None);
         }
-        ("build-enclave", Some(args)) => {
+        Some(("build-enclave", args)) => {
             let build_args = BuildEnclavesArgs::new_with(args)
                 .map_err(|e| {
                     e.add_subaction("Failed to construct BuildEnclave arguments".to_string())
@@ -227,7 +227,7 @@ fn main() {
                 })
                 .ok_or_exit_with_errno(None);
         }
-        ("describe-eif", Some(args)) => {
+        Some(("describe-eif", args)) => {
             let eif_path = args
                 .value_of("eif-path")
                 .map(|val| val.to_string())
@@ -239,7 +239,7 @@ fn main() {
                 })
                 .ok_or_exit_with_errno(None);
         }
-        ("console", Some(args)) => {
+        Some(("console", args)) => {
             let console_args = ConsoleArgs::new_with(args)
                 .map_err(|e| {
                     e.add_subaction("Failed to construct Console arguments".to_string())
@@ -277,7 +277,7 @@ fn main() {
                 })
                 .ok_or_exit_with_errno(None);
         }
-        ("pcr", Some(args)) => {
+        Some(("pcr", args)) => {
             let pcr_args = PcrArgs::new_with(args)
                 .map_err(|e| {
                     e.add_subaction("Failed to construct PCR arguments".to_string())
@@ -292,7 +292,7 @@ fn main() {
                 })
                 .ok_or_exit_with_errno(None);
         }
-        ("explain", Some(args)) => {
+        Some(("explain", args)) => {
             let explain_args = ExplainArgs::new_with(args)
                 .map_err(|e| {
                     e.add_subaction("Failed to construct Explain arguments".to_string())
@@ -301,6 +301,6 @@ fn main() {
                 .ok_or_exit_with_errno(None);
             explain_error(explain_args.error_code_str);
         }
-        (&_, _) => {}
+        Some((&_, _)) | None => (),
     }
 }
diff --git a/src/utils.rs b/src/utils.rs
index 98d9e29e..bc368f5c 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -7,7 +7,7 @@ use libc::{c_void, close};
 use nix::poll::poll;
 use nix::poll::{PollFd, PollFlags};
 use nix::sys::socket::{connect, socket};
-use nix::sys::socket::{AddressFamily, SockAddr, SockFlag, SockType};
+use nix::sys::socket::{AddressFamily, SockFlag, SockType, VsockAddr};
 use nix::sys::time::{TimeVal, TimeValLike};
 use nix::unistd::read;
 use std::io::Write;
@@ -73,7 +73,7 @@ impl Console {
             )
         })?;
 
-        let sockaddr = SockAddr::new_vsock(cid, port);
+        let sockaddr = VsockAddr::new(cid, port);
 
         vsock_set_connect_timeout(socket_fd, CONSOLE_CONNECT_TIMEOUT).map_err(|err| {
             err.add_subaction("Failed to set console connect timeout".to_string())
@@ -109,7 +109,7 @@ impl Console {
             err.add_subaction("Failed to set console connect timeout".to_string())
         })?;
 
-        let sockaddr = SockAddr::new_vsock(cid, port);
+        let sockaddr = VsockAddr::new(cid, port);
         let result = connect(socket_fd, &sockaddr);
 
         match result {
@@ -297,7 +297,7 @@ fn vsock_set_connect_timeout(fd: RawFd, millis: i64) -> NitroCliResult<()> {
     let timeval = TimeVal::milliseconds(millis);
     let ret = unsafe {
         libc::setsockopt(
-            fd as i32,
+            fd,
             libc::AF_VSOCK,
             SO_VM_SOCKETS_CONNECT_TIMEOUT,
             &timeval as *const _ as *const c_void,
diff --git a/tests/integration/helpers.py b/tests/integration/helpers.py
index 4e5efaf3..f80e0ea4 100755
--- a/tests/integration/helpers.py
+++ b/tests/integration/helpers.py
@@ -15,8 +15,8 @@
 TEST_IMAGES = "test_images/"
 ARCH =  subprocess.run(["uname", "-m"], stdout=PIPE, stderr=PIPE,
         check=False).stdout.decode('UTF-8').rstrip("\n")
-SAMPLE_EIF = "vsock-sample-server-" + ARCH + ".eif"
-SIGNED_EIF = "vsock-sample-server-" + ARCH + "-signed.eif"
+SAMPLE_EIF = "hello.eif"
+SIGNED_EIF = "hello-signed.eif"
 SIGN_CERT = "cert.pem"
 
 
diff --git a/tests/tests.rs b/tests/tests.rs
index d2944308..2c129a1d 100644
--- a/tests/tests.rs
+++ b/tests/tests.rs
@@ -34,12 +34,28 @@ mod tests {
     use openssl::x509::{X509Name, X509};
 
     // Remote Docker image
+    const SAMPLE_DOCKER: &str = "public.ecr.aws/aws-nitro-enclaves/hello:v1";
+
     #[cfg(target_arch = "x86_64")]
-    const SAMPLE_DOCKER: &str =
-        "667861386598.dkr.ecr.us-east-1.amazonaws.com/enclaves-samples:vsock-sample-server-x86_64";
+    mod sample_docker_pcrs {
+        /// PCR0
+        pub const IMAGE_PCR: &str = "7f3287dd1c4dbc49513abfaabc7f6afe79ab8269743c0c4ee55bb9e92d4f0a36f0cae7c0356d0bfec78b59b4d20c689c";
+        /// PCR1
+        pub const KERNEL_PCR: &str = "bcdf05fefccaa8e55bf2c8d6dee9e79bbff31e34bf28a99aa19e6b29c37ee80b214a414b7607236edf26fcb78654e63f";
+        /// PCR2
+        pub const APP_PCR: &str = "dd61366a5424eea46f60c4e9d59e6c645a46420ccf962550ee1f3c109d230f88ec23667617aeaac425a1f50fe8e384d7";
+    }
+
     #[cfg(target_arch = "aarch64")]
-    const SAMPLE_DOCKER: &str =
-        "667861386598.dkr.ecr.us-east-1.amazonaws.com/enclaves-samples:vsock-sample-server-aarch64";
+    mod sample_docker_pcrs {
+        /// PCR0
+        pub const IMAGE_PCR: &str = "b32a774b09fff4324a6405dacf3f5aa462a75e554e3a563ee64708abd585456bb480fdf70b2e2c2ab9ec205717bc690e";
+        /// PCR1
+        pub const KERNEL_PCR: &str = "5d3938eb05288e20a981038b1861062ff4174884968a39aee5982b312894e60561883576cc7381d1a7d05b809936bd16";
+        /// PCR2
+        pub const APP_PCR: &str = "9397173aa14e47fe087e8aeb63928a233db048e290830de6ce2041f4580f83b599c48432467601bed8a4883e9d94ff10";
+    }
+
     // Local Docker image
     const COMMAND_EXECUTER_DOCKER: &str = "command_executer:eif";
 
@@ -50,8 +66,7 @@ mod tests {
 
     fn setup_env() {
         if std::env::var("NITRO_CLI_BLOBS").is_err() {
-            let home = std::env::var("HOME").unwrap();
-            std::env::set_var("NITRO_CLI_BLOBS", format!("{}/.nitro_cli/prebuilt", home));
+            std::env::set_var("NITRO_CLI_BLOBS", "/usr/share/nitro_enclaves/blobs");
         }
     }
 
@@ -102,35 +117,17 @@ mod tests {
         )
         .expect("Docker build failed")
         .1;
-        #[cfg(target_arch = "x86_64")]
         assert_eq!(
             measurements.get("PCR0").unwrap(),
-            "c22753ee2f1733872a86fbeb8656625f126dc57fe55609155678d15a71dc9543583fc129c051cef12045adaee8795803"
+            sample_docker_pcrs::IMAGE_PCR
         );
-        #[cfg(target_arch = "aarch64")]
-        assert_eq!(
-            measurements.get("PCR0").unwrap(),
-            "adf436d453f5dc7f805ca4c867ea3d639955838d7649c293ae8c3feb9c769c3391a11c502ef304bc2968bbd3d7a4f25e"
-        );
-        #[cfg(target_arch = "x86_64")]
-        assert_eq!(
-            measurements.get("PCR1").unwrap(),
-            "bcdf05fefccaa8e55bf2c8d6dee9e79bbff31e34bf28a99aa19e6b29c37ee80b214a414b7607236edf26fcb78654e63f"
-        );
-        #[cfg(target_arch = "aarch64")]
         assert_eq!(
             measurements.get("PCR1").unwrap(),
-            "5d3938eb05288e20a981038b1861062ff4174884968a39aee5982b312894e60561883576cc7381d1a7d05b809936bd16"
+            sample_docker_pcrs::KERNEL_PCR
         );
-        #[cfg(target_arch = "x86_64")]
         assert_eq!(
             measurements.get("PCR2").unwrap(),
-            "10ffd6773d365539696fa3520c28312cf657152fc3f89538d02af5e8b579e964a9f9a5c763470a122763f4fd0a1dd2d7"
-        );
-        #[cfg(target_arch = "aarch64")]
-        assert_eq!(
-            measurements.get("PCR2").unwrap(),
-            "28737c9aa5d964c0daaddd1460b7b50c46788f1c037aa6317d66b3eb95823840c0ae774e6ee744deb8293265d97bbd1f"
+            sample_docker_pcrs::APP_PCR
         );
     }
 
@@ -266,35 +263,18 @@ mod tests {
         )
         .expect("Docker build failed")
         .1;
-        #[cfg(target_arch = "x86_64")]
-        assert_eq!(
-            measurements.get("PCR0").unwrap(),
-            "c22753ee2f1733872a86fbeb8656625f126dc57fe55609155678d15a71dc9543583fc129c051cef12045adaee8795803"
-        );
-        #[cfg(target_arch = "aarch64")]
+
         assert_eq!(
             measurements.get("PCR0").unwrap(),
-            "adf436d453f5dc7f805ca4c867ea3d639955838d7649c293ae8c3feb9c769c3391a11c502ef304bc2968bbd3d7a4f25e"
-        );
-        #[cfg(target_arch = "x86_64")]
-        assert_eq!(
-            measurements.get("PCR1").unwrap(),
-            "bcdf05fefccaa8e55bf2c8d6dee9e79bbff31e34bf28a99aa19e6b29c37ee80b214a414b7607236edf26fcb78654e63f"
+            sample_docker_pcrs::IMAGE_PCR
         );
-        #[cfg(target_arch = "aarch64")]
         assert_eq!(
             measurements.get("PCR1").unwrap(),
-            "5d3938eb05288e20a981038b1861062ff4174884968a39aee5982b312894e60561883576cc7381d1a7d05b809936bd16"
-        );
-        #[cfg(target_arch = "x86_64")]
-        assert_eq!(
-            measurements.get("PCR2").unwrap(),
-            "10ffd6773d365539696fa3520c28312cf657152fc3f89538d02af5e8b579e964a9f9a5c763470a122763f4fd0a1dd2d7"
+            sample_docker_pcrs::KERNEL_PCR
         );
-        #[cfg(target_arch = "aarch64")]
         assert_eq!(
             measurements.get("PCR2").unwrap(),
-            "28737c9aa5d964c0daaddd1460b7b50c46788f1c037aa6317d66b3eb95823840c0ae774e6ee744deb8293265d97bbd1f"
+            sample_docker_pcrs::APP_PCR
         );
     }
 
@@ -332,7 +312,7 @@ mod tests {
             cpu_ids: None,
             cpu_count: Some(2),
             memory_mib: 128,
-            debug_mode: Some(true),
+            debug_mode: true,
             attach_console: false,
             enclave_name: Some("testName".to_string()),
         };
@@ -378,7 +358,7 @@ mod tests {
             cpu_ids: None,
             cpu_count: Some(2),
             memory_mib: 256,
-            debug_mode: Some(true),
+            debug_mode: true,
             attach_console: false,
             enclave_name: Some("testName".to_string()),
         };
@@ -419,7 +399,7 @@ mod tests {
             cpu_ids: None,
             cpu_count: Some(2),
             memory_mib: 2046,
-            debug_mode: Some(true),
+            debug_mode: true,
             attach_console: false,
             enclave_name: Some("testName".to_string()),
         };
@@ -443,10 +423,11 @@ mod tests {
             assert_eq!(req_enclave_cid, enclave_cid);
         }
 
-        match debug_mode {
-            Some(true) => assert_eq!(enclave_flags & NE_ENCLAVE_DEBUG_MODE, NE_ENCLAVE_DEBUG_MODE),
-            _ => assert_eq!(enclave_flags & NE_ENCLAVE_DEBUG_MODE, 0),
-        };
+        if debug_mode {
+            assert_eq!(enclave_flags & NE_ENCLAVE_DEBUG_MODE, NE_ENCLAVE_DEBUG_MODE);
+        } else {
+            assert_eq!(enclave_flags & NE_ENCLAVE_DEBUG_MODE, 0);
+        }
 
         let cid_copy = enclave_cid;
 
@@ -475,10 +456,11 @@ mod tests {
         assert_eq!(reply.memory_mib, req_mem_size);
         assert_eq!({ reply.cpu_count }, req_nr_cpus);
         assert_eq!(reply.state, "RUNNING");
-        match debug_mode {
-            Some(true) => assert_eq!(flags, "DEBUG_MODE"),
-            _ => assert_eq!(flags, "NONE"),
-        };
+        if debug_mode {
+            assert_eq!(flags, "DEBUG_MODE");
+        } else {
+            assert_eq!(flags, "NONE");
+        }
         let _enclave_id = generate_enclave_id(0).expect("Describe enclaves failed");
 
         terminate_enclaves(&mut enclave_manager, None).expect("Terminate enclaves failed");
@@ -524,7 +506,7 @@ mod tests {
             cpu_ids: None,
             cpu_count: Some(2),
             memory_mib: 128,
-            debug_mode: Some(true),
+            debug_mode: true,
             attach_console: false,
             enclave_name: Some("testName".to_string()),
         };
@@ -566,7 +548,7 @@ mod tests {
             cpu_ids: None,
             cpu_count: Some(2),
             memory_mib: 128,
-            debug_mode: Some(false),
+            debug_mode: false,
             attach_console: false,
             enclave_name: Some("testName".to_string()),
         };
@@ -579,9 +561,10 @@ mod tests {
             .get_console_resources_enclave_flags()
             .unwrap();
 
-        match run_args.debug_mode {
-            Some(true) => assert_eq!(enclave_flags & NE_ENCLAVE_DEBUG_MODE, NE_ENCLAVE_DEBUG_MODE),
-            _ => assert_eq!(enclave_flags & NE_ENCLAVE_DEBUG_MODE, 0),
+        if run_args.debug_mode {
+            assert_eq!(enclave_flags & NE_ENCLAVE_DEBUG_MODE, NE_ENCLAVE_DEBUG_MODE);
+        } else {
+            assert_eq!(enclave_flags & NE_ENCLAVE_DEBUG_MODE, 0);
         };
 
         let info = get_enclave_describe_info(&enclave_manager, false).unwrap();
@@ -627,7 +610,7 @@ mod tests {
             cpu_ids: None,
             cpu_count: Some(2),
             memory_mib: 128,
-            debug_mode: Some(true),
+            debug_mode: true,
             attach_console: false,
             enclave_name: Some("testName".to_string()),
         };
@@ -640,10 +623,11 @@ mod tests {
             .get_console_resources_enclave_flags()
             .unwrap();
 
-        match run_args.debug_mode {
-            Some(true) => assert_eq!(enclave_flags & NE_ENCLAVE_DEBUG_MODE, NE_ENCLAVE_DEBUG_MODE),
-            _ => assert_eq!(enclave_flags & NE_ENCLAVE_DEBUG_MODE, 0),
-        };
+        if run_args.debug_mode {
+            assert_eq!(enclave_flags & NE_ENCLAVE_DEBUG_MODE, NE_ENCLAVE_DEBUG_MODE);
+        } else {
+            assert_eq!(enclave_flags & NE_ENCLAVE_DEBUG_MODE, 0);
+        }
 
         let info = get_enclave_describe_info(&enclave_manager, false).unwrap();
         let replies: Vec = vec![info];
@@ -717,7 +701,7 @@ mod tests {
             cpu_ids: None,
             cpu_count: Some(2),
             memory_mib: 128,
-            debug_mode: Some(true),
+            debug_mode: true,
             attach_console: false,
             enclave_name: Some("testName".to_string()),
         };
@@ -740,38 +724,19 @@ mod tests {
 
         get_enclave_describe_info(&enclave_manager, false).unwrap();
         let build_info = enclave_manager.get_measurements().unwrap();
-        let enclave_name = enclave_manager.enclave_name.clone();
+        let measurements = build_info.measurements;
 
-        assert_eq!(enclave_name, "testName");
-        #[cfg(target_arch = "x86_64")]
         assert_eq!(
-            build_info.measurements.get(&"PCR0".to_string()).unwrap(),
-            "c22753ee2f1733872a86fbeb8656625f126dc57fe55609155678d15a71dc9543583fc129c051cef12045adaee8795803"
-        );
-        #[cfg(target_arch = "aarch64")]
-        assert_eq!(
-            build_info.measurements.get(&"PCR0".to_string()).unwrap(),
-            "adf436d453f5dc7f805ca4c867ea3d639955838d7649c293ae8c3feb9c769c3391a11c502ef304bc2968bbd3d7a4f25e"
-        );
-        #[cfg(target_arch = "x86_64")]
-        assert_eq!(
-            build_info.measurements.get(&"PCR1".to_string()).unwrap(),
-            "bcdf05fefccaa8e55bf2c8d6dee9e79bbff31e34bf28a99aa19e6b29c37ee80b214a414b7607236edf26fcb78654e63f"
-        );
-        #[cfg(target_arch = "aarch64")]
-        assert_eq!(
-            build_info.measurements.get(&"PCR1".to_string()).unwrap(),
-            "5d3938eb05288e20a981038b1861062ff4174884968a39aee5982b312894e60561883576cc7381d1a7d05b809936bd16"
+            measurements.get("PCR0").unwrap(),
+            sample_docker_pcrs::IMAGE_PCR
         );
-        #[cfg(target_arch = "x86_64")]
         assert_eq!(
-            build_info.measurements.get(&"PCR2".to_string()).unwrap(),
-            "10ffd6773d365539696fa3520c28312cf657152fc3f89538d02af5e8b579e964a9f9a5c763470a122763f4fd0a1dd2d7"
+            measurements.get("PCR1").unwrap(),
+            sample_docker_pcrs::KERNEL_PCR
         );
-        #[cfg(target_arch = "aarch64")]
         assert_eq!(
-            build_info.measurements.get(&"PCR2".to_string()).unwrap(),
-            "28737c9aa5d964c0daaddd1460b7b50c46788f1c037aa6317d66b3eb95823840c0ae774e6ee744deb8293265d97bbd1f"
+            measurements.get("PCR2").unwrap(),
+            sample_docker_pcrs::APP_PCR
         );
 
         let _enclave_id = generate_enclave_id(0).expect("Describe enclaves failed");
@@ -827,7 +792,7 @@ mod tests {
             cpu_ids: None,
             cpu_count: Some(2),
             memory_mib: 128,
-            debug_mode: Some(true),
+            debug_mode: true,
             attach_console: false,
             enclave_name: Some("testName".to_string()),
         };
@@ -858,17 +823,7 @@ mod tests {
             metadata.build_info.build_tool_version,
             env!("CARGO_PKG_VERSION")
         );
-        #[cfg(target_arch = "x86_64")]
-        assert_eq!(
-            *metadata
-                .docker_info
-                .get("RepoTags")
-                .unwrap()
-                .get(0)
-                .unwrap(),
-            json!("667861386598.dkr.ecr.us-east-1.amazonaws.com/enclaves-samples:vsock-sample-server-x86_64")
-        );
-        #[cfg(target_arch = "aarch64")]
+
         assert_eq!(
             *metadata
                 .docker_info
@@ -876,8 +831,9 @@ mod tests {
                 .unwrap()
                 .get(0)
                 .unwrap(),
-            json!("667861386598.dkr.ecr.us-east-1.amazonaws.com/enclaves-samples:vsock-sample-server-aarch64")
+            json!("public.ecr.aws/aws-nitro-enclaves/hello:v1")
         );
+
         assert_eq!(
             *metadata.custom_info.get("AppVersion").unwrap(),
             json!("3.2")
@@ -930,7 +886,7 @@ mod tests {
             cpu_ids: None,
             cpu_count: Some(2),
             memory_mib: 128,
-            debug_mode: Some(true),
+            debug_mode: true,
             attach_console: false,
             enclave_name: None,
         };
@@ -960,7 +916,7 @@ mod tests {
             cpu_ids: None,
             cpu_count: Some(2),
             memory_mib: 128,
-            debug_mode: Some(true),
+            debug_mode: true,
             attach_console: false,
             enclave_name: Some("enclaveName".to_string()),
         };
diff --git a/tools/Dockerfile b/tools/Dockerfile
new file mode 100644
index 00000000..01498fb3
--- /dev/null
+++ b/tools/Dockerfile
@@ -0,0 +1,61 @@
+FROM public.ecr.aws/ubuntu/ubuntu:20.04
+
+SHELL ["/bin/bash", "-c"]
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+# Install rust toolchain and its dependencies
+RUN apt-get update && \
+	apt-get install -y curl unzip jq make
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain none
+RUN echo "source $HOME/.cargo/env" >> $HOME/.bashrc
+
+# Install dependencies to be able to use musl target to produce statically
+# linked binaries.
+RUN apt-get update && \
+	apt-get install -y gcc libssl-dev pkg-config musl-tools
+
+# Install bindgen dependencies
+RUN apt-get update && \
+	apt-get install -y llvm-dev libclang-dev clang
+
+# Build static version of Openssl.
+ENV OPENSSL_VERSION=OpenSSL_1_1_1q
+RUN mkdir /tmp/openssl_src
+RUN curl -L https://github.com/openssl/openssl/archive/${OPENSSL_VERSION}.zip -o /tmp/openssl_src/openssl.zip
+RUN unzip /tmp/openssl_src/openssl.zip -d /tmp/openssl_src
+RUN cd /tmp/openssl_src/openssl-${OPENSSL_VERSION} &&  \
+	CC=musl-gcc CFLAGS=-fPIC ./Configure --prefix=/musl_openssl --openssldir=/musl_openssl no-shared no-engine no-afalgeng linux-$(uname -m) -DOPENSSL_NO_SECURE_MEMORY no-tests && \
+	make -j$(nproc) && \
+	make install_sw
+
+# Setup the right rust ver
+ENV RUST_VERSION=1.60.0
+RUN  source $HOME/.cargo/env && \
+	ARCH=$(uname -m) && \
+	rustup toolchain install ${RUST_VERSION}-${ARCH}-unknown-linux-gnu && \
+	rustup default ${RUST_VERSION}-${ARCH}-unknown-linux-gnu && \
+	rustup target add --toolchain ${RUST_VERSION} ${ARCH}-unknown-linux-musl && \
+	cargo install cargo-audit --version 0.16.0 --locked &&  \
+	cargo install cargo-about --version 0.5.1 --locked
+
+# Install docker for nitro-cli build-enclave runs
+RUN apt-get update && \
+    apt-get -y install apt-transport-https \
+        ca-certificates \
+        curl \
+        gnupg2 \
+        software-properties-common && \
+    curl -fsSL https://download.docker.com/linux/$(. /etc/os-release; echo "$ID")/gpg > /tmp/dkey; apt-key add /tmp/dkey && \
+    ARCH=$(uname -m) && \
+    if [ ${ARCH} == "x86_64" ] ; then ARCH="amd64"; elif [ ${ARCH} == "aarch64" ] ; then ARCH="arm64" ; fi && \
+    add-apt-repository \
+        "deb [arch=${ARCH}] https://download.docker.com/linux/$(. /etc/os-release; echo "$ID") \
+        $(lsb_release -cs) \
+        stable" && \
+    apt-get -y install docker-ce
+
+# Setup the env for nitro-cli
+RUN mkdir -p /var/log/nitro_enclaves
+
+RUN echo "Container build ready to go"
diff --git a/tools/Dockerfile1804.aarch64 b/tools/Dockerfile1804.aarch64
deleted file mode 100644
index 013cedb9..00000000
--- a/tools/Dockerfile1804.aarch64
+++ /dev/null
@@ -1,64 +0,0 @@
-FROM ubuntu:18.04
-
-SHELL ["/bin/bash", "-c"]
-RUN apt-get update
-
-# Install rust toolchain and its dependencies
-RUN apt-get install -y curl
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-RUN echo "source $HOME/.cargo/env" >> $HOME/.bashrc
-
-# Install dependencies to be able to use musl target to produce statically
-# linked binaries.
-RUN apt-get install -y gcc libssl-dev
-RUN apt-get install -y pkg-config
-RUN apt-get install -y musl-tools
-
-# Install bindgen dependencies
-RUN apt-get update && apt-get install -y llvm-dev
-RUN apt-get update && apt-get install -y libclang-dev
-RUN apt-get update && apt-get install -y clang
-
-# Build static version of Openssl.
-RUN apt-get install -y wget unzip
-ENV OPENSSL_VERSION=OpenSSL_1_1_1l
-RUN mkdir /openssl_src
-RUN wget https://github.com/openssl/openssl/archive/${OPENSSL_VERSION}.zip -P /openssl_src
-RUN unzip /openssl_src/${OPENSSL_VERSION}.zip -d /openssl_src
-RUN cd /openssl_src/openssl-${OPENSSL_VERSION} && CC=musl-gcc CFLAGS=-fPIC ./Configure --prefix=/musl_openssl --openssldir=/musl_openssl no-shared no-engine no-afalgeng linux-aarch64 -DOPENSSL_NO_SECURE_MEMORY && make && make install
-
-# Setup the right rust ver
-ENV RUST_VERSION=1.49.0
-RUN  source $HOME/.cargo/env && \
-     rustup toolchain install ${RUST_VERSION}-aarch64-unknown-linux-gnu
-RUN  source $HOME/.cargo/env && \
-    rustup default ${RUST_VERSION}-aarch64-unknown-linux-gnu
-RUN  source $HOME/.cargo/env && \
-    rustup target add --toolchain ${RUST_VERSION} aarch64-unknown-linux-musl
-RUN  source $HOME/.cargo/env && \
-     rustup toolchain install 1.57-aarch64-unknown-linux-gnu
-RUN  source $HOME/.cargo/env && \
-    cargo +1.57 install cargo-audit --version 0.16.0 --locked
-RUN  source $HOME/.cargo/env && \
-    cargo +1.57 install cargo-about --version 0.4.3 --locked
-RUN apt-get install -y jq
-
-# Install docker for nitro-cli build-enclave runs
-RUN apt-get update && \
-    apt-get -y install apt-transport-https \
-        ca-certificates \
-        curl \
-        gnupg2 \
-        software-properties-common && \
-    curl -fsSL https://download.docker.com/linux/$(. /etc/os-release; echo "$ID")/gpg > /tmp/dkey; apt-key add /tmp/dkey && \
-    add-apt-repository \
-        "deb [arch=arm64] https://download.docker.com/linux/$(. /etc/os-release; echo "$ID") \
-        $(lsb_release -cs) \
-        stable" && \
-    apt-get update && \
-    apt-get -y install docker-ce
-
-# Setup the env for nitro-cli
-RUN mkdir -p /var/log/nitro_enclaves
-
-RUN echo "Container build ready to go"
diff --git a/tools/Dockerfile1804.x86_64 b/tools/Dockerfile1804.x86_64
deleted file mode 100644
index 3433a412..00000000
--- a/tools/Dockerfile1804.x86_64
+++ /dev/null
@@ -1,64 +0,0 @@
-FROM ubuntu:18.04
-
-SHELL ["/bin/bash", "-c"]
-RUN apt-get update
-
-# Install rust toolchain and its dependencies
-RUN apt-get install -y curl
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-RUN echo "source $HOME/.cargo/env" >> $HOME/.bashrc
-
-# Install dependencies to be able to use musl target to produce statically
-# linked binaries.
-RUN apt-get install -y gcc libssl-dev
-RUN apt-get install -y pkg-config
-RUN apt-get install -y musl-tools
-
-# Install bindgen dependencies
-RUN apt-get update && apt-get install -y llvm-dev
-RUN apt-get update && apt-get install -y libclang-dev
-RUN apt-get update && apt-get install -y clang
-
-# Build static version of Openssl.
-RUN apt-get install -y wget unzip
-ENV OPENSSL_VERSION=OpenSSL_1_1_1l
-RUN mkdir /openssl_src
-RUN wget https://github.com/openssl/openssl/archive/${OPENSSL_VERSION}.zip -P /openssl_src
-RUN unzip /openssl_src/${OPENSSL_VERSION}.zip -d /openssl_src
-RUN cd /openssl_src/openssl-${OPENSSL_VERSION} && CC=musl-gcc CFLAGS=-fPIC ./Configure --prefix=/musl_openssl --openssldir=/musl_openssl no-shared no-engine no-afalgeng linux-x86_64 -DOPENSSL_NO_SECURE_MEMORY && make && make install
-
-# Setup the right rust ver
-ENV RUST_VERSION=1.49.0
-RUN  source $HOME/.cargo/env && \
-     rustup toolchain install ${RUST_VERSION}-x86_64-unknown-linux-gnu
-RUN  source $HOME/.cargo/env && \
-    rustup default ${RUST_VERSION}-x86_64-unknown-linux-gnu
-RUN  source $HOME/.cargo/env && \
-    rustup target add --toolchain ${RUST_VERSION} x86_64-unknown-linux-musl
-RUN  source $HOME/.cargo/env && \
-     rustup toolchain install 1.57-x86_64-unknown-linux-gnu
-RUN  source $HOME/.cargo/env && \
-	cargo +1.57 install cargo-audit --version 0.16.0 --locked
-RUN  source $HOME/.cargo/env && \
-	cargo +1.57 install cargo-about --version 0.4.3 --locked
-RUN apt-get install -y jq
-
-# Install docker for nitro-cli build-enclave runs
-RUN apt-get update && \
-    apt-get -y install apt-transport-https \
-        ca-certificates \
-        curl \
-        gnupg2 \
-        software-properties-common && \
-    curl -fsSL https://download.docker.com/linux/$(. /etc/os-release; echo "$ID")/gpg > /tmp/dkey; apt-key add /tmp/dkey && \
-    add-apt-repository \
-        "deb [arch=amd64] https://download.docker.com/linux/$(. /etc/os-release; echo "$ID") \
-        $(lsb_release -cs) \
-        stable" && \
-    apt-get update && \
-    apt-get -y install docker-ce
-
-# Setup the env for nitro-cli
-RUN mkdir -p /var/log/nitro_enclaves
-
-RUN echo "Container build ready to go"
diff --git a/vsock_proxy/Cargo.lock b/vsock_proxy/Cargo.lock
deleted file mode 100644
index 78dc37b0..00000000
--- a/vsock_proxy/Cargo.lock
+++ /dev/null
@@ -1,496 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "aho-corasick"
-version = "0.7.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "ansi_term"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "atty"
-version = "0.2.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
-[[package]]
-name = "bitflags"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-
-[[package]]
-name = "c2-chacha"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
-dependencies = [
- "ppv-lite86",
-]
-
-[[package]]
-name = "cc"
-version = "1.0.47"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa87058dce70a3ff5621797f1506cb837edd02ac4c0ae642b4542dce802908b8"
-
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "clap"
-version = "2.33.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
-dependencies = [
- "ansi_term",
- "atty",
- "bitflags",
- "strsim",
- "textwrap",
- "unicode-width",
- "vec_map",
-]
-
-[[package]]
-name = "dns-lookup"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13988670860b076248c74e1b54444efc4f1dec70c8bb25da4b7c0024396b72bf"
-dependencies = [
- "libc",
- "socket2",
- "winapi",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
-dependencies = [
- "atty",
- "humantime",
- "log",
- "regex",
- "termcolor",
-]
-
-[[package]]
-name = "fastrand"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf"
-dependencies = [
- "instant",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407"
-dependencies = [
- "cfg-if 0.1.10",
- "libc",
- "wasi",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "humantime"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
-dependencies = [
- "quick-error",
-]
-
-[[package]]
-name = "idna"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
-dependencies = [
- "matches",
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "libc"
-version = "0.2.126"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
-
-[[package]]
-name = "linked-hash-map"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
-
-[[package]]
-name = "log"
-version = "0.4.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "matches"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
-
-[[package]]
-name = "maybe-uninit"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
-
-[[package]]
-name = "memchr"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
-
-[[package]]
-name = "memoffset"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "nix"
-version = "0.23.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6"
-dependencies = [
- "bitflags",
- "cc",
- "cfg-if 1.0.0",
- "libc",
- "memoffset",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
-
-[[package]]
-name = "quick-error"
-version = "1.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
-
-[[package]]
-name = "rand"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412"
-dependencies = [
- "getrandom",
- "libc",
- "rand_chacha",
- "rand_core",
- "rand_hc",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
-dependencies = [
- "c2-chacha",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "regex"
-version = "1.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64"
-
-[[package]]
-name = "remove_dir_all"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "smallvec"
-version = "0.6.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0"
-dependencies = [
- "maybe-uninit",
-]
-
-[[package]]
-name = "socket2"
-version = "0.3.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "strsim"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-
-[[package]]
-name = "tempfile"
-version = "3.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
-dependencies = [
- "cfg-if 1.0.0",
- "fastrand",
- "libc",
- "redox_syscall",
- "remove_dir_all",
- "winapi",
-]
-
-[[package]]
-name = "termcolor"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "textwrap"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-dependencies = [
- "unicode-width",
-]
-
-[[package]]
-name = "threadpool"
-version = "1.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2f0c90a5f3459330ac8bc0d2f879c693bb7a2f59689c1083fc4ef83834da865"
-dependencies = [
- "num_cpus",
-]
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
-dependencies = [
- "matches",
-]
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09c8070a9942f5e7cfccd93f490fdebd230ee3c3c9f107cb25bad5351ef671cf"
-dependencies = [
- "smallvec",
-]
-
-[[package]]
-name = "unicode-width"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20"
-
-[[package]]
-name = "vec_map"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
-
-[[package]]
-name = "vsock"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e32675ee2b3ce5df274c0ab52d19b28789632406277ca26bffee79a8e27dc133"
-dependencies = [
- "libc",
- "nix",
-]
-
-[[package]]
-name = "vsock-proxy"
-version = "0.1.0"
-dependencies = [
- "clap",
- "dns-lookup",
- "env_logger",
- "idna",
- "log",
- "nix",
- "rand",
- "tempfile",
- "threadpool",
- "vsock",
- "yaml-rust",
-]
-
-[[package]]
-name = "wasi"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d"
-
-[[package]]
-name = "winapi"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "yaml-rust"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
-dependencies = [
- "linked-hash-map",
-]
diff --git a/vsock_proxy/Cargo.toml b/vsock_proxy/Cargo.toml
index 0755c0a1..e180b09c 100644
--- a/vsock_proxy/Cargo.toml
+++ b/vsock_proxy/Cargo.toml
@@ -3,20 +3,21 @@ name = "vsock-proxy"
 version = "0.1.0"
 authors = ["The AWS Nitro Enclaves Team "]
 edition = "2018"
+rust-version = "1.60"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-clap = "2.33"
+clap = "3.2"
 dns-lookup = "1.0.1"
-env_logger = "0.7"
-idna = "0.2.0"
+env_logger = "0.10"
+idna = "0.3.0"
 log = "0.4"
-nix = "0.23"
+nix = "0.26"
 yaml-rust = "0.4.3"
 threadpool = "1.7.1"
-vsock = "0.2"
+vsock = "0.3"
 
 [dev-dependencies]
-rand = "0.7.0"
-tempfile = "3.1.0"
+rand = "0.8.5"
+tempfile = "3.5.0"
diff --git a/vsock_proxy/configs/vsock-proxy.yaml b/vsock_proxy/configs/vsock-proxy.yaml
index 21ffd71b..df5b3c25 100644
--- a/vsock_proxy/configs/vsock-proxy.yaml
+++ b/vsock_proxy/configs/vsock-proxy.yaml
@@ -19,6 +19,8 @@ allowlist:
 - {address: kms-fips.ap-northeast-2.amazonaws.com, port: 443}
 - {address: kms.ap-northeast-1.amazonaws.com, port: 443}
 - {address: kms-fips.ap-northeast-1.amazonaws.com, port: 443}
+- {address: kms.ap-southeast-3.amazonaws.com, port: 443}
+- {address: kms-fips.ap-southeast-3.amazonaws.com, port: 443}
 - {address: kms.ap-southeast-2.amazonaws.com, port: 443}
 - {address: kms-fips.ap-southeast-2.amazonaws.com, port: 443}
 - {address: kms.ap-southeast-1.amazonaws.com, port: 443}
diff --git a/vsock_proxy/src/main.rs b/vsock_proxy/src/main.rs
index 4db2df77..b66a68e3 100644
--- a/vsock_proxy/src/main.rs
+++ b/vsock_proxy/src/main.rs
@@ -20,14 +20,14 @@ fn main() -> VsockProxyResult<()> {
         .setting(AppSettings::DisableVersion)
         .arg(
             Arg::with_name("ipv4")
-                .short("4")
+                .short('4')
                 .long("ipv4")
                 .help("Force the proxy to use IPv4 addresses only.")
                 .required(false),
         )
         .arg(
             Arg::with_name("ipv6")
-                .short("6")
+                .short('6')
                 .long("ipv6")
                 .help("Force the proxy to use IPv6 addresses only.")
                 .required(false)
@@ -35,7 +35,7 @@ fn main() -> VsockProxyResult<()> {
         )
         .arg(
             Arg::with_name("workers")
-                .short("w")
+                .short('w')
                 .long("num_workers")
                 .help("Set the maximum number of simultaneous\nconnections supported.")
                 .required(false)
diff --git a/vsock_proxy/src/starter.rs b/vsock_proxy/src/starter.rs
index c23444c2..7684425e 100644
--- a/vsock_proxy/src/starter.rs
+++ b/vsock_proxy/src/starter.rs
@@ -15,8 +15,7 @@ use std::io::{Read, Write};
 use std::net::{IpAddr, SocketAddr, TcpStream};
 use std::os::unix::io::AsRawFd;
 use threadpool::ThreadPool;
-use vsock::SockAddr;
-use vsock::VsockListener;
+use vsock::{VsockAddr, VsockListener};
 use yaml_rust::YamlLoader;
 
 const BUFF_SIZE: usize = 8192;
@@ -162,7 +161,7 @@ impl Proxy {
     /// Creates a listening socket
     /// Returns the file descriptor for it or the appropriate error
     pub fn sock_listen(&self) -> VsockProxyResult {
-        let sockaddr = SockAddr::new_vsock(VSOCK_PROXY_CID, self.local_port);
+        let sockaddr = VsockAddr::new(VSOCK_PROXY_CID, self.local_port);
         let listener = VsockListener::bind(&sockaddr)
             .map_err(|_| format!("Could not bind to {:?}", sockaddr))?;
         info!("Bound to {:?}", sockaddr);
diff --git a/vsock_proxy/tests/connection_test.rs b/vsock_proxy/tests/connection_test.rs
index 1e4fe19f..000a3ca3 100644
--- a/vsock_proxy/tests/connection_test.rs
+++ b/vsock_proxy/tests/connection_test.rs
@@ -9,12 +9,12 @@ use std::str;
 use std::sync::mpsc;
 use std::thread;
 use tempfile::NamedTempFile;
-use vsock::{SockAddr, VsockStream};
+use vsock::{VsockAddr, VsockStream};
 
 use vsock_proxy::starter::Proxy;
 
 fn vsock_connect(port: u32) -> VsockStream {
-    let sockaddr = SockAddr::new_vsock(vsock_proxy::starter::VSOCK_PROXY_CID, port);
+    let sockaddr = VsockAddr::new(vsock_proxy::starter::VSOCK_PROXY_CID, port);
     VsockStream::connect(&sockaddr).expect("Could not connect")
 }