This is an automated email from the ASF dual-hosted git repository.
mssun pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-teaclave-trustzone-sdk.git
The following commit(s) were added to refs/heads/master by this push:
new edea771 Update to OPTEE 3.13.0 (#26)
edea771 is described below
commit edea771800773b2e8610de903cf3e3a612b2e87e
Author: BruceFan <[email protected]>
AuthorDate: Fri May 21 09:11:20 2021 +0800
Update to OPTEE 3.13.0 (#26)
---
Makefile | 11 +++++++++--
README.md | 6 +++---
docs/getting-started-with-optee-for-qemu-armv8.md | 4 ++--
optee/build | 2 +-
optee/optee_client | 2 +-
optee/optee_os | 2 +-
tests/optee-qemuv8.sh | 2 +-
tests/test_acipher.sh | 6 +++---
tests/test_aes.sh | 6 +++---
tests/test_authentication.sh | 6 +++---
tests/test_big_int.sh | 6 +++---
tests/test_diffie_hellman.sh | 6 +++---
tests/test_digest.sh | 6 +++---
tests/test_hello_world.sh | 6 +++---
tests/test_hotp.sh | 6 +++---
tests/test_message_passing_interface.sh | 6 +++---
tests/test_random.sh | 6 +++---
tests/test_secure_storage.sh | 6 +++---
tests/test_serde.sh | 6 +++---
tests/test_time.sh | 6 +++---
20 files changed, 57 insertions(+), 50 deletions(-)
diff --git a/Makefile b/Makefile
index a78f0df..9e156c2 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,9 @@ OPTEE_OS_PATH ?= $(OPTEE_PATH)/optee_os
OPTEE_CLIENT_PATH ?= $(OPTEE_PATH)/optee_client
VENDOR ?= qemu_v8.mk
+CCACHE ?= $(shell which ccache)
+AARCH_CROSS_COMPILE ?= $(OPTEE_PATH)/toolchains/aarch64/bin/aarch64-linux-gnu-
+
EXAMPLES = $(wildcard examples/*)
EXAMPLES_INSTALL = $(EXAMPLES:%=%-install)
EXAMPLES_CLEAN = $(EXAMPLES:%=%-clean)
@@ -25,8 +28,12 @@ toolchains:
optee-os:
make -C $(OPTEE_BUILD_PATH) -f $(VENDOR) optee-os
+OPTEE_CLIENT_FLAGS ?= CROSS_COMPILE="$(CCACHE) $(AARCH_CROSS_COMPILE)" \
+ CFG_TEE_BENCHMARK=n \
+ CFG_TA_TEST_PATH=y
+
optee-client:
- make -C $(OPTEE_BUILD_PATH) -f $(VENDOR) optee-client-common
+ make -C $(OPTEE_CLIENT_PATH) $(OPTEE_CLIENT_FLAGS)
examples: $(EXAMPLES) toolchains optee-os optee-client
$(EXAMPLES):
@@ -41,7 +48,7 @@ optee-os-clean:
make -C $(OPTEE_OS_PATH) O=out/arm clean
optee-client-clean:
- make -C $(OPTEE_BUILD_PATH) -f $(VENDOR) optee-client-clean-common
+ make -C $(OPTEE_CLIENT_PATH) $(OPTEE_CLIENT_CLEAN_FLAGS) clean
examples-clean: $(EXAMPLES_CLEAN) out-clean
$(EXAMPLES_CLEAN):
diff --git a/README.md b/README.md
index 0e5b639..be20009 100644
--- a/README.md
+++ b/README.md
@@ -16,8 +16,8 @@ Alternatively, you can use a docker container built with our
[Dockerfile](Docker
``` sh
# clone the project and initialize related submodules
-$ git clone [email protected]:sccommunity/rust-optee-trustzone-sdk.git
-$ cd rust-optee-trustzone-sdk
+$ git clone [email protected]:apache/incubator-teaclave-trustzone-sdk.git
+$ cd incubator-teaclave-trustzone-sdk
$ git submodule update --init
$ (cd rust/compiler-builtins && git submodule update --init libm)
$ (cd rust/rust && git submodule update --init src/stdsimd src/llvm-project)
@@ -71,7 +71,7 @@ $ make examples
```
Please read detailed
-[instructions](https://github.com/mesalock-linux/rust-optee-trustzone-sdk/wiki/Getting-started-with-OPTEE-for-QEMU-ARMv8)
+[instructions](https://github.com/apache/incubator-teaclave-trustzone-sdk/wiki/Getting-started-with-OPTEE-for-QEMU-ARMv8)
to run these examples on OP-TEE for QEMU. For other supported devices, please
find
more documents
[here](https://optee.readthedocs.io/en/latest/general/platforms.html).
diff --git a/docs/getting-started-with-optee-for-qemu-armv8.md
b/docs/getting-started-with-optee-for-qemu-armv8.md
index f4b38e4..0ff6f9b 100644
--- a/docs/getting-started-with-optee-for-qemu-armv8.md
+++ b/docs/getting-started-with-optee-for-qemu-armv8.md
@@ -21,8 +21,8 @@ Download OP-TEE for QEMU ARMv8 source code.
$ mkdir -p ~/bin
$ curl https://storage.googleapis.com/git-repo-downloads/repo-1 > ~/bin/repo
&& chmod a+x ~/bin/repo
$ export PATH=~/bin:$PATH
-$ mkdir optee-qemuv8-3.8.0 && cd optee-qemuv8-3.8.0 && \
- repo init -u https://github.com/OP-TEE/manifest.git -m qemu_v8.xml -b 3.8.0
&& \
+$ mkdir optee-qemuv8-3.13.0 && cd optee-qemuv8-3.13.0 && \
+ repo init -u https://github.com/OP-TEE/manifest.git -m qemu_v8.xml -b 3.13.0
&& \
repo sync -j4 --no-clone-bundle
```
diff --git a/optee/build b/optee/build
index 68a25e0..8af8fa2 160000
--- a/optee/build
+++ b/optee/build
@@ -1 +1 @@
-Subproject commit 68a25e0bfeecea461852ceef12b7534eefa44a16
+Subproject commit 8af8fa271ee5d2c25f2e63c5cc17f05560b44d37
diff --git a/optee/optee_client b/optee/optee_client
index c0c9253..7c9c423 160000
--- a/optee/optee_client
+++ b/optee/optee_client
@@ -1 +1 @@
-Subproject commit c0c925384c1d7e3558d27d2708857482952d7907
+Subproject commit 7c9c423d00e96bf51debd5fe10fd70dce83be5cc
diff --git a/optee/optee_os b/optee/optee_os
index c4def2a..30c13f9 160000
--- a/optee/optee_os
+++ b/optee/optee_os
@@ -1 +1 @@
-Subproject commit c4def2a8262a03244d9a88461699b9b8e43c6b55
+Subproject commit 30c13f9e2ff178c9a299e409de75d50529cf5064
diff --git a/tests/optee-qemuv8.sh b/tests/optee-qemuv8.sh
index 7dc4814..6f492e8 100755
--- a/tests/optee-qemuv8.sh
+++ b/tests/optee-qemuv8.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-cd optee-qemuv8-3.11.0 && ./qemu-system-aarch64 \
+cd optee-qemuv8-3.13.0 && ./qemu-system-aarch64 \
-nodefaults \
-nographic \
-serial stdio -serial file:/tmp/serial.log \
diff --git a/tests/test_acipher.sh b/tests/test_acipher.sh
index d0b798b..5ec667a 100755
--- a/tests/test_acipher.sh
+++ b/tests/test_acipher.sh
@@ -2,10 +2,10 @@
set -xe
rm -rf screenlog.0
-rm -rf optee-qemuv8-3.11.0
+rm -rf optee-qemuv8-3.13.0
rm -rf shared
-curl http://mesalock-linux.org/assets/optee-qemuv8-3.11.0.tar.gz | tar zxv
+curl http://mesalock-linux.org/assets/optee-qemuv8-3.13.0.tar.gz | tar zxv
mkdir shared
cp ../examples/acipher/ta/target/aarch64-unknown-optee-trustzone/release/*.ta
shared
cp ../examples/acipher/host/target/aarch64-unknown-linux-gnu/release/acipher
shared
@@ -33,5 +33,5 @@ sleep 5
}
rm -rf screenlog.0
-rm -rf optee-qemuv8-3.11.0
+rm -rf optee-qemuv8-3.13.0
rm -rf shared
diff --git a/tests/test_aes.sh b/tests/test_aes.sh
index 7429b3d..056082e 100755
--- a/tests/test_aes.sh
+++ b/tests/test_aes.sh
@@ -2,10 +2,10 @@
set -xe
rm -rf screenlog.0
-rm -rf optee-qemuv8-3.11.0
+rm -rf optee-qemuv8-3.13.0
rm -rf shared
-curl http://mesalock-linux.org/assets/optee-qemuv8-3.11.0.tar.gz | tar zxv
+curl http://mesalock-linux.org/assets/optee-qemuv8-3.13.0.tar.gz | tar zxv
mkdir shared
cp ../examples/aes/ta/target/aarch64-unknown-optee-trustzone/release/*.ta
shared
cp ../examples/aes/host/target/aarch64-unknown-linux-gnu/release/aes shared
@@ -37,5 +37,5 @@ sleep 5
}
rm -rf screenlog.0
-rm -rf optee-qemuv8-3.11.0
+rm -rf optee-qemuv8-3.13.0
rm -rf shared
diff --git a/tests/test_authentication.sh b/tests/test_authentication.sh
index 4e4c333..a6d7d11 100755
--- a/tests/test_authentication.sh
+++ b/tests/test_authentication.sh
@@ -2,10 +2,10 @@
set -xe
rm -rf screenlog.0
-rm -rf optee-qemuv8-3.11.0
+rm -rf optee-qemuv8-3.13.0
rm -rf shared
-curl http://mesalock-linux.org/assets/optee-qemuv8-3.11.0.tar.gz | tar zxv
+curl http://mesalock-linux.org/assets/optee-qemuv8-3.13.0.tar.gz | tar zxv
mkdir shared
cp
../examples/authentication/ta/target/aarch64-unknown-optee-trustzone/release/*.ta
shared
cp
../examples/authentication/host/target/aarch64-unknown-linux-gnu/release/authentication
shared
@@ -33,5 +33,5 @@ sleep 5
}
rm -rf screenlog.0
-rm -rf optee-qemuv8-3.11.0
+rm -rf optee-qemuv8-3.13.0
rm -rf shared
diff --git a/tests/test_big_int.sh b/tests/test_big_int.sh
index 713f213..acc888b 100755
--- a/tests/test_big_int.sh
+++ b/tests/test_big_int.sh
@@ -2,10 +2,10 @@
set -xe
rm -rf screenlog.0
-rm -rf optee-qemuv8-3.11.0
+rm -rf optee-qemuv8-3.13.0
rm -rf shared
-curl http://mesalock-linux.org/assets/optee-qemuv8-3.11.0.tar.gz | tar zxv
+curl http://mesalock-linux.org/assets/optee-qemuv8-3.13.0.tar.gz | tar zxv
mkdir shared
cp ../examples/big_int/ta/target/aarch64-unknown-optee-trustzone/release/*.ta
shared
cp ../examples/big_int/host/target/aarch64-unknown-linux-gnu/release/big_int
shared
@@ -40,5 +40,5 @@ sleep 5
}
rm -rf screenlog.0
-rm -rf optee-qemuv8-3.11.0
+rm -rf optee-qemuv8-3.13.0
rm -rf shared
diff --git a/tests/test_diffie_hellman.sh b/tests/test_diffie_hellman.sh
index d6a1ac2..c0f0383 100755
--- a/tests/test_diffie_hellman.sh
+++ b/tests/test_diffie_hellman.sh
@@ -2,10 +2,10 @@
set -xe
rm -rf screenlog.0
-rm -rf optee-qemuv8-3.11.0
+rm -rf optee-qemuv8-3.13.0
rm -rf shared
-curl http://mesalock-linux.org/assets/optee-qemuv8-3.11.0.tar.gz | tar zxv
+curl http://mesalock-linux.org/assets/optee-qemuv8-3.13.0.tar.gz | tar zxv
mkdir shared
cp
../examples/diffie_hellman/ta/target/aarch64-unknown-optee-trustzone/release/*.ta
shared
cp
../examples/diffie_hellman/host/target/aarch64-unknown-linux-gnu/release/diffie_hellman
shared
@@ -34,5 +34,5 @@ sleep 5
}
rm -rf screenlog.0
-rm -rf optee-qemuv8-3.11.0
+rm -rf optee-qemuv8-3.13.0
rm -rf shared
diff --git a/tests/test_digest.sh b/tests/test_digest.sh
index 1c8399c..61f492a 100755
--- a/tests/test_digest.sh
+++ b/tests/test_digest.sh
@@ -2,10 +2,10 @@
set -xe
rm -rf screenlog.0
-rm -rf optee-qemuv8-3.11.0
+rm -rf optee-qemuv8-3.13.0
rm -rf shared
-curl http://mesalock-linux.org/assets/optee-qemuv8-3.11.0.tar.gz | tar zxv
+curl http://mesalock-linux.org/assets/optee-qemuv8-3.13.0.tar.gz | tar zxv
mkdir shared
cp ../examples/digest/ta/target/aarch64-unknown-optee-trustzone/release/*.ta
shared
cp ../examples/digest/host/target/aarch64-unknown-linux-gnu/release/digest
shared
@@ -33,5 +33,5 @@ sleep 5
}
rm -rf screenlog.0
-rm -rf optee-qemuv8-3.11.0
+rm -rf optee-qemuv8-3.13.0
rm -rf shared
diff --git a/tests/test_hello_world.sh b/tests/test_hello_world.sh
index 0bf515f..5c30d5f 100755
--- a/tests/test_hello_world.sh
+++ b/tests/test_hello_world.sh
@@ -2,10 +2,10 @@
set -xe
rm -rf screenlog.0
-rm -rf optee-qemuv8-3.11.0
+rm -rf optee-qemuv8-3.13.0
rm -rf shared
-curl http://mesalock-linux.org/assets/optee-qemuv8-3.11.0.tar.gz | tar zxv
+curl http://mesalock-linux.org/assets/optee-qemuv8-3.13.0.tar.gz | tar zxv
mkdir shared
cp
../examples/hello_world/ta/target/aarch64-unknown-optee-trustzone/release/*.ta
shared
cp
../examples/hello_world/host/target/aarch64-unknown-linux-gnu/release/hello_world
shared
@@ -35,5 +35,5 @@ sleep 5
}
rm -rf screenlog.0
-rm -rf optee-qemuv8-3.11.0
+rm -rf optee-qemuv8-3.13.0
rm -rf shared
diff --git a/tests/test_hotp.sh b/tests/test_hotp.sh
index a08a43c..2396351 100755
--- a/tests/test_hotp.sh
+++ b/tests/test_hotp.sh
@@ -2,10 +2,10 @@
set -xe
rm -rf screenlog.0
-rm -rf optee-qemuv8-3.11.0
+rm -rf optee-qemuv8-3.13.0
rm -rf shared
-curl http://mesalock-linux.org/assets/optee-qemuv8-3.11.0.tar.gz | tar zxv
+curl http://mesalock-linux.org/assets/optee-qemuv8-3.13.0.tar.gz | tar zxv
mkdir shared
cp ../examples/hotp/ta/target/aarch64-unknown-optee-trustzone/release/*.ta
shared
cp ../examples/hotp/host/target/aarch64-unknown-linux-gnu/release/hotp shared
@@ -33,5 +33,5 @@ sleep 5
}
rm -rf screenlog.0
-rm -rf optee-qemuv8-3.11.0
+rm -rf optee-qemuv8-3.13.0
rm -rf shared
diff --git a/tests/test_message_passing_interface.sh
b/tests/test_message_passing_interface.sh
index 91eb4ea..634bf6f 100755
--- a/tests/test_message_passing_interface.sh
+++ b/tests/test_message_passing_interface.sh
@@ -2,10 +2,10 @@
set -xe
rm -rf screenlog.0
-rm -rf optee-qemuv8-3.11.0
+rm -rf optee-qemuv8-3.13.0
rm -rf shared
-curl http://mesalock-linux.org/assets/optee-qemuv8-3.11.0.tar.gz | tar zxv
+curl http://mesalock-linux.org/assets/optee-qemuv8-3.13.0.tar.gz | tar zxv
mkdir shared
cp
../examples/message_passing_interface/ta/target/aarch64-unknown-optee-trustzone/release/*.ta
shared
cp
../examples/message_passing_interface/host/target/aarch64-unknown-linux-gnu/release/message_passing_interface
shared
@@ -32,5 +32,5 @@ sleep 5
}
rm -rf screenlog.0
-rm -rf optee-qemuv8-3.11.0
+rm -rf optee-qemuv8-3.13.0
rm -rf shared
diff --git a/tests/test_random.sh b/tests/test_random.sh
index 7cff201..44a898a 100755
--- a/tests/test_random.sh
+++ b/tests/test_random.sh
@@ -2,10 +2,10 @@
set -xe
rm -rf screenlog.0
-rm -rf optee-qemuv8-3.11.0
+rm -rf optee-qemuv8-3.13.0
rm -rf shared
-curl http://mesalock-linux.org/assets/optee-qemuv8-3.11.0.tar.gz | tar zxv
+curl http://mesalock-linux.org/assets/optee-qemuv8-3.13.0.tar.gz | tar zxv
mkdir shared
cp ../examples/random/ta/target/aarch64-unknown-optee-trustzone/release/*.ta
shared
cp ../examples/random/host/target/aarch64-unknown-linux-gnu/release/random
shared
@@ -34,5 +34,5 @@ sleep 5
}
rm -rf screenlog.0
-rm -rf optee-qemuv8-3.11.0
+rm -rf optee-qemuv8-3.13.0
rm -rf shared
diff --git a/tests/test_secure_storage.sh b/tests/test_secure_storage.sh
index 8ce4ea2..6079a96 100755
--- a/tests/test_secure_storage.sh
+++ b/tests/test_secure_storage.sh
@@ -2,10 +2,10 @@
set -xe
rm -rf screenlog.0
-rm -rf optee-qemuv8-3.11.0
+rm -rf optee-qemuv8-3.13.0
rm -rf shared
-curl http://mesalock-linux.org/assets/optee-qemuv8-3.11.0.tar.gz | tar zxv
+curl http://mesalock-linux.org/assets/optee-qemuv8-3.13.0.tar.gz | tar zxv
mkdir shared
cp
../examples/secure_storage/ta/target/aarch64-unknown-optee-trustzone/release/*.ta
shared
cp
../examples/secure_storage/host/target/aarch64-unknown-linux-gnu/release/secure_storage
shared
@@ -42,5 +42,5 @@ sleep 5
}
rm -rf screenlog.0
-rm -rf optee-qemuv8-3.11.0
+rm -rf optee-qemuv8-3.13.0
rm -rf shared
diff --git a/tests/test_serde.sh b/tests/test_serde.sh
index 417ea35..4631a4e 100755
--- a/tests/test_serde.sh
+++ b/tests/test_serde.sh
@@ -2,10 +2,10 @@
set -xe
rm -rf screenlog.0
-rm -rf optee-qemuv8-3.11.0
+rm -rf optee-qemuv8-3.13.0
rm -rf shared
-curl http://mesalock-linux.org/assets/optee-qemuv8-3.11.0.tar.gz | tar zxv
+curl http://mesalock-linux.org/assets/optee-qemuv8-3.13.0.tar.gz | tar zxv
mkdir shared
cp ../examples/serde/ta/target/aarch64-unknown-optee-trustzone/release/*.ta
shared
cp ../examples/serde/host/target/aarch64-unknown-linux-gnu/release/serde shared
@@ -35,5 +35,5 @@ sleep 5
}
rm -rf screenlog.0
-rm -rf optee-qemuv8-3.11.0
+rm -rf optee-qemuv8-3.13.0
rm -rf shared
diff --git a/tests/test_time.sh b/tests/test_time.sh
index e57ae11..151d55d 100755
--- a/tests/test_time.sh
+++ b/tests/test_time.sh
@@ -2,10 +2,10 @@
set -xe
rm -rf screenlog.0
-rm -rf optee-qemuv8-3.11.0
+rm -rf optee-qemuv8-3.13.0
rm -rf shared
-curl http://mesalock-linux.org/assets/optee-qemuv8-3.11.0.tar.gz | tar zxv
+curl http://mesalock-linux.org/assets/optee-qemuv8-3.13.0.tar.gz | tar zxv
mkdir shared
cp ../examples/time/ta/target/aarch64-unknown-optee-trustzone/release/*.ta
shared
cp ../examples/time/host/target/aarch64-unknown-linux-gnu/release/time shared
@@ -36,5 +36,5 @@ sleep 5
}
rm -rf screenlog.0
-rm -rf optee-qemuv8-3.11.0
+rm -rf optee-qemuv8-3.13.0
rm -rf shared
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
