You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@teaclave.apache.org by yu...@apache.org on 2023/03/03 13:47:27 UTC

[incubator-teaclave-trustzone-sdk] branch optee-3.20.0 created (now 426799f)

This is an automated email from the ASF dual-hosted git repository.

yuanz pushed a change to branch optee-3.20.0
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave-trustzone-sdk.git


      at 426799f  ci: add building dependency for qemu

This branch includes the following new commits:

     new 1a84cc9  Fix optee_client building error
     new b690d66  Update to OP-TEE 3.20.0
     new 426799f  ci: add building dependency for qemu

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@teaclave.apache.org
For additional commands, e-mail: commits-help@teaclave.apache.org


[incubator-teaclave-trustzone-sdk] 02/03: Update to OP-TEE 3.20.0

Posted by yu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

yuanz pushed a commit to branch optee-3.20.0
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave-trustzone-sdk.git

commit b690d66b99a0386f60bade0ce10732a9bcc45768
Author: Yuan Zhuang <de...@foxmail.com>
AuthorDate: Fri Mar 3 13:39:23 2023 +0000

    Update to OP-TEE 3.20.0
---
 setup.sh                                | 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_signature_verification.sh    | 6 +++---
 tests/test_supp_plugin.sh               | 6 +++---
 tests/test_tcp_client.sh                | 6 +++---
 tests/test_time.sh                      | 6 +++---
 tests/test_tls_client.sh                | 6 +++---
 tests/test_tls_server.sh                | 6 +++---
 tests/test_udp_socket.sh                | 6 +++---
 21 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/setup.sh b/setup.sh
index 9e9c1c8..9ea2408 100755
--- a/setup.sh
+++ b/setup.sh
@@ -32,7 +32,7 @@ rustup default nightly-2021-09-20
 
 ########################################################
 # initialize submodules: optee_os / optee_client / build
-OPTEE_RELEASE_VERSION=3.18.0
+OPTEE_RELEASE_VERSION=3.20.0
 
 if [[ -z $OPTEE_DIR ]] || [[ $OPTEE_DIR == $PWD/optee ]]
 then
diff --git a/tests/optee-qemuv8.sh b/tests/optee-qemuv8.sh
index 935efc9..0d87044 100755
--- a/tests/optee-qemuv8.sh
+++ b/tests/optee-qemuv8.sh
@@ -17,7 +17,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-cd optee-qemuv8-3.18.0-ubuntu-20.04 && ./qemu-system-aarch64 \
+cd optee-qemuv8-3.20.0-ubuntu-20.04 && ./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 6f02fbc..af39d02 100755
--- a/tests/test_acipher.sh
+++ b/tests/test_acipher.sh
@@ -20,10 +20,10 @@
 set -xe
 
 rm -rf screenlog.0
-rm -rf optee-qemuv8-3.18.0-ubuntu-20.04
+rm -rf optee-qemuv8-3.20.0-ubuntu-20.04
 rm -rf shared
 
-curl https://nightlies.apache.org/teaclave/teaclave-trustzone-sdk/optee-qemuv8-3.18.0-ubuntu-20.04.tar.gz | tar zxv
+curl https://nightlies.apache.org/teaclave/teaclave-trustzone-sdk/optee-qemuv8-3.20.0-ubuntu-20.04.tar.gz | tar zxv
 mkdir shared
 cp ../examples/acipher-rs/ta/target/aarch64-unknown-optee-trustzone/release/*.ta shared
 cp ../examples/acipher-rs/host/target/aarch64-unknown-linux-gnu/release/acipher-rs shared
@@ -51,5 +51,5 @@ sleep 5
 }
 
 rm -rf screenlog.0
-rm -rf optee-qemuv8-3.18.0-ubuntu-20.04
+rm -rf optee-qemuv8-3.20.0-ubuntu-20.04
 rm -rf shared
diff --git a/tests/test_aes.sh b/tests/test_aes.sh
index dc04911..9ba9b59 100755
--- a/tests/test_aes.sh
+++ b/tests/test_aes.sh
@@ -20,10 +20,10 @@
 set -xe
 
 rm -rf screenlog.0
-rm -rf optee-qemuv8-3.18.0-ubuntu-20.04
+rm -rf optee-qemuv8-3.20.0-ubuntu-20.04
 rm -rf shared
 
-curl https://nightlies.apache.org/teaclave/teaclave-trustzone-sdk/optee-qemuv8-3.18.0-ubuntu-20.04.tar.gz | tar zxv
+curl https://nightlies.apache.org/teaclave/teaclave-trustzone-sdk/optee-qemuv8-3.20.0-ubuntu-20.04.tar.gz | tar zxv
 mkdir shared
 cp ../examples/aes-rs/ta/target/aarch64-unknown-optee-trustzone/release/*.ta shared
 cp ../examples/aes-rs/host/target/aarch64-unknown-linux-gnu/release/aes-rs shared
@@ -55,5 +55,5 @@ sleep 5
 }
 
 rm -rf screenlog.0
-rm -rf optee-qemuv8-3.18.0-ubuntu-20.04
+rm -rf optee-qemuv8-3.20.0-ubuntu-20.04
 rm -rf shared
diff --git a/tests/test_authentication.sh b/tests/test_authentication.sh
index 7724186..337a089 100755
--- a/tests/test_authentication.sh
+++ b/tests/test_authentication.sh
@@ -20,10 +20,10 @@
 set -xe
 
 rm -rf screenlog.0
-rm -rf optee-qemuv8-3.18.0-ubuntu-20.04
+rm -rf optee-qemuv8-3.20.0-ubuntu-20.04
 rm -rf shared
 
-curl https://nightlies.apache.org/teaclave/teaclave-trustzone-sdk/optee-qemuv8-3.18.0-ubuntu-20.04.tar.gz | tar zxv
+curl https://nightlies.apache.org/teaclave/teaclave-trustzone-sdk/optee-qemuv8-3.20.0-ubuntu-20.04.tar.gz | tar zxv
 mkdir shared
 cp ../examples/authentication-rs/ta/target/aarch64-unknown-optee-trustzone/release/*.ta shared
 cp ../examples/authentication-rs/host/target/aarch64-unknown-linux-gnu/release/authentication-rs shared
@@ -51,5 +51,5 @@ sleep 5
 }
 
 rm -rf screenlog.0
-rm -rf optee-qemuv8-3.18.0-ubuntu-20.04
+rm -rf optee-qemuv8-3.20.0-ubuntu-20.04
 rm -rf shared
diff --git a/tests/test_big_int.sh b/tests/test_big_int.sh
index 646363f..87b6a7a 100755
--- a/tests/test_big_int.sh
+++ b/tests/test_big_int.sh
@@ -20,10 +20,10 @@
 set -xe
 
 rm -rf screenlog.0
-rm -rf optee-qemuv8-3.18.0-ubuntu-20.04
+rm -rf optee-qemuv8-3.20.0-ubuntu-20.04
 rm -rf shared
 
-curl https://nightlies.apache.org/teaclave/teaclave-trustzone-sdk/optee-qemuv8-3.18.0-ubuntu-20.04.tar.gz | tar zxv
+curl https://nightlies.apache.org/teaclave/teaclave-trustzone-sdk/optee-qemuv8-3.20.0-ubuntu-20.04.tar.gz | tar zxv
 mkdir shared
 cp ../examples/big_int-rs/ta/target/aarch64-unknown-optee-trustzone/release/*.ta shared
 cp ../examples/big_int-rs/host/target/aarch64-unknown-linux-gnu/release/big_int-rs shared
@@ -58,5 +58,5 @@ sleep 5
 }
 
 rm -rf screenlog.0
-rm -rf optee-qemuv8-3.18.0-ubuntu-20.04
+rm -rf optee-qemuv8-3.20.0-ubuntu-20.04
 rm -rf shared
diff --git a/tests/test_diffie_hellman.sh b/tests/test_diffie_hellman.sh
index 9832775..42f28eb 100755
--- a/tests/test_diffie_hellman.sh
+++ b/tests/test_diffie_hellman.sh
@@ -20,10 +20,10 @@
 set -xe
 
 rm -rf screenlog.0
-rm -rf optee-qemuv8-3.18.0-ubuntu-20.04
+rm -rf optee-qemuv8-3.20.0-ubuntu-20.04
 rm -rf shared
 
-curl https://nightlies.apache.org/teaclave/teaclave-trustzone-sdk/optee-qemuv8-3.18.0-ubuntu-20.04.tar.gz | tar zxv
+curl https://nightlies.apache.org/teaclave/teaclave-trustzone-sdk/optee-qemuv8-3.20.0-ubuntu-20.04.tar.gz | tar zxv
 mkdir shared
 cp ../examples/diffie_hellman-rs/ta/target/aarch64-unknown-optee-trustzone/release/*.ta shared
 cp ../examples/diffie_hellman-rs/host/target/aarch64-unknown-linux-gnu/release/diffie_hellman-rs shared
@@ -52,5 +52,5 @@ sleep 5
 }
 
 rm -rf screenlog.0
-rm -rf optee-qemuv8-3.18.0-ubuntu-20.04
+rm -rf optee-qemuv8-3.20.0-ubuntu-20.04
 rm -rf shared
diff --git a/tests/test_digest.sh b/tests/test_digest.sh
index 7761912..5d0583a 100755
--- a/tests/test_digest.sh
+++ b/tests/test_digest.sh
@@ -20,10 +20,10 @@
 set -xe
 
 rm -rf screenlog.0
-rm -rf optee-qemuv8-3.18.0-ubuntu-20.04
+rm -rf optee-qemuv8-3.20.0-ubuntu-20.04
 rm -rf shared
 
-curl https://nightlies.apache.org/teaclave/teaclave-trustzone-sdk/optee-qemuv8-3.18.0-ubuntu-20.04.tar.gz | tar zxv
+curl https://nightlies.apache.org/teaclave/teaclave-trustzone-sdk/optee-qemuv8-3.20.0-ubuntu-20.04.tar.gz | tar zxv
 mkdir shared
 cp ../examples/digest-rs/ta/target/aarch64-unknown-optee-trustzone/release/*.ta shared
 cp ../examples/digest-rs/host/target/aarch64-unknown-linux-gnu/release/digest-rs shared
@@ -51,5 +51,5 @@ sleep 5
 }
 
 rm -rf screenlog.0
-rm -rf optee-qemuv8-3.18.0-ubuntu-20.04
+rm -rf optee-qemuv8-3.20.0-ubuntu-20.04
 rm -rf shared
diff --git a/tests/test_hello_world.sh b/tests/test_hello_world.sh
index 0f93a4b..3074af1 100755
--- a/tests/test_hello_world.sh
+++ b/tests/test_hello_world.sh
@@ -20,10 +20,10 @@
 set -xe
 
 rm -rf screenlog.0
-rm -rf optee-qemuv8-3.18.0-ubuntu-20.04
+rm -rf optee-qemuv8-3.20.0-ubuntu-20.04
 rm -rf shared
 
-curl https://nightlies.apache.org/teaclave/teaclave-trustzone-sdk/optee-qemuv8-3.18.0-ubuntu-20.04.tar.gz | tar zxv
+curl https://nightlies.apache.org/teaclave/teaclave-trustzone-sdk/optee-qemuv8-3.20.0-ubuntu-20.04.tar.gz | tar zxv
 mkdir shared
 cp ../examples/hello_world-rs/ta/target/aarch64-unknown-optee-trustzone/release/*.ta shared
 cp ../examples/hello_world-rs/host/target/aarch64-unknown-linux-gnu/release/hello_world-rs shared
@@ -53,5 +53,5 @@ sleep 5
 }
 
 rm -rf screenlog.0
-rm -rf optee-qemuv8-3.18.0-ubuntu-20.04
+rm -rf optee-qemuv8-3.20.0-ubuntu-20.04
 rm -rf shared
diff --git a/tests/test_hotp.sh b/tests/test_hotp.sh
index 833d0a3..9d41570 100755
--- a/tests/test_hotp.sh
+++ b/tests/test_hotp.sh
@@ -20,10 +20,10 @@
 set -xe
 
 rm -rf screenlog.0
-rm -rf optee-qemuv8-3.18.0-ubuntu-20.04
+rm -rf optee-qemuv8-3.20.0-ubuntu-20.04
 rm -rf shared
 
-curl https://nightlies.apache.org/teaclave/teaclave-trustzone-sdk/optee-qemuv8-3.18.0-ubuntu-20.04.tar.gz | tar zxv
+curl https://nightlies.apache.org/teaclave/teaclave-trustzone-sdk/optee-qemuv8-3.20.0-ubuntu-20.04.tar.gz | tar zxv
 mkdir shared
 cp ../examples/hotp-rs/ta/target/aarch64-unknown-optee-trustzone/release/*.ta shared
 cp ../examples/hotp-rs/host/target/aarch64-unknown-linux-gnu/release/hotp-rs shared
@@ -51,5 +51,5 @@ sleep 5
 }
 
 rm -rf screenlog.0
-rm -rf optee-qemuv8-3.18.0-ubuntu-20.04
+rm -rf optee-qemuv8-3.20.0-ubuntu-20.04
 rm -rf shared
diff --git a/tests/test_message_passing_interface.sh b/tests/test_message_passing_interface.sh
index e29b455..8e80088 100755
--- a/tests/test_message_passing_interface.sh
+++ b/tests/test_message_passing_interface.sh
@@ -20,10 +20,10 @@
 set -xe
 
 rm -rf screenlog.0
-rm -rf optee-qemuv8-3.18.0-ubuntu-20.04
+rm -rf optee-qemuv8-3.20.0-ubuntu-20.04
 rm -rf shared
 
-curl https://nightlies.apache.org/teaclave/teaclave-trustzone-sdk/optee-qemuv8-3.18.0-ubuntu-20.04.tar.gz | tar zxv
+curl https://nightlies.apache.org/teaclave/teaclave-trustzone-sdk/optee-qemuv8-3.20.0-ubuntu-20.04.tar.gz | tar zxv
 mkdir shared
 cp ../examples/message_passing_interface-rs/ta/target/aarch64-unknown-optee-trustzone/release/*.ta shared
 cp ../examples/message_passing_interface-rs/host/target/aarch64-unknown-linux-gnu/release/message_passing_interface-rs shared
@@ -50,5 +50,5 @@ sleep 5
 }
 
 rm -rf screenlog.0
-rm -rf optee-qemuv8-3.18.0-ubuntu-20.04
+rm -rf optee-qemuv8-3.20.0-ubuntu-20.04
 rm -rf shared
diff --git a/tests/test_random.sh b/tests/test_random.sh
index 070f78b..9700780 100755
--- a/tests/test_random.sh
+++ b/tests/test_random.sh
@@ -20,10 +20,10 @@
 set -xe
 
 rm -rf screenlog.0
-rm -rf optee-qemuv8-3.18.0-ubuntu-20.04
+rm -rf optee-qemuv8-3.20.0-ubuntu-20.04
 rm -rf shared
 
-curl https://nightlies.apache.org/teaclave/teaclave-trustzone-sdk/optee-qemuv8-3.18.0-ubuntu-20.04.tar.gz | tar zxv
+curl https://nightlies.apache.org/teaclave/teaclave-trustzone-sdk/optee-qemuv8-3.20.0-ubuntu-20.04.tar.gz | tar zxv
 mkdir shared
 cp ../examples/random-rs/ta/target/aarch64-unknown-optee-trustzone/release/*.ta shared
 cp ../examples/random-rs/host/target/aarch64-unknown-linux-gnu/release/random-rs shared
@@ -52,5 +52,5 @@ sleep 5
 }
 
 rm -rf screenlog.0
-rm -rf optee-qemuv8-3.18.0-ubuntu-20.04
+rm -rf optee-qemuv8-3.20.0-ubuntu-20.04
 rm -rf shared
diff --git a/tests/test_secure_storage.sh b/tests/test_secure_storage.sh
index a524675..6b2995e 100755
--- a/tests/test_secure_storage.sh
+++ b/tests/test_secure_storage.sh
@@ -20,10 +20,10 @@
 set -xe
 
 rm -rf screenlog.0
-rm -rf optee-qemuv8-3.18.0-ubuntu-20.04
+rm -rf optee-qemuv8-3.20.0-ubuntu-20.04
 rm -rf shared
 
-curl https://nightlies.apache.org/teaclave/teaclave-trustzone-sdk/optee-qemuv8-3.18.0-ubuntu-20.04.tar.gz | tar zxv
+curl https://nightlies.apache.org/teaclave/teaclave-trustzone-sdk/optee-qemuv8-3.20.0-ubuntu-20.04.tar.gz | tar zxv
 mkdir shared
 cp ../examples/secure_storage-rs/ta/target/aarch64-unknown-optee-trustzone/release/*.ta shared
 cp ../examples/secure_storage-rs/host/target/aarch64-unknown-linux-gnu/release/secure_storage-rs shared
@@ -60,5 +60,5 @@ sleep 5
 }
 
 rm -rf screenlog.0
-rm -rf optee-qemuv8-3.18.0-ubuntu-20.04
+rm -rf optee-qemuv8-3.20.0-ubuntu-20.04
 rm -rf shared
diff --git a/tests/test_serde.sh b/tests/test_serde.sh
index f8d3224..43b940c 100755
--- a/tests/test_serde.sh
+++ b/tests/test_serde.sh
@@ -20,10 +20,10 @@
 set -xe
 
 rm -rf screenlog.0
-rm -rf optee-qemuv8-3.18.0-ubuntu-20.04
+rm -rf optee-qemuv8-3.20.0-ubuntu-20.04
 rm -rf shared
 
-curl https://nightlies.apache.org/teaclave/teaclave-trustzone-sdk/optee-qemuv8-3.18.0-ubuntu-20.04.tar.gz | tar zxv
+curl https://nightlies.apache.org/teaclave/teaclave-trustzone-sdk/optee-qemuv8-3.20.0-ubuntu-20.04.tar.gz | tar zxv
 mkdir shared
 cp ../examples/serde-rs/ta/target/aarch64-unknown-optee-trustzone/release/*.ta shared
 cp ../examples/serde-rs/host/target/aarch64-unknown-linux-gnu/release/serde-rs shared
@@ -53,5 +53,5 @@ sleep 5
 }
 
 rm -rf screenlog.0
-rm -rf optee-qemuv8-3.18.0-ubuntu-20.04
+rm -rf optee-qemuv8-3.20.0-ubuntu-20.04
 rm -rf shared
diff --git a/tests/test_signature_verification.sh b/tests/test_signature_verification.sh
index b21485a..8b7b7c8 100755
--- a/tests/test_signature_verification.sh
+++ b/tests/test_signature_verification.sh
@@ -20,10 +20,10 @@
 set -xe
 
 rm -rf screenlog.0
-rm -rf optee-qemuv8-3.18.0-ubuntu-20.04
+rm -rf optee-qemuv8-3.20.0-ubuntu-20.04
 rm -rf shared
 
-curl https://nightlies.apache.org/teaclave/teaclave-trustzone-sdk/optee-qemuv8-3.18.0-ubuntu-20.04.tar.gz | tar zxv
+curl https://nightlies.apache.org/teaclave/teaclave-trustzone-sdk/optee-qemuv8-3.20.0-ubuntu-20.04.tar.gz | tar zxv
 mkdir shared
 cp ../examples/signature_verification-rs/ta/target/aarch64-unknown-optee-trustzone/release/*.ta shared
 cp ../examples/signature_verification-rs/host/target/aarch64-unknown-linux-gnu/release/signature_verification-rs shared
@@ -50,5 +50,5 @@ sleep 5
 }
 
 rm -rf screenlog.0
-rm -rf optee-qemuv8-3.18.0-ubuntu-20.04
+rm -rf optee-qemuv8-3.20.0-ubuntu-20.04
 rm -rf shared
diff --git a/tests/test_supp_plugin.sh b/tests/test_supp_plugin.sh
index 8a7179c..3fa30fd 100755
--- a/tests/test_supp_plugin.sh
+++ b/tests/test_supp_plugin.sh
@@ -20,10 +20,10 @@
 set -xe
 
 rm -rf screenlog.0
-rm -rf optee-qemuv8-3.18.0-ubuntu-20.04
+rm -rf optee-qemuv8-3.20.0-ubuntu-20.04
 rm -rf shared
 
-curl https://nightlies.apache.org/teaclave/teaclave-trustzone-sdk/optee-qemuv8-3.18.0-ubuntu-20.04.tar.gz | tar zxv
+curl https://nightlies.apache.org/teaclave/teaclave-trustzone-sdk/optee-qemuv8-3.20.0-ubuntu-20.04.tar.gz | tar zxv
 mkdir shared
 cp ../examples/supp_plugin-rs/ta/target/aarch64-unknown-optee-trustzone/release/*.ta shared
 cp ../examples/supp_plugin-rs/host/target/aarch64-unknown-linux-gnu/release/supp_plugin-rs shared
@@ -61,5 +61,5 @@ sleep 5
 }
 
 rm -rf screenlog.0
-rm -rf optee-qemuv8-3.18.0-ubuntu-20.04
+rm -rf optee-qemuv8-3.20.0-ubuntu-20.04
 rm -rf shared
diff --git a/tests/test_tcp_client.sh b/tests/test_tcp_client.sh
index 6893789..41091d9 100755
--- a/tests/test_tcp_client.sh
+++ b/tests/test_tcp_client.sh
@@ -20,10 +20,10 @@
 set -xe
 
 rm -rf screenlog.0
-rm -rf optee-qemuv8-3.18.0-ubuntu-20.04
+#rm -rf optee-qemuv8-3.20.0-ubuntu-20.04
 rm -rf shared
 
-curl https://nightlies.apache.org/teaclave/teaclave-trustzone-sdk/optee-qemuv8-3.18.0-ubuntu-20.04.tar.gz | tar zxv
+#curl https://nightlies.apache.org/teaclave/teaclave-trustzone-sdk/optee-qemuv8-3.20.0-ubuntu-20.04.tar.gz | tar zxv
 mkdir shared
 cp ../examples/tcp_client-rs/ta/target/aarch64-unknown-optee-trustzone/release/*.ta shared
 cp ../examples/tcp_client-rs/host/target/aarch64-unknown-linux-gnu/release/tcp_client-rs shared
@@ -50,5 +50,5 @@ sleep 5
 }
 
 rm -rf screenlog.0
-rm -rf optee-qemuv8-3.18.0-ubuntu-20.04
+#rm -rf optee-qemuv8-3.20.0-ubuntu-20.04
 rm -rf shared
diff --git a/tests/test_time.sh b/tests/test_time.sh
index f636d57..f49ece4 100755
--- a/tests/test_time.sh
+++ b/tests/test_time.sh
@@ -20,10 +20,10 @@
 set -xe
 
 rm -rf screenlog.0
-rm -rf optee-qemuv8-3.18.0-ubuntu-20.04
+rm -rf optee-qemuv8-3.20.0-ubuntu-20.04
 rm -rf shared
 
-curl https://nightlies.apache.org/teaclave/teaclave-trustzone-sdk/optee-qemuv8-3.18.0-ubuntu-20.04.tar.gz | tar zxv
+curl https://nightlies.apache.org/teaclave/teaclave-trustzone-sdk/optee-qemuv8-3.20.0-ubuntu-20.04.tar.gz | tar zxv
 mkdir shared
 cp ../examples/time-rs/ta/target/aarch64-unknown-optee-trustzone/release/*.ta shared
 cp ../examples/time-rs/host/target/aarch64-unknown-linux-gnu/release/time-rs shared
@@ -54,5 +54,5 @@ sleep 5
 }
 
 rm -rf screenlog.0
-rm -rf optee-qemuv8-3.18.0-ubuntu-20.04
+rm -rf optee-qemuv8-3.20.0-ubuntu-20.04
 rm -rf shared
diff --git a/tests/test_tls_client.sh b/tests/test_tls_client.sh
index 0ef576f..9df0409 100755
--- a/tests/test_tls_client.sh
+++ b/tests/test_tls_client.sh
@@ -20,10 +20,10 @@
 set -xe
 
 rm -rf screenlog.0
-rm -rf optee-qemuv8-3.18.0-ubuntu-20.04
+rm -rf optee-qemuv8-3.20.0-ubuntu-20.04
 rm -rf shared
 
-curl https://nightlies.apache.org/teaclave/teaclave-trustzone-sdk/optee-qemuv8-3.18.0-ubuntu-20.04-expand-ta-memory.tar.gz | tar zxv
+curl https://nightlies.apache.org/teaclave/teaclave-trustzone-sdk/optee-qemuv8-3.20.0-ubuntu-20.04-expand-ta-memory.tar.gz | tar zxv
 mkdir shared
 cp ../examples/tls_client-rs/ta/target/aarch64-unknown-optee-trustzone/release/*.ta shared
 cp ../examples/tls_client-rs/host/target/aarch64-unknown-linux-gnu/release/tls_client-rs shared
@@ -50,5 +50,5 @@ sleep 5
 }
 
 rm -rf screenlog.0
-rm -rf optee-qemuv8-3.18.0-ubuntu-20.04
+rm -rf optee-qemuv8-3.20.0-ubuntu-20.04
 rm -rf shared
diff --git a/tests/test_tls_server.sh b/tests/test_tls_server.sh
index 167d0da..d25909b 100755
--- a/tests/test_tls_server.sh
+++ b/tests/test_tls_server.sh
@@ -21,10 +21,10 @@ set -xe
 
 rm -rf screenlog.0
 rm -rf openssl.log
-rm -rf optee-qemuv8-3.18.0-ubuntu-20.04
+rm -rf optee-qemuv8-3.20.0-ubuntu-20.04
 rm -rf shared
 
-curl https://nightlies.apache.org/teaclave/teaclave-trustzone-sdk/optee-qemuv8-3.18.0-ubuntu-20.04-expand-ta-memory.tar.gz | tar zxv
+curl https://nightlies.apache.org/teaclave/teaclave-trustzone-sdk/optee-qemuv8-3.20.0-ubuntu-20.04-expand-ta-memory.tar.gz | tar zxv
 mkdir shared
 cp ../examples/tls_server-rs/ta/target/aarch64-unknown-optee-trustzone/release/*.ta shared
 cp ../examples/tls_server-rs/host/target/aarch64-unknown-linux-gnu/release/tls_server-rs shared
@@ -54,5 +54,5 @@ screen -S qemu_screen -p 0 -X stuff "^C"
 
 rm -rf screenlog.0
 rm -rf openssl.log
-rm -rf optee-qemuv8-3.18.0-ubuntu-20.04
+rm -rf optee-qemuv8-3.20.0-ubuntu-20.04
 rm -rf shared
diff --git a/tests/test_udp_socket.sh b/tests/test_udp_socket.sh
index f53f987..d91aa52 100755
--- a/tests/test_udp_socket.sh
+++ b/tests/test_udp_socket.sh
@@ -20,10 +20,10 @@
 set -xe
 
 rm -rf screenlog.0
-rm -rf optee-qemuv8-3.18.0-ubuntu-20.04
+rm -rf optee-qemuv8-3.20.0-ubuntu-20.04
 rm -rf shared
 
-curl https://nightlies.apache.org/teaclave/teaclave-trustzone-sdk/optee-qemuv8-3.18.0-ubuntu-20.04.tar.gz | tar zxv
+curl https://nightlies.apache.org/teaclave/teaclave-trustzone-sdk/optee-qemuv8-3.20.0-ubuntu-20.04.tar.gz | tar zxv
 mkdir shared
 cp ../examples/udp_socket-rs/ta/target/aarch64-unknown-optee-trustzone/release/*.ta shared
 cp ../examples/udp_socket-rs/host/target/aarch64-unknown-linux-gnu/release/udp_socket-rs shared
@@ -50,5 +50,5 @@ sleep 5
 }
 
 rm -rf screenlog.0
-rm -rf optee-qemuv8-3.18.0-ubuntu-20.04
+rm -rf optee-qemuv8-3.20.0-ubuntu-20.04
 rm -rf shared


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@teaclave.apache.org
For additional commands, e-mail: commits-help@teaclave.apache.org


[incubator-teaclave-trustzone-sdk] 03/03: ci: add building dependency for qemu

Posted by yu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

yuanz pushed a commit to branch optee-3.20.0
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave-trustzone-sdk.git

commit 426799fe8a6f6d368d4e7d51f001f792a9a85c83
Author: Yuan Zhuang <de...@foxmail.com>
AuthorDate: Fri Mar 3 13:44:06 2023 +0000

    ci: add building dependency for qemu
---
 .github/workflows/ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6af711f..7937c2a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -37,6 +37,7 @@ jobs:
           ln -sf /root/.cargo ~/.cargo
       - name: Building
         run: |
+          apt update && apt install libslirp-dev -y
           export CARGO_NET_GIT_FETCH_WITH_CLI=true &&
           ./setup.sh &&
           source environment &&
@@ -93,6 +94,7 @@ jobs:
           repo sync -j4 --no-clone-bundle
       - name: Build images and run tests
         run: |
+          apt update && apt install libslirp-dev -y
           cd ~/optee-qemuv8
           rm -rf optee_rust/ &&
           mv $GITHUB_WORKSPACE/incubator-teaclave-trustzone-sdk optee_rust/


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@teaclave.apache.org
For additional commands, e-mail: commits-help@teaclave.apache.org


[incubator-teaclave-trustzone-sdk] 01/03: Fix optee_client building error

Posted by yu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

yuanz pushed a commit to branch optee-3.20.0
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave-trustzone-sdk.git

commit 1a84cc960b1a9625947475eea7e902e5485ff5e9
Author: Yuan Zhuang <de...@foxmail.com>
AuthorDate: Fri Mar 3 13:37:20 2023 +0000

    Fix optee_client building error
---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 0078da1..930d4b9 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,8 @@ optee-os:
 
 OPTEE_CLIENT_FLAGS ?= CROSS_COMPILE="$(CCACHE) $(AARCH_CROSS_COMPILE)" \
 	CFG_TEE_BENCHMARK=n \
-	CFG_TA_TEST_PATH=y
+	CFG_TA_TEST_PATH=y \
+	WITH_TEEACL=0
 
 optee-client:
 	make -C $(OPTEE_CLIENT_PATH) $(OPTEE_CLIENT_FLAGS)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@teaclave.apache.org
For additional commands, e-mail: commits-help@teaclave.apache.org