Update Rust toolchain to nightly-2021-09-20 and std to 1.56.1 (#53)

Co-authored-by: rmheng <2961930359@qq.com>
Co-authored-by: Mingshen Sun <bob@mssun.me>

.github/workflows/ci.yml

@@ -24,7 +24,7 @@ defaults:
 jobs:
  build-and-run-examples:
  runs-on: ubuntu-20.04
- container: teaclave/teaclave-trustzone-sdk-build:0.2.2
+ container: teaclave/teaclave-trustzone-sdk-build:0.3.0
  steps:
  - name: Checkout repository
  uses: actions/checkout@v2
@@ -40,14 +40,16 @@ jobs:
  source environment &&
  make optee &&
  . ~/.cargo/env &&
- rustup default nightly-2019-07-08 &&
+ rustup component add rust-src &&
+ rustup target install aarch64-unknown-linux-gnu arm-unknown-linux-gnueabihf &&
+ rustup default nightly-2021-09-20 &&
  make examples
  - name: Run tests and examples
  run: |
  cd ci && ./ci.sh
  build-utee-teec:
  runs-on: ubuntu-20.04
- container: teaclave/teaclave-trustzone-sdk-build:0.2.2
+ container: teaclave/teaclave-trustzone-sdk-build:0.3.0
  steps:
  - name: Checkout repository
  uses: actions/checkout@v2
@@ -63,12 +65,14 @@ jobs:
  source environment &&
  make optee &&
  . ~/.cargo/env &&
- rustup default nightly-2019-07-08 &&
+ rustup component add rust-src &&
+ rustup target install aarch64-unknown-linux-gnu arm-unknown-linux-gnueabihf &&
+ rustup default nightly-2021-09-20 &&
  (cd optee-utee && xargo build --target aarch64-unknown-optee-trustzone -vv) &&
  (cd optee-teec && cargo build --target aarch64-unknown-linux-gnu -vv)
  build-and-run-examples-in-OPTEE-repo:
  runs-on: ubuntu-20.04
- container: teaclave/teaclave-trustzone-sdk-build:0.2.2
+ container: teaclave/teaclave-trustzone-sdk-build:0.3.0
  steps:
  - name: Checkout OP-TEE repository
  run: |
@@ -77,7 +81,7 @@ jobs:
  export PATH=~/bin:$PATH
  mkdir optee-qemuv8 && cd optee-qemuv8 &&
  repo init -u https://github.com/OP-TEE/manifest.git -m qemu_v8.xml &&
- repo sync -j4 --no-clone-bundle 
+ repo sync -j4 --no-clone-bundle
  - name: Build images and run tests
  run: |
  cd optee-qemuv8
@@ -89,4 +93,4 @@ jobs:
  steps:
  - uses: actions/checkout@v2
  - name: Check License Header
- uses: apache/skywalking-eyes@main 
+ uses: apache/skywalking-eyes@main

.gitmodules

@@ -10,12 +10,12 @@
 [submodule "rust/rust"]
  path = rust/rust
  url = https://github.com/mesalock-linux/rust.git
- branch = optee-trustzone
+ branch = teaclave-trustzone-sdk-1.56.1
 [submodule "rust/libc"]
  path = rust/libc
  url = https://github.com/mesalock-linux/libc.git
- branch = optee-trustzone
+ branch = teaclave-trustzone-sdk-0.2.99
 [submodule "rust/compiler-builtins"]
  path = rust/compiler-builtins
  url = https://github.com/mesalock-linux/compiler-builtins.git
- branch = optee-trustzone
+ branch = teaclave-trustzone-sdk-0.1.44

Dockerfile

@@ -75,8 +75,11 @@ RUN apt-get update && \
  screen \
  libvdeplug-dev \
  libsdl2-dev \
+ pip \
  ca-certificates
 
+RUN pip install cryptography
+
 RUN apt-get install -y software-properties-common && \
  add-apt-repository ppa:linuxuprising/libpng12 && \
  apt-get update && \
@@ -85,10 +88,10 @@ RUN apt-get install -y software-properties-common && \
 # Install Rust
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y && \
  . $HOME/.cargo/env && \
- rustup default nightly-2019-07-08 && \
+ rustup default nightly-2021-09-20 && \
  rustup component add rust-src && \
  rustup target install aarch64-unknown-linux-gnu && \
  rustup default 1.44.0 && cargo +1.44.0 install xargo && \
- rustup default nightly-2019-07-08
+ rustup default nightly-2021-09-20
 
 ENV PATH="/root/.cargo/bin:$PATH"

examples/acipher-rs/ta/Xargo.toml

@@ -16,10 +16,10 @@
 # under the License.
 
 [dependencies.std]
-path = "../../../rust/rust/src/libstd"
+path = "../../../rust/rust/library/std"
 
 [patch.crates-io]
 libc = { path = "../../../rust/libc" }
 compiler_builtins = { path = "../../../rust/compiler-builtins" }
-rustc-std-workspace-core = { path = "../../../rust/rust/src/tools/rustc-std-workspace-core" }
-rustc-std-workspace-alloc = { path = "../../../rust/rust/src/tools/rustc-std-workspace-alloc" }
+rustc-std-workspace-core = { path = "../../../rust/rust/library/rustc-std-workspace-core" }
+rustc-std-workspace-alloc = { path = "../../../rust/rust/library/rustc-std-workspace-alloc" }