You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@teaclave.apache.org by ms...@apache.org on 2021/08/18 05:51:11 UTC
[incubator-teaclave-trustzone-sdk] branch master updated: Add -rs
to examples and update test scripts (#34)
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 660183d Add -rs to examples and update test scripts (#34)
660183d is described below
commit 660183da8c701b18ff200f535b389e253a0c27f8
Author: Yuan Zhuang <zh...@baidu.com>
AuthorDate: Wed Aug 18 13:51:06 2021 +0800
Add -rs to examples and update test scripts (#34)
---
examples/{udp_socket => acipher-rs}/Makefile | 0
examples/{digest => acipher-rs}/host/Cargo.lock | 2 +-
examples/{aes => acipher-rs}/host/Cargo.toml | 2 +-
examples/{aes => acipher-rs}/host/Makefile | 2 +-
examples/{acipher => acipher-rs}/host/src/main.rs | 0
.../{udp_socket => acipher-rs}/proto/Cargo.toml | 0
examples/{udp_socket => acipher-rs}/proto/build.rs | 0
examples/{acipher => acipher-rs}/proto/src/lib.rs | 0
examples/{time => acipher-rs}/ta/Cargo.lock | 0
examples/{udp_socket => acipher-rs}/ta/Cargo.toml | 0
examples/{udp_socket => acipher-rs}/ta/Makefile | 0
examples/{udp_socket => acipher-rs}/ta/Xargo.toml | 0
examples/{udp_socket => acipher-rs}/ta/build.rs | 0
examples/{acipher => acipher-rs}/ta/src/main.rs | 0
.../{udp_socket => acipher-rs}/ta/ta_aarch64.lds | 0
examples/{udp_socket => acipher-rs}/ta/ta_arm.lds | 0
.../{udp_socket => acipher-rs}/ta/ta_static.rs | 0
examples/{acipher => acipher-rs}/uuid.txt | 0
examples/{time => aes-rs}/Makefile | 0
examples/{digest => aes-rs}/host/Cargo.lock | 2 +-
examples/{aes => aes-rs}/host/Cargo.toml | 2 +-
examples/{aes => aes-rs}/host/Makefile | 2 +-
examples/{aes => aes-rs}/host/src/main.rs | 0
examples/{time => aes-rs}/proto/Cargo.toml | 0
examples/{time => aes-rs}/proto/build.rs | 0
examples/{aes => aes-rs}/proto/src/lib.rs | 0
examples/{secure_storage => aes-rs}/ta/Cargo.lock | 0
examples/{time => aes-rs}/ta/Cargo.toml | 0
examples/{time => aes-rs}/ta/Makefile | 0
examples/{time => aes-rs}/ta/Xargo.toml | 0
examples/{time => aes-rs}/ta/build.rs | 0
examples/{aes => aes-rs}/ta/src/main.rs | 0
examples/{time => aes-rs}/ta/ta_aarch64.lds | 0
examples/{time => aes-rs}/ta/ta_arm.lds | 0
examples/{time => aes-rs}/ta/ta_static.rs | 0
examples/{aes => aes-rs}/uuid.txt | 0
.../{tcp_client => authentication-rs}/Makefile | 0
.../host/Cargo.lock | 2 +-
.../{aes => authentication-rs}/host/Cargo.toml | 2 +-
examples/{aes => authentication-rs}/host/Makefile | 2 +-
.../host/src/main.rs | 0
.../proto/Cargo.toml | 0
.../proto/build.rs | 0
.../proto/src/lib.rs | 0
.../{random => authentication-rs}/ta/Cargo.lock | 0
.../ta/Cargo.toml | 0
.../{tcp_client => authentication-rs}/ta/Makefile | 0
.../ta/Xargo.toml | 0
.../{tcp_client => authentication-rs}/ta/build.rs | 0
.../ta/src/main.rs | 0
.../ta/ta_aarch64.lds | 0
.../ta/ta_arm.lds | 0
.../ta/ta_static.rs | 0
.../{authentication => authentication-rs}/uuid.txt | 0
examples/{serde => big_int-rs}/Makefile | 0
examples/{digest => big_int-rs}/host/Cargo.lock | 2 +-
examples/{aes => big_int-rs}/host/Cargo.toml | 2 +-
examples/{aes => big_int-rs}/host/Makefile | 2 +-
examples/{big_int => big_int-rs}/host/src/main.rs | 0
.../proto/Cargo.toml | 0
examples/{serde => big_int-rs}/proto/build.rs | 0
examples/{big_int => big_int-rs}/proto/src/lib.rs | 0
examples/{hotp => big_int-rs}/ta/Cargo.lock | 0
examples/{supp_plugin => big_int-rs}/ta/Cargo.toml | 0
examples/{serde => big_int-rs}/ta/Makefile | 0
examples/{supp_plugin => big_int-rs}/ta/Xargo.toml | 0
examples/{serde => big_int-rs}/ta/build.rs | 0
examples/{big_int => big_int-rs}/ta/src/main.rs | 0
.../{supp_plugin => big_int-rs}/ta/ta_aarch64.lds | 0
examples/{supp_plugin => big_int-rs}/ta/ta_arm.lds | 0
.../{supp_plugin => big_int-rs}/ta/ta_static.rs | 0
examples/{big_int => big_int-rs}/uuid.txt | 0
.../{secure_storage => diffie_hellman-rs}/Makefile | 0
.../host/Cargo.lock | 2 +-
.../{aes => diffie_hellman-rs}/host/Cargo.toml | 2 +-
examples/{aes => diffie_hellman-rs}/host/Makefile | 2 +-
.../host/src/main.rs | 0
.../{random => diffie_hellman-rs}/proto/Cargo.toml | 0
.../proto/build.rs | 0
.../proto/src/lib.rs | 0
.../ta/Cargo.lock | 6 +-
.../ta/Cargo.toml | 0
.../ta/Makefile | 0
.../{serde => diffie_hellman-rs}/ta/Xargo.toml | 0
.../ta/build.rs | 0
.../ta/src/main.rs | 0
.../{serde => diffie_hellman-rs}/ta/ta_aarch64.lds | 0
.../{serde => diffie_hellman-rs}/ta/ta_arm.lds | 0
.../{serde => diffie_hellman-rs}/ta/ta_static.rs | 0
.../{diffie_hellman => diffie_hellman-rs}/uuid.txt | 0
examples/diffie_hellman/host/Cargo.toml | 33 -------
examples/diffie_hellman/host/Makefile | 45 ---------
examples/{random => digest-rs}/Makefile | 0
examples/{aes => digest-rs}/host/Cargo.lock | 2 +-
examples/{big_int => digest-rs}/host/Cargo.toml | 2 +-
examples/{aes => digest-rs}/host/Makefile | 2 +-
examples/{digest => digest-rs}/host/src/main.rs | 0
.../{hello_world => digest-rs}/proto/Cargo.toml | 0
examples/{random => digest-rs}/proto/build.rs | 0
examples/{digest => digest-rs}/proto/src/lib.rs | 0
examples/{digest => digest-rs}/ta/Cargo.lock | 0
examples/{random => digest-rs}/ta/Cargo.toml | 0
examples/{random => digest-rs}/ta/Makefile | 0
.../{secure_storage => digest-rs}/ta/Xargo.toml | 0
examples/{random => digest-rs}/ta/build.rs | 0
examples/{digest => digest-rs}/ta/src/main.rs | 0
.../ta/ta_aarch64.lds | 0
.../{secure_storage => digest-rs}/ta/ta_arm.lds | 0
.../{secure_storage => digest-rs}/ta/ta_static.rs | 0
examples/{digest => digest-rs}/uuid.txt | 0
.../Makefile | 0
.../host/Cargo.lock | 2 +-
.../host/Cargo.toml | 2 +-
.../host/Makefile | 2 +-
.../host/src/main.rs | 0
.../{digest => hello_world-rs}/proto/Cargo.toml | 0
.../proto/build.rs | 0
.../proto/src/lib.rs | 0
.../{udp_socket => hello_world-rs}/ta/Cargo.lock | 6 +-
examples/{hotp => hello_world-rs}/ta/Cargo.toml | 0
.../ta/Makefile | 0
examples/{random => hello_world-rs}/ta/Xargo.toml | 0
.../ta/build.rs | 0
.../{hello_world => hello_world-rs}/ta/src/main.rs | 0
.../{random => hello_world-rs}/ta/ta_aarch64.lds | 0
examples/{random => hello_world-rs}/ta/ta_arm.lds | 0
.../{random => hello_world-rs}/ta/ta_static.rs | 0
examples/{hello_world => hello_world-rs}/uuid.txt | 0
examples/hello_world/host/Cargo.lock | 104 ---------------------
examples/hello_world/host/Cargo.toml | 33 -------
examples/hello_world/host/Makefile | 45 ---------
examples/{hotp => hotp-rs}/Makefile | 0
examples/{acipher => hotp-rs}/host/Cargo.lock | 12 +--
examples/{digest => hotp-rs}/host/Cargo.toml | 2 +-
examples/{digest => hotp-rs}/host/Makefile | 2 +-
examples/{hotp => hotp-rs}/host/src/main.rs | 0
examples/{serde => hotp-rs}/proto/Cargo.toml | 0
examples/{hotp => hotp-rs}/proto/build.rs | 0
examples/{hotp => hotp-rs}/proto/src/lib.rs | 0
examples/{big_int => hotp-rs}/ta/Cargo.lock | 0
examples/{hello_world => hotp-rs}/ta/Cargo.toml | 0
examples/{hotp => hotp-rs}/ta/Makefile | 0
.../ta/Xargo.toml | 0
examples/{hotp => hotp-rs}/ta/build.rs | 0
examples/{hotp => hotp-rs}/ta/src/main.rs | 0
.../ta/ta_aarch64.lds | 0
.../ta/ta_arm.lds | 0
examples/{hotp => hotp-rs}/ta/ta_static.rs | 0
examples/{hotp => hotp-rs}/uuid.txt | 0
examples/hotp/host/Cargo.lock | 104 ---------------------
examples/hotp/host/Cargo.toml | 33 -------
examples/hotp/host/Makefile | 45 ---------
.../Makefile | 0
.../host/Cargo.lock | 2 +-
.../host/Cargo.toml | 6 +-
.../host/Makefile | 2 +-
.../host/src/main.rs | 0
.../proto/Cargo.toml | 0
.../proto/build.rs | 0
.../proto/src/lib.rs | 0
.../ta/Cargo.lock | 0
.../ta/Cargo.toml | 0
.../ta/Makefile | 0
.../ta/Xargo.toml | 0
.../ta/build.rs | 0
.../ta/src/main.rs | 0
.../ta/ta_aarch64.lds | 0
.../ta/ta_arm.lds | 0
.../ta/ta_static.rs | 0
.../uuid.txt | 0
examples/message_passing_interface/host/Cargo.toml | 31 ------
examples/message_passing_interface/host/Makefile | 45 ---------
examples/{digest => random-rs}/Makefile | 0
examples/{digest => random-rs}/host/Cargo.lock | 18 ++--
examples/{aes => random-rs}/host/Cargo.toml | 2 +-
examples/{aes => random-rs}/host/Makefile | 2 +-
examples/{random => random-rs}/host/src/main.rs | 0
.../{diffie_hellman => random-rs}/proto/Cargo.toml | 0
examples/{digest => random-rs}/proto/build.rs | 0
examples/{random => random-rs}/proto/src/lib.rs | 0
.../{authentication => random-rs}/ta/Cargo.lock | 0
examples/{digest => random-rs}/ta/Cargo.toml | 0
examples/{digest => random-rs}/ta/Makefile | 0
examples/{hello_world => random-rs}/ta/Xargo.toml | 0
examples/{digest => random-rs}/ta/build.rs | 0
examples/{random => random-rs}/ta/src/main.rs | 0
.../{hello_world => random-rs}/ta/ta_aarch64.lds | 0
examples/{hello_world => random-rs}/ta/ta_arm.lds | 0
.../{hello_world => random-rs}/ta/ta_static.rs | 0
examples/{random => random-rs}/uuid.txt | 0
examples/random/host/Cargo.lock | 104 ---------------------
examples/random/host/Cargo.toml | 33 -------
examples/random/host/Makefile | 45 ---------
.../{diffie_hellman => secure_storage-rs}/Makefile | 0
.../host/Cargo.lock | 18 ++--
.../{aes => secure_storage-rs}/host/Cargo.toml | 2 +-
examples/{aes => secure_storage-rs}/host/Makefile | 2 +-
.../host/src/main.rs | 0
.../proto/Cargo.toml | 0
.../proto/build.rs | 0
.../proto/src/lib.rs | 0
examples/{aes => secure_storage-rs}/ta/Cargo.lock | 0
.../ta/Cargo.toml | 0
.../ta/Makefile | 0
.../{digest => secure_storage-rs}/ta/Xargo.toml | 0
.../ta/build.rs | 0
.../ta/src/main.rs | 0
.../ta/ta_aarch64.lds | 0
.../{digest => secure_storage-rs}/ta/ta_arm.lds | 0
.../{digest => secure_storage-rs}/ta/ta_static.rs | 0
.../{secure_storage => secure_storage-rs}/uuid.txt | 0
examples/secure_storage/host/Cargo.lock | 104 ---------------------
examples/secure_storage/host/Cargo.toml | 33 -------
examples/secure_storage/host/Makefile | 45 ---------
examples/{big_int => serde-rs}/Makefile | 0
examples/{serde => serde-rs}/host/Cargo.lock | 16 ++--
examples/{serde => serde-rs}/host/Cargo.toml | 2 +-
examples/{acipher => serde-rs}/host/Makefile | 2 +-
examples/{serde => serde-rs}/host/src/main.rs | 0
examples/{hotp => serde-rs}/proto/Cargo.toml | 0
examples/{big_int => serde-rs}/proto/build.rs | 0
examples/{serde => serde-rs}/proto/src/lib.rs | 0
examples/{serde => serde-rs}/ta/Cargo.lock | 6 +-
examples/{serde => serde-rs}/ta/Cargo.toml | 0
examples/{big_int => serde-rs}/ta/Makefile | 0
.../{diffie_hellman => serde-rs}/ta/Xargo.toml | 0
examples/{big_int => serde-rs}/ta/build.rs | 0
examples/{serde => serde-rs}/ta/src/main.rs | 0
.../{diffie_hellman => serde-rs}/ta/ta_aarch64.lds | 0
.../{diffie_hellman => serde-rs}/ta/ta_arm.lds | 0
.../{diffie_hellman => serde-rs}/ta/ta_static.rs | 0
examples/{serde => serde-rs}/uuid.txt | 0
examples/serde/host/Makefile | 45 ---------
examples/{supp_plugin => supp_plugin-rs}/Makefile | 0
.../host/Cargo.lock | 2 +-
examples/{aes => supp_plugin-rs}/host/Cargo.toml | 2 +-
examples/{aes => supp_plugin-rs}/host/Makefile | 2 +-
.../host/src/main.rs | 0
.../plugin/Cargo.lock | 0
.../plugin/Cargo.toml | 0
.../plugin/Makefile | 0
.../plugin/build.rs | 0
.../plugin/plugin_static.rs | 0
.../plugin/src/lib.rs | 0
.../plugin_uuid.txt | 0
.../proto/Cargo.toml | 0
.../{supp_plugin => supp_plugin-rs}/proto/build.rs | 0
.../proto/src/lib.rs | 0
.../{supp_plugin => supp_plugin-rs}/ta/Cargo.lock | 6 +-
examples/{big_int => supp_plugin-rs}/ta/Cargo.toml | 0
.../{supp_plugin => supp_plugin-rs}/ta/Makefile | 0
examples/{big_int => supp_plugin-rs}/ta/Xargo.toml | 0
.../{supp_plugin => supp_plugin-rs}/ta/build.rs | 0
.../{supp_plugin => supp_plugin-rs}/ta/src/main.rs | 0
.../{big_int => supp_plugin-rs}/ta/ta_aarch64.lds | 0
examples/{big_int => supp_plugin-rs}/ta/ta_arm.lds | 0
.../{big_int => supp_plugin-rs}/ta/ta_static.rs | 0
.../{supp_plugin => supp_plugin-rs}/ta_uuid.txt | 0
examples/supp_plugin/host/Cargo.toml | 33 -------
examples/supp_plugin/host/Makefile | 45 ---------
.../{authentication => tcp_client-rs}/Makefile | 0
examples/{digest => tcp_client-rs}/host/Cargo.lock | 18 ++--
examples/{aes => tcp_client-rs}/host/Cargo.toml | 2 +-
examples/{aes => tcp_client-rs}/host/Makefile | 2 +-
.../{tcp_client => tcp_client-rs}/host/src/main.rs | 0
.../proto/Cargo.toml | 0
.../proto/build.rs | 0
.../{udp_socket => tcp_client-rs}/proto/src/lib.rs | 0
.../{hello_world => tcp_client-rs}/ta/Cargo.lock | 6 +-
.../ta/Cargo.toml | 0
.../{authentication => tcp_client-rs}/ta/Makefile | 0
.../ta/Xargo.toml | 0
.../{authentication => tcp_client-rs}/ta/build.rs | 0
.../{tcp_client => tcp_client-rs}/ta/src/main.rs | 0
.../ta/ta_aarch64.lds | 0
.../ta/ta_arm.lds | 0
.../ta/ta_static.rs | 0
examples/{tcp_client => tcp_client-rs}/uuid.txt | 0
examples/tcp_client/host/Cargo.lock | 104 ---------------------
examples/tcp_client/host/Cargo.toml | 33 -------
examples/tcp_client/host/Makefile | 45 ---------
examples/{aes => time-rs}/Makefile | 0
examples/{big_int => time-rs}/host/Cargo.lock | 18 ++--
examples/{acipher => time-rs}/host/Cargo.toml | 2 +-
examples/{big_int => time-rs}/host/Makefile | 2 +-
examples/{time => time-rs}/host/src/main.rs | 0
examples/{aes => time-rs}/proto/Cargo.toml | 0
examples/{aes => time-rs}/proto/build.rs | 0
examples/{time => time-rs}/proto/src/lib.rs | 0
examples/{acipher => time-rs}/ta/Cargo.lock | 0
examples/{aes => time-rs}/ta/Cargo.toml | 0
examples/{aes => time-rs}/ta/Makefile | 0
examples/{aes => time-rs}/ta/Xargo.toml | 0
examples/{aes => time-rs}/ta/build.rs | 0
examples/{time => time-rs}/ta/src/main.rs | 0
examples/{aes => time-rs}/ta/ta_aarch64.lds | 0
examples/{aes => time-rs}/ta/ta_arm.lds | 0
examples/{aes => time-rs}/ta/ta_static.rs | 0
examples/{time => time-rs}/uuid.txt | 0
examples/time/host/Cargo.lock | 104 ---------------------
examples/time/host/Cargo.toml | 33 -------
examples/time/host/Makefile | 45 ---------
examples/{acipher => udp_socket-rs}/Makefile | 0
examples/{digest => udp_socket-rs}/host/Cargo.lock | 18 ++--
examples/{aes => udp_socket-rs}/host/Cargo.toml | 2 +-
examples/{aes => udp_socket-rs}/host/Makefile | 2 +-
.../{udp_socket => udp_socket-rs}/host/src/main.rs | 0
.../{acipher => udp_socket-rs}/proto/Cargo.toml | 0
examples/{acipher => udp_socket-rs}/proto/build.rs | 0
.../{tcp_client => udp_socket-rs}/proto/src/lib.rs | 0
.../{tcp_client => udp_socket-rs}/ta/Cargo.lock | 6 +-
examples/{acipher => udp_socket-rs}/ta/Cargo.toml | 0
examples/{acipher => udp_socket-rs}/ta/Makefile | 0
examples/{acipher => udp_socket-rs}/ta/Xargo.toml | 0
examples/{acipher => udp_socket-rs}/ta/build.rs | 0
.../{udp_socket => udp_socket-rs}/ta/src/main.rs | 0
.../{acipher => udp_socket-rs}/ta/ta_aarch64.lds | 0
examples/{acipher => udp_socket-rs}/ta/ta_arm.lds | 0
.../{acipher => udp_socket-rs}/ta/ta_static.rs | 0
examples/{udp_socket => udp_socket-rs}/uuid.txt | 0
examples/udp_socket/host/Cargo.lock | 104 ---------------------
examples/udp_socket/host/Cargo.toml | 33 -------
examples/udp_socket/host/Makefile | 45 ---------
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_supp_plugin.sh | 8 +-
tests/test_tcp_client.sh | 6 +-
tests/test_time.sh | 6 +-
tests/test_udp_socket.sh | 6 +-
339 files changed, 168 insertions(+), 1721 deletions(-)
diff --git a/examples/udp_socket/Makefile b/examples/acipher-rs/Makefile
similarity index 100%
rename from examples/udp_socket/Makefile
rename to examples/acipher-rs/Makefile
diff --git a/examples/digest/host/Cargo.lock b/examples/acipher-rs/host/Cargo.lock
similarity index 99%
copy from examples/digest/host/Cargo.lock
copy to examples/acipher-rs/host/Cargo.lock
index 6ad9db0..564e6f7 100644
--- a/examples/digest/host/Cargo.lock
+++ b/examples/acipher-rs/host/Cargo.lock
@@ -1,7 +1,7 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
[[package]]
-name = "digest"
+name = "acipher-rs"
version = "0.1.0"
dependencies = [
"libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/examples/aes/host/Cargo.toml b/examples/acipher-rs/host/Cargo.toml
similarity index 98%
copy from examples/aes/host/Cargo.toml
copy to examples/acipher-rs/host/Cargo.toml
index d4d780e..7792b79 100644
--- a/examples/aes/host/Cargo.toml
+++ b/examples/acipher-rs/host/Cargo.toml
@@ -16,7 +16,7 @@
# under the License.
[package]
-name = "aes"
+name = "acipher-rs"
version = "0.1.0"
authors = ["Teaclave Contributors <de...@teaclave.apache.org>"]
license = "Apache-2.0"
diff --git a/examples/aes/host/Makefile b/examples/acipher-rs/host/Makefile
similarity index 98%
copy from examples/aes/host/Makefile
copy to examples/acipher-rs/host/Makefile
index e2f89f1..37bf3d4 100644
--- a/examples/aes/host/Makefile
+++ b/examples/acipher-rs/host/Makefile
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-NAME := aes
+NAME := acipher-rs
ARCH ?= aarch64
OPTEE_DIR ?= ../../../optee
diff --git a/examples/acipher/host/src/main.rs b/examples/acipher-rs/host/src/main.rs
similarity index 100%
rename from examples/acipher/host/src/main.rs
rename to examples/acipher-rs/host/src/main.rs
diff --git a/examples/udp_socket/proto/Cargo.toml b/examples/acipher-rs/proto/Cargo.toml
similarity index 100%
rename from examples/udp_socket/proto/Cargo.toml
rename to examples/acipher-rs/proto/Cargo.toml
diff --git a/examples/udp_socket/proto/build.rs b/examples/acipher-rs/proto/build.rs
similarity index 100%
rename from examples/udp_socket/proto/build.rs
rename to examples/acipher-rs/proto/build.rs
diff --git a/examples/acipher/proto/src/lib.rs b/examples/acipher-rs/proto/src/lib.rs
similarity index 100%
rename from examples/acipher/proto/src/lib.rs
rename to examples/acipher-rs/proto/src/lib.rs
diff --git a/examples/time/ta/Cargo.lock b/examples/acipher-rs/ta/Cargo.lock
similarity index 100%
rename from examples/time/ta/Cargo.lock
rename to examples/acipher-rs/ta/Cargo.lock
diff --git a/examples/udp_socket/ta/Cargo.toml b/examples/acipher-rs/ta/Cargo.toml
similarity index 100%
rename from examples/udp_socket/ta/Cargo.toml
rename to examples/acipher-rs/ta/Cargo.toml
diff --git a/examples/udp_socket/ta/Makefile b/examples/acipher-rs/ta/Makefile
similarity index 100%
rename from examples/udp_socket/ta/Makefile
rename to examples/acipher-rs/ta/Makefile
diff --git a/examples/udp_socket/ta/Xargo.toml b/examples/acipher-rs/ta/Xargo.toml
similarity index 100%
rename from examples/udp_socket/ta/Xargo.toml
rename to examples/acipher-rs/ta/Xargo.toml
diff --git a/examples/udp_socket/ta/build.rs b/examples/acipher-rs/ta/build.rs
similarity index 100%
rename from examples/udp_socket/ta/build.rs
rename to examples/acipher-rs/ta/build.rs
diff --git a/examples/acipher/ta/src/main.rs b/examples/acipher-rs/ta/src/main.rs
similarity index 100%
rename from examples/acipher/ta/src/main.rs
rename to examples/acipher-rs/ta/src/main.rs
diff --git a/examples/udp_socket/ta/ta_aarch64.lds b/examples/acipher-rs/ta/ta_aarch64.lds
similarity index 100%
rename from examples/udp_socket/ta/ta_aarch64.lds
rename to examples/acipher-rs/ta/ta_aarch64.lds
diff --git a/examples/udp_socket/ta/ta_arm.lds b/examples/acipher-rs/ta/ta_arm.lds
similarity index 100%
rename from examples/udp_socket/ta/ta_arm.lds
rename to examples/acipher-rs/ta/ta_arm.lds
diff --git a/examples/udp_socket/ta/ta_static.rs b/examples/acipher-rs/ta/ta_static.rs
similarity index 100%
rename from examples/udp_socket/ta/ta_static.rs
rename to examples/acipher-rs/ta/ta_static.rs
diff --git a/examples/acipher/uuid.txt b/examples/acipher-rs/uuid.txt
similarity index 100%
rename from examples/acipher/uuid.txt
rename to examples/acipher-rs/uuid.txt
diff --git a/examples/time/Makefile b/examples/aes-rs/Makefile
similarity index 100%
rename from examples/time/Makefile
rename to examples/aes-rs/Makefile
diff --git a/examples/digest/host/Cargo.lock b/examples/aes-rs/host/Cargo.lock
similarity index 99%
copy from examples/digest/host/Cargo.lock
copy to examples/aes-rs/host/Cargo.lock
index 6ad9db0..20fe177 100644
--- a/examples/digest/host/Cargo.lock
+++ b/examples/aes-rs/host/Cargo.lock
@@ -1,7 +1,7 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
[[package]]
-name = "digest"
+name = "aes-rs"
version = "0.1.0"
dependencies = [
"libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/examples/aes/host/Cargo.toml b/examples/aes-rs/host/Cargo.toml
similarity index 98%
copy from examples/aes/host/Cargo.toml
copy to examples/aes-rs/host/Cargo.toml
index d4d780e..962bfe6 100644
--- a/examples/aes/host/Cargo.toml
+++ b/examples/aes-rs/host/Cargo.toml
@@ -16,7 +16,7 @@
# under the License.
[package]
-name = "aes"
+name = "aes-rs"
version = "0.1.0"
authors = ["Teaclave Contributors <de...@teaclave.apache.org>"]
license = "Apache-2.0"
diff --git a/examples/aes/host/Makefile b/examples/aes-rs/host/Makefile
similarity index 98%
copy from examples/aes/host/Makefile
copy to examples/aes-rs/host/Makefile
index e2f89f1..7f436aa 100644
--- a/examples/aes/host/Makefile
+++ b/examples/aes-rs/host/Makefile
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-NAME := aes
+NAME := aes-rs
ARCH ?= aarch64
OPTEE_DIR ?= ../../../optee
diff --git a/examples/aes/host/src/main.rs b/examples/aes-rs/host/src/main.rs
similarity index 100%
rename from examples/aes/host/src/main.rs
rename to examples/aes-rs/host/src/main.rs
diff --git a/examples/time/proto/Cargo.toml b/examples/aes-rs/proto/Cargo.toml
similarity index 100%
rename from examples/time/proto/Cargo.toml
rename to examples/aes-rs/proto/Cargo.toml
diff --git a/examples/time/proto/build.rs b/examples/aes-rs/proto/build.rs
similarity index 100%
rename from examples/time/proto/build.rs
rename to examples/aes-rs/proto/build.rs
diff --git a/examples/aes/proto/src/lib.rs b/examples/aes-rs/proto/src/lib.rs
similarity index 100%
rename from examples/aes/proto/src/lib.rs
rename to examples/aes-rs/proto/src/lib.rs
diff --git a/examples/secure_storage/ta/Cargo.lock b/examples/aes-rs/ta/Cargo.lock
similarity index 100%
rename from examples/secure_storage/ta/Cargo.lock
rename to examples/aes-rs/ta/Cargo.lock
diff --git a/examples/time/ta/Cargo.toml b/examples/aes-rs/ta/Cargo.toml
similarity index 100%
rename from examples/time/ta/Cargo.toml
rename to examples/aes-rs/ta/Cargo.toml
diff --git a/examples/time/ta/Makefile b/examples/aes-rs/ta/Makefile
similarity index 100%
rename from examples/time/ta/Makefile
rename to examples/aes-rs/ta/Makefile
diff --git a/examples/time/ta/Xargo.toml b/examples/aes-rs/ta/Xargo.toml
similarity index 100%
rename from examples/time/ta/Xargo.toml
rename to examples/aes-rs/ta/Xargo.toml
diff --git a/examples/time/ta/build.rs b/examples/aes-rs/ta/build.rs
similarity index 100%
rename from examples/time/ta/build.rs
rename to examples/aes-rs/ta/build.rs
diff --git a/examples/aes/ta/src/main.rs b/examples/aes-rs/ta/src/main.rs
similarity index 100%
rename from examples/aes/ta/src/main.rs
rename to examples/aes-rs/ta/src/main.rs
diff --git a/examples/time/ta/ta_aarch64.lds b/examples/aes-rs/ta/ta_aarch64.lds
similarity index 100%
rename from examples/time/ta/ta_aarch64.lds
rename to examples/aes-rs/ta/ta_aarch64.lds
diff --git a/examples/time/ta/ta_arm.lds b/examples/aes-rs/ta/ta_arm.lds
similarity index 100%
rename from examples/time/ta/ta_arm.lds
rename to examples/aes-rs/ta/ta_arm.lds
diff --git a/examples/time/ta/ta_static.rs b/examples/aes-rs/ta/ta_static.rs
similarity index 100%
rename from examples/time/ta/ta_static.rs
rename to examples/aes-rs/ta/ta_static.rs
diff --git a/examples/aes/uuid.txt b/examples/aes-rs/uuid.txt
similarity index 100%
rename from examples/aes/uuid.txt
rename to examples/aes-rs/uuid.txt
diff --git a/examples/tcp_client/Makefile b/examples/authentication-rs/Makefile
similarity index 100%
rename from examples/tcp_client/Makefile
rename to examples/authentication-rs/Makefile
diff --git a/examples/authentication/host/Cargo.lock b/examples/authentication-rs/host/Cargo.lock
similarity index 99%
copy from examples/authentication/host/Cargo.lock
copy to examples/authentication-rs/host/Cargo.lock
index c35373a..45b6320 100644
--- a/examples/authentication/host/Cargo.lock
+++ b/examples/authentication-rs/host/Cargo.lock
@@ -1,7 +1,7 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
[[package]]
-name = "authentication"
+name = "authentication-rs"
version = "0.1.0"
dependencies = [
"libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/examples/aes/host/Cargo.toml b/examples/authentication-rs/host/Cargo.toml
similarity index 97%
copy from examples/aes/host/Cargo.toml
copy to examples/authentication-rs/host/Cargo.toml
index d4d780e..3e2e44c 100644
--- a/examples/aes/host/Cargo.toml
+++ b/examples/authentication-rs/host/Cargo.toml
@@ -16,7 +16,7 @@
# under the License.
[package]
-name = "aes"
+name = "authentication-rs"
version = "0.1.0"
authors = ["Teaclave Contributors <de...@teaclave.apache.org>"]
license = "Apache-2.0"
diff --git a/examples/aes/host/Makefile b/examples/authentication-rs/host/Makefile
similarity index 98%
copy from examples/aes/host/Makefile
copy to examples/authentication-rs/host/Makefile
index e2f89f1..f74911e 100644
--- a/examples/aes/host/Makefile
+++ b/examples/authentication-rs/host/Makefile
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-NAME := aes
+NAME := authentication-rs
ARCH ?= aarch64
OPTEE_DIR ?= ../../../optee
diff --git a/examples/authentication/host/src/main.rs b/examples/authentication-rs/host/src/main.rs
similarity index 100%
rename from examples/authentication/host/src/main.rs
rename to examples/authentication-rs/host/src/main.rs
diff --git a/examples/tcp_client/proto/Cargo.toml b/examples/authentication-rs/proto/Cargo.toml
similarity index 100%
rename from examples/tcp_client/proto/Cargo.toml
rename to examples/authentication-rs/proto/Cargo.toml
diff --git a/examples/tcp_client/proto/build.rs b/examples/authentication-rs/proto/build.rs
similarity index 100%
rename from examples/tcp_client/proto/build.rs
rename to examples/authentication-rs/proto/build.rs
diff --git a/examples/authentication/proto/src/lib.rs b/examples/authentication-rs/proto/src/lib.rs
similarity index 100%
rename from examples/authentication/proto/src/lib.rs
rename to examples/authentication-rs/proto/src/lib.rs
diff --git a/examples/random/ta/Cargo.lock b/examples/authentication-rs/ta/Cargo.lock
similarity index 100%
rename from examples/random/ta/Cargo.lock
rename to examples/authentication-rs/ta/Cargo.lock
diff --git a/examples/tcp_client/ta/Cargo.toml b/examples/authentication-rs/ta/Cargo.toml
similarity index 100%
rename from examples/tcp_client/ta/Cargo.toml
rename to examples/authentication-rs/ta/Cargo.toml
diff --git a/examples/tcp_client/ta/Makefile b/examples/authentication-rs/ta/Makefile
similarity index 100%
rename from examples/tcp_client/ta/Makefile
rename to examples/authentication-rs/ta/Makefile
diff --git a/examples/tcp_client/ta/Xargo.toml b/examples/authentication-rs/ta/Xargo.toml
similarity index 100%
rename from examples/tcp_client/ta/Xargo.toml
rename to examples/authentication-rs/ta/Xargo.toml
diff --git a/examples/tcp_client/ta/build.rs b/examples/authentication-rs/ta/build.rs
similarity index 100%
rename from examples/tcp_client/ta/build.rs
rename to examples/authentication-rs/ta/build.rs
diff --git a/examples/authentication/ta/src/main.rs b/examples/authentication-rs/ta/src/main.rs
similarity index 100%
rename from examples/authentication/ta/src/main.rs
rename to examples/authentication-rs/ta/src/main.rs
diff --git a/examples/tcp_client/ta/ta_aarch64.lds b/examples/authentication-rs/ta/ta_aarch64.lds
similarity index 100%
rename from examples/tcp_client/ta/ta_aarch64.lds
rename to examples/authentication-rs/ta/ta_aarch64.lds
diff --git a/examples/tcp_client/ta/ta_arm.lds b/examples/authentication-rs/ta/ta_arm.lds
similarity index 100%
rename from examples/tcp_client/ta/ta_arm.lds
rename to examples/authentication-rs/ta/ta_arm.lds
diff --git a/examples/tcp_client/ta/ta_static.rs b/examples/authentication-rs/ta/ta_static.rs
similarity index 100%
rename from examples/tcp_client/ta/ta_static.rs
rename to examples/authentication-rs/ta/ta_static.rs
diff --git a/examples/authentication/uuid.txt b/examples/authentication-rs/uuid.txt
similarity index 100%
rename from examples/authentication/uuid.txt
rename to examples/authentication-rs/uuid.txt
diff --git a/examples/serde/Makefile b/examples/big_int-rs/Makefile
similarity index 100%
rename from examples/serde/Makefile
rename to examples/big_int-rs/Makefile
diff --git a/examples/digest/host/Cargo.lock b/examples/big_int-rs/host/Cargo.lock
similarity index 99%
copy from examples/digest/host/Cargo.lock
copy to examples/big_int-rs/host/Cargo.lock
index 6ad9db0..59bff3e 100644
--- a/examples/digest/host/Cargo.lock
+++ b/examples/big_int-rs/host/Cargo.lock
@@ -1,7 +1,7 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
[[package]]
-name = "digest"
+name = "big_int-rs"
version = "0.1.0"
dependencies = [
"libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/examples/aes/host/Cargo.toml b/examples/big_int-rs/host/Cargo.toml
similarity index 98%
copy from examples/aes/host/Cargo.toml
copy to examples/big_int-rs/host/Cargo.toml
index d4d780e..59c4b2a 100644
--- a/examples/aes/host/Cargo.toml
+++ b/examples/big_int-rs/host/Cargo.toml
@@ -16,7 +16,7 @@
# under the License.
[package]
-name = "aes"
+name = "big_int-rs"
version = "0.1.0"
authors = ["Teaclave Contributors <de...@teaclave.apache.org>"]
license = "Apache-2.0"
diff --git a/examples/aes/host/Makefile b/examples/big_int-rs/host/Makefile
similarity index 98%
copy from examples/aes/host/Makefile
copy to examples/big_int-rs/host/Makefile
index e2f89f1..9f618d1 100644
--- a/examples/aes/host/Makefile
+++ b/examples/big_int-rs/host/Makefile
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-NAME := aes
+NAME := big_int-rs
ARCH ?= aarch64
OPTEE_DIR ?= ../../../optee
diff --git a/examples/big_int/host/src/main.rs b/examples/big_int-rs/host/src/main.rs
similarity index 100%
rename from examples/big_int/host/src/main.rs
rename to examples/big_int-rs/host/src/main.rs
diff --git a/examples/secure_storage/proto/Cargo.toml b/examples/big_int-rs/proto/Cargo.toml
similarity index 100%
rename from examples/secure_storage/proto/Cargo.toml
rename to examples/big_int-rs/proto/Cargo.toml
diff --git a/examples/serde/proto/build.rs b/examples/big_int-rs/proto/build.rs
similarity index 100%
rename from examples/serde/proto/build.rs
rename to examples/big_int-rs/proto/build.rs
diff --git a/examples/big_int/proto/src/lib.rs b/examples/big_int-rs/proto/src/lib.rs
similarity index 100%
rename from examples/big_int/proto/src/lib.rs
rename to examples/big_int-rs/proto/src/lib.rs
diff --git a/examples/hotp/ta/Cargo.lock b/examples/big_int-rs/ta/Cargo.lock
similarity index 100%
rename from examples/hotp/ta/Cargo.lock
rename to examples/big_int-rs/ta/Cargo.lock
diff --git a/examples/supp_plugin/ta/Cargo.toml b/examples/big_int-rs/ta/Cargo.toml
similarity index 100%
rename from examples/supp_plugin/ta/Cargo.toml
rename to examples/big_int-rs/ta/Cargo.toml
diff --git a/examples/serde/ta/Makefile b/examples/big_int-rs/ta/Makefile
similarity index 100%
rename from examples/serde/ta/Makefile
rename to examples/big_int-rs/ta/Makefile
diff --git a/examples/supp_plugin/ta/Xargo.toml b/examples/big_int-rs/ta/Xargo.toml
similarity index 100%
rename from examples/supp_plugin/ta/Xargo.toml
rename to examples/big_int-rs/ta/Xargo.toml
diff --git a/examples/serde/ta/build.rs b/examples/big_int-rs/ta/build.rs
similarity index 100%
rename from examples/serde/ta/build.rs
rename to examples/big_int-rs/ta/build.rs
diff --git a/examples/big_int/ta/src/main.rs b/examples/big_int-rs/ta/src/main.rs
similarity index 100%
rename from examples/big_int/ta/src/main.rs
rename to examples/big_int-rs/ta/src/main.rs
diff --git a/examples/supp_plugin/ta/ta_aarch64.lds b/examples/big_int-rs/ta/ta_aarch64.lds
similarity index 100%
rename from examples/supp_plugin/ta/ta_aarch64.lds
rename to examples/big_int-rs/ta/ta_aarch64.lds
diff --git a/examples/supp_plugin/ta/ta_arm.lds b/examples/big_int-rs/ta/ta_arm.lds
similarity index 100%
rename from examples/supp_plugin/ta/ta_arm.lds
rename to examples/big_int-rs/ta/ta_arm.lds
diff --git a/examples/supp_plugin/ta/ta_static.rs b/examples/big_int-rs/ta/ta_static.rs
similarity index 100%
rename from examples/supp_plugin/ta/ta_static.rs
rename to examples/big_int-rs/ta/ta_static.rs
diff --git a/examples/big_int/uuid.txt b/examples/big_int-rs/uuid.txt
similarity index 100%
rename from examples/big_int/uuid.txt
rename to examples/big_int-rs/uuid.txt
diff --git a/examples/secure_storage/Makefile b/examples/diffie_hellman-rs/Makefile
similarity index 100%
rename from examples/secure_storage/Makefile
rename to examples/diffie_hellman-rs/Makefile
diff --git a/examples/diffie_hellman/host/Cargo.lock b/examples/diffie_hellman-rs/host/Cargo.lock
similarity index 99%
rename from examples/diffie_hellman/host/Cargo.lock
rename to examples/diffie_hellman-rs/host/Cargo.lock
index 93592b5..dd8162d 100644
--- a/examples/diffie_hellman/host/Cargo.lock
+++ b/examples/diffie_hellman-rs/host/Cargo.lock
@@ -1,7 +1,7 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
[[package]]
-name = "diffie_hellman"
+name = "diffie_hellman-rs"
version = "0.1.0"
dependencies = [
"libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/examples/aes/host/Cargo.toml b/examples/diffie_hellman-rs/host/Cargo.toml
similarity index 97%
copy from examples/aes/host/Cargo.toml
copy to examples/diffie_hellman-rs/host/Cargo.toml
index d4d780e..6880923 100644
--- a/examples/aes/host/Cargo.toml
+++ b/examples/diffie_hellman-rs/host/Cargo.toml
@@ -16,7 +16,7 @@
# under the License.
[package]
-name = "aes"
+name = "diffie_hellman-rs"
version = "0.1.0"
authors = ["Teaclave Contributors <de...@teaclave.apache.org>"]
license = "Apache-2.0"
diff --git a/examples/aes/host/Makefile b/examples/diffie_hellman-rs/host/Makefile
similarity index 98%
copy from examples/aes/host/Makefile
copy to examples/diffie_hellman-rs/host/Makefile
index e2f89f1..4253125 100644
--- a/examples/aes/host/Makefile
+++ b/examples/diffie_hellman-rs/host/Makefile
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-NAME := aes
+NAME := diffie_hellman-rs
ARCH ?= aarch64
OPTEE_DIR ?= ../../../optee
diff --git a/examples/diffie_hellman/host/src/main.rs b/examples/diffie_hellman-rs/host/src/main.rs
similarity index 100%
rename from examples/diffie_hellman/host/src/main.rs
rename to examples/diffie_hellman-rs/host/src/main.rs
diff --git a/examples/random/proto/Cargo.toml b/examples/diffie_hellman-rs/proto/Cargo.toml
similarity index 100%
rename from examples/random/proto/Cargo.toml
rename to examples/diffie_hellman-rs/proto/Cargo.toml
diff --git a/examples/secure_storage/proto/build.rs b/examples/diffie_hellman-rs/proto/build.rs
similarity index 100%
rename from examples/secure_storage/proto/build.rs
rename to examples/diffie_hellman-rs/proto/build.rs
diff --git a/examples/diffie_hellman/proto/src/lib.rs b/examples/diffie_hellman-rs/proto/src/lib.rs
similarity index 100%
rename from examples/diffie_hellman/proto/src/lib.rs
rename to examples/diffie_hellman-rs/proto/src/lib.rs
diff --git a/examples/diffie_hellman/ta/Cargo.lock b/examples/diffie_hellman-rs/ta/Cargo.lock
similarity index 93%
rename from examples/diffie_hellman/ta/Cargo.lock
rename to examples/diffie_hellman-rs/ta/Cargo.lock
index 706436a..87f9816 100644
--- a/examples/diffie_hellman/ta/Cargo.lock
+++ b/examples/diffie_hellman-rs/ta/Cargo.lock
@@ -2,7 +2,7 @@
# It is not intended for manual editing.
[[package]]
name = "bitflags"
-version = "1.0.5"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -18,7 +18,7 @@ version = "0.2.59"
name = "optee-utee"
version = "0.1.0"
dependencies = [
- "bitflags 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.59",
"optee-utee-macros 0.1.0",
@@ -96,7 +96,7 @@ version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[metadata]
-"checksum bitflags 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "bd1fa8ad26490b0a5cfec99089952250301b6716cdeaa7c9ab229598fb82ab66"
+"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
"checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
"checksum proc-macro2 0.4.29 (registry+https://github.com/rust-lang/crates.io-index)" = "64c827cea7a7ab30ce4593e5e04d7a11617ad6ece2fa230605a78b00ff965316"
"checksum quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db"
diff --git a/examples/secure_storage/ta/Cargo.toml b/examples/diffie_hellman-rs/ta/Cargo.toml
similarity index 100%
rename from examples/secure_storage/ta/Cargo.toml
rename to examples/diffie_hellman-rs/ta/Cargo.toml
diff --git a/examples/secure_storage/ta/Makefile b/examples/diffie_hellman-rs/ta/Makefile
similarity index 100%
rename from examples/secure_storage/ta/Makefile
rename to examples/diffie_hellman-rs/ta/Makefile
diff --git a/examples/serde/ta/Xargo.toml b/examples/diffie_hellman-rs/ta/Xargo.toml
similarity index 100%
rename from examples/serde/ta/Xargo.toml
rename to examples/diffie_hellman-rs/ta/Xargo.toml
diff --git a/examples/secure_storage/ta/build.rs b/examples/diffie_hellman-rs/ta/build.rs
similarity index 100%
rename from examples/secure_storage/ta/build.rs
rename to examples/diffie_hellman-rs/ta/build.rs
diff --git a/examples/diffie_hellman/ta/src/main.rs b/examples/diffie_hellman-rs/ta/src/main.rs
similarity index 100%
rename from examples/diffie_hellman/ta/src/main.rs
rename to examples/diffie_hellman-rs/ta/src/main.rs
diff --git a/examples/serde/ta/ta_aarch64.lds b/examples/diffie_hellman-rs/ta/ta_aarch64.lds
similarity index 100%
rename from examples/serde/ta/ta_aarch64.lds
rename to examples/diffie_hellman-rs/ta/ta_aarch64.lds
diff --git a/examples/serde/ta/ta_arm.lds b/examples/diffie_hellman-rs/ta/ta_arm.lds
similarity index 100%
rename from examples/serde/ta/ta_arm.lds
rename to examples/diffie_hellman-rs/ta/ta_arm.lds
diff --git a/examples/serde/ta/ta_static.rs b/examples/diffie_hellman-rs/ta/ta_static.rs
similarity index 100%
rename from examples/serde/ta/ta_static.rs
rename to examples/diffie_hellman-rs/ta/ta_static.rs
diff --git a/examples/diffie_hellman/uuid.txt b/examples/diffie_hellman-rs/uuid.txt
similarity index 100%
rename from examples/diffie_hellman/uuid.txt
rename to examples/diffie_hellman-rs/uuid.txt
diff --git a/examples/diffie_hellman/host/Cargo.toml b/examples/diffie_hellman/host/Cargo.toml
deleted file mode 100644
index c48bd81..0000000
--- a/examples/diffie_hellman/host/Cargo.toml
+++ /dev/null
@@ -1,33 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you 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.
-
-[package]
-name = "diffie_hellman"
-version = "0.1.0"
-authors = ["Teaclave Contributors <de...@teaclave.apache.org>"]
-license = "Apache-2.0"
-repository = "https://github.com/apache/incubator-teaclave-trustzone-sdk.git"
-description = "An example of Rust OP-TEE TrustZone SDK."
-edition = "2018"
-
-[dependencies]
-libc = "0.2.48"
-proto = { path = "../proto" }
-optee-teec = { path = "../../../optee-teec" }
-
-[profile.release]
-lto = true
diff --git a/examples/diffie_hellman/host/Makefile b/examples/diffie_hellman/host/Makefile
deleted file mode 100644
index 9aabcad..0000000
--- a/examples/diffie_hellman/host/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you 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.
-
-NAME := diffie_hellman
-ARCH ?= aarch64
-
-OPTEE_DIR ?= ../../../optee
-
-ifeq ($(ARCH), arm)
- OPTEE_BIN := $(OPTEE_DIR)/toolchains/aarch32/bin
- OBJCOPY := $(OPTEE_BIN)/arm-linux-gnueabihf-objcopy
- TARGET := arm-unknown-linux-gnueabihf
-else
- OPTEE_BIN := $(OPTEE_DIR)/toolchains/$(ARCH)/bin
- OBJCOPY := $(OPTEE_BIN)/aarch64-linux-gnu-objcopy
- TARGET := aarch64-unknown-linux-gnu
-endif
-
-OUT_DIR := $(CURDIR)/target/$(TARGET)/release
-
-
-all: host strip
-
-host:
- @cargo build --target $(TARGET) --release
-
-strip:
- @$(OBJCOPY) --strip-unneeded $(OUT_DIR)/$(NAME) $(OUT_DIR)/$(NAME)
-
-clean:
- @cargo clean
diff --git a/examples/random/Makefile b/examples/digest-rs/Makefile
similarity index 100%
rename from examples/random/Makefile
rename to examples/digest-rs/Makefile
diff --git a/examples/aes/host/Cargo.lock b/examples/digest-rs/host/Cargo.lock
similarity index 99%
rename from examples/aes/host/Cargo.lock
rename to examples/digest-rs/host/Cargo.lock
index c67ca50..4e3714b 100644
--- a/examples/aes/host/Cargo.lock
+++ b/examples/digest-rs/host/Cargo.lock
@@ -1,7 +1,7 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
[[package]]
-name = "aes"
+name = "digest-rs"
version = "0.1.0"
dependencies = [
"libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/examples/big_int/host/Cargo.toml b/examples/digest-rs/host/Cargo.toml
similarity index 98%
rename from examples/big_int/host/Cargo.toml
rename to examples/digest-rs/host/Cargo.toml
index 6303b92..0936bf4 100644
--- a/examples/big_int/host/Cargo.toml
+++ b/examples/digest-rs/host/Cargo.toml
@@ -16,7 +16,7 @@
# under the License.
[package]
-name = "big_int"
+name = "digest-rs"
version = "0.1.0"
authors = ["Teaclave Contributors <de...@teaclave.apache.org>"]
license = "Apache-2.0"
diff --git a/examples/aes/host/Makefile b/examples/digest-rs/host/Makefile
similarity index 98%
copy from examples/aes/host/Makefile
copy to examples/digest-rs/host/Makefile
index e2f89f1..617b85b 100644
--- a/examples/aes/host/Makefile
+++ b/examples/digest-rs/host/Makefile
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-NAME := aes
+NAME := digest-rs
ARCH ?= aarch64
OPTEE_DIR ?= ../../../optee
diff --git a/examples/digest/host/src/main.rs b/examples/digest-rs/host/src/main.rs
similarity index 100%
rename from examples/digest/host/src/main.rs
rename to examples/digest-rs/host/src/main.rs
diff --git a/examples/hello_world/proto/Cargo.toml b/examples/digest-rs/proto/Cargo.toml
similarity index 100%
rename from examples/hello_world/proto/Cargo.toml
rename to examples/digest-rs/proto/Cargo.toml
diff --git a/examples/random/proto/build.rs b/examples/digest-rs/proto/build.rs
similarity index 100%
rename from examples/random/proto/build.rs
rename to examples/digest-rs/proto/build.rs
diff --git a/examples/digest/proto/src/lib.rs b/examples/digest-rs/proto/src/lib.rs
similarity index 100%
rename from examples/digest/proto/src/lib.rs
rename to examples/digest-rs/proto/src/lib.rs
diff --git a/examples/digest/ta/Cargo.lock b/examples/digest-rs/ta/Cargo.lock
similarity index 100%
rename from examples/digest/ta/Cargo.lock
rename to examples/digest-rs/ta/Cargo.lock
diff --git a/examples/random/ta/Cargo.toml b/examples/digest-rs/ta/Cargo.toml
similarity index 100%
rename from examples/random/ta/Cargo.toml
rename to examples/digest-rs/ta/Cargo.toml
diff --git a/examples/random/ta/Makefile b/examples/digest-rs/ta/Makefile
similarity index 100%
rename from examples/random/ta/Makefile
rename to examples/digest-rs/ta/Makefile
diff --git a/examples/secure_storage/ta/Xargo.toml b/examples/digest-rs/ta/Xargo.toml
similarity index 100%
rename from examples/secure_storage/ta/Xargo.toml
rename to examples/digest-rs/ta/Xargo.toml
diff --git a/examples/random/ta/build.rs b/examples/digest-rs/ta/build.rs
similarity index 100%
rename from examples/random/ta/build.rs
rename to examples/digest-rs/ta/build.rs
diff --git a/examples/digest/ta/src/main.rs b/examples/digest-rs/ta/src/main.rs
similarity index 100%
rename from examples/digest/ta/src/main.rs
rename to examples/digest-rs/ta/src/main.rs
diff --git a/examples/secure_storage/ta/ta_aarch64.lds b/examples/digest-rs/ta/ta_aarch64.lds
similarity index 100%
rename from examples/secure_storage/ta/ta_aarch64.lds
rename to examples/digest-rs/ta/ta_aarch64.lds
diff --git a/examples/secure_storage/ta/ta_arm.lds b/examples/digest-rs/ta/ta_arm.lds
similarity index 100%
rename from examples/secure_storage/ta/ta_arm.lds
rename to examples/digest-rs/ta/ta_arm.lds
diff --git a/examples/secure_storage/ta/ta_static.rs b/examples/digest-rs/ta/ta_static.rs
similarity index 100%
rename from examples/secure_storage/ta/ta_static.rs
rename to examples/digest-rs/ta/ta_static.rs
diff --git a/examples/digest/uuid.txt b/examples/digest-rs/uuid.txt
similarity index 100%
rename from examples/digest/uuid.txt
rename to examples/digest-rs/uuid.txt
diff --git a/examples/message_passing_interface/Makefile b/examples/hello_world-rs/Makefile
similarity index 100%
rename from examples/message_passing_interface/Makefile
rename to examples/hello_world-rs/Makefile
diff --git a/examples/authentication/host/Cargo.lock b/examples/hello_world-rs/host/Cargo.lock
similarity index 99%
copy from examples/authentication/host/Cargo.lock
copy to examples/hello_world-rs/host/Cargo.lock
index c35373a..a5e85fc 100644
--- a/examples/authentication/host/Cargo.lock
+++ b/examples/hello_world-rs/host/Cargo.lock
@@ -1,7 +1,7 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
[[package]]
-name = "authentication"
+name = "hello_world-rs"
version = "0.1.0"
dependencies = [
"libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/examples/authentication/host/Cargo.toml b/examples/hello_world-rs/host/Cargo.toml
similarity index 98%
rename from examples/authentication/host/Cargo.toml
rename to examples/hello_world-rs/host/Cargo.toml
index c5871e3..7b5bd0c 100644
--- a/examples/authentication/host/Cargo.toml
+++ b/examples/hello_world-rs/host/Cargo.toml
@@ -16,7 +16,7 @@
# under the License.
[package]
-name = "authentication"
+name = "hello_world-rs"
version = "0.1.0"
authors = ["Teaclave Contributors <de...@teaclave.apache.org>"]
license = "Apache-2.0"
diff --git a/examples/authentication/host/Makefile b/examples/hello_world-rs/host/Makefile
similarity index 98%
rename from examples/authentication/host/Makefile
rename to examples/hello_world-rs/host/Makefile
index 1e5ef8e..bf46340 100644
--- a/examples/authentication/host/Makefile
+++ b/examples/hello_world-rs/host/Makefile
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-NAME := authentication
+NAME := hello_world-rs
ARCH ?= aarch64
OPTEE_DIR ?= ../../../optee
diff --git a/examples/hello_world/host/src/main.rs b/examples/hello_world-rs/host/src/main.rs
similarity index 100%
rename from examples/hello_world/host/src/main.rs
rename to examples/hello_world-rs/host/src/main.rs
diff --git a/examples/digest/proto/Cargo.toml b/examples/hello_world-rs/proto/Cargo.toml
similarity index 100%
rename from examples/digest/proto/Cargo.toml
rename to examples/hello_world-rs/proto/Cargo.toml
diff --git a/examples/message_passing_interface/proto/build.rs b/examples/hello_world-rs/proto/build.rs
similarity index 100%
rename from examples/message_passing_interface/proto/build.rs
rename to examples/hello_world-rs/proto/build.rs
diff --git a/examples/hello_world/proto/src/lib.rs b/examples/hello_world-rs/proto/src/lib.rs
similarity index 100%
rename from examples/hello_world/proto/src/lib.rs
rename to examples/hello_world-rs/proto/src/lib.rs
diff --git a/examples/udp_socket/ta/Cargo.lock b/examples/hello_world-rs/ta/Cargo.lock
similarity index 93%
rename from examples/udp_socket/ta/Cargo.lock
rename to examples/hello_world-rs/ta/Cargo.lock
index 4499911..4fb4331 100644
--- a/examples/udp_socket/ta/Cargo.lock
+++ b/examples/hello_world-rs/ta/Cargo.lock
@@ -2,7 +2,7 @@
# It is not intended for manual editing.
[[package]]
name = "bitflags"
-version = "1.1.0"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -18,7 +18,7 @@ version = "0.2.59"
name = "optee-utee"
version = "0.1.0"
dependencies = [
- "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.59",
"optee-utee-macros 0.1.0",
@@ -96,7 +96,7 @@ version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[metadata]
-"checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd"
+"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
"checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
"checksum quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db"
diff --git a/examples/hotp/ta/Cargo.toml b/examples/hello_world-rs/ta/Cargo.toml
similarity index 100%
rename from examples/hotp/ta/Cargo.toml
rename to examples/hello_world-rs/ta/Cargo.toml
diff --git a/examples/message_passing_interface/ta/Makefile b/examples/hello_world-rs/ta/Makefile
similarity index 100%
rename from examples/message_passing_interface/ta/Makefile
rename to examples/hello_world-rs/ta/Makefile
diff --git a/examples/random/ta/Xargo.toml b/examples/hello_world-rs/ta/Xargo.toml
similarity index 100%
rename from examples/random/ta/Xargo.toml
rename to examples/hello_world-rs/ta/Xargo.toml
diff --git a/examples/message_passing_interface/ta/build.rs b/examples/hello_world-rs/ta/build.rs
similarity index 100%
rename from examples/message_passing_interface/ta/build.rs
rename to examples/hello_world-rs/ta/build.rs
diff --git a/examples/hello_world/ta/src/main.rs b/examples/hello_world-rs/ta/src/main.rs
similarity index 100%
rename from examples/hello_world/ta/src/main.rs
rename to examples/hello_world-rs/ta/src/main.rs
diff --git a/examples/random/ta/ta_aarch64.lds b/examples/hello_world-rs/ta/ta_aarch64.lds
similarity index 100%
rename from examples/random/ta/ta_aarch64.lds
rename to examples/hello_world-rs/ta/ta_aarch64.lds
diff --git a/examples/random/ta/ta_arm.lds b/examples/hello_world-rs/ta/ta_arm.lds
similarity index 100%
rename from examples/random/ta/ta_arm.lds
rename to examples/hello_world-rs/ta/ta_arm.lds
diff --git a/examples/random/ta/ta_static.rs b/examples/hello_world-rs/ta/ta_static.rs
similarity index 100%
rename from examples/random/ta/ta_static.rs
rename to examples/hello_world-rs/ta/ta_static.rs
diff --git a/examples/hello_world/uuid.txt b/examples/hello_world-rs/uuid.txt
similarity index 100%
rename from examples/hello_world/uuid.txt
rename to examples/hello_world-rs/uuid.txt
diff --git a/examples/hello_world/host/Cargo.lock b/examples/hello_world/host/Cargo.lock
deleted file mode 100644
index a667032..0000000
--- a/examples/hello_world/host/Cargo.lock
+++ /dev/null
@@ -1,104 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-[[package]]
-name = "hello_world"
-version = "0.1.0"
-dependencies = [
- "libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
- "optee-teec 0.1.0",
- "proto 0.1.0",
-]
-
-[[package]]
-name = "hex"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "libc"
-version = "0.2.95"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "optee-teec"
-version = "0.1.0"
-dependencies = [
- "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
- "optee-teec-macros 0.1.0",
- "optee-teec-sys 0.1.0",
- "uuid 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "optee-teec-macros"
-version = "0.1.0"
-dependencies = [
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "optee-teec-sys"
-version = "0.1.0"
-dependencies = [
- "libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "0.4.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "proto"
-version = "0.1.0"
-dependencies = [
- "uuid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "quote"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "syn"
-version = "0.15.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "unicode-xid"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "uuid"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "uuid"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[metadata]
-"checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
-"checksum libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)" = "789da6d93f1b866ffe175afc5322a4d76c038605a1c3319bb57b06967ca98a36"
-"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
-"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
-"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
-"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
-"checksum uuid 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0238db0c5b605dd1cf51de0f21766f97fba2645897024461d6a00c036819a768"
-"checksum uuid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
diff --git a/examples/hello_world/host/Cargo.toml b/examples/hello_world/host/Cargo.toml
deleted file mode 100644
index 82d78e7..0000000
--- a/examples/hello_world/host/Cargo.toml
+++ /dev/null
@@ -1,33 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you 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.
-
-[package]
-name = "hello_world"
-version = "0.1.0"
-authors = ["Teaclave Contributors <de...@teaclave.apache.org>"]
-license = "Apache-2.0"
-repository = "https://github.com/apache/incubator-teaclave-trustzone-sdk.git"
-description = "An example of Rust OP-TEE TrustZone SDK."
-edition = "2018"
-
-[dependencies]
-libc = "0.2.48"
-proto = { path = "../proto" }
-optee-teec = { path = "../../../optee-teec" }
-
-[profile.release]
-lto = true
diff --git a/examples/hello_world/host/Makefile b/examples/hello_world/host/Makefile
deleted file mode 100644
index 7ad1926..0000000
--- a/examples/hello_world/host/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you 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.
-
-NAME := hello_world
-ARCH ?= aarch64
-
-OPTEE_DIR ?= ../../../optee
-
-ifeq ($(ARCH), arm)
- OPTEE_BIN := $(OPTEE_DIR)/toolchains/aarch32/bin
- OBJCOPY := $(OPTEE_BIN)/arm-linux-gnueabihf-objcopy
- TARGET := arm-unknown-linux-gnueabihf
-else
- OPTEE_BIN := $(OPTEE_DIR)/toolchains/$(ARCH)/bin
- OBJCOPY := $(OPTEE_BIN)/aarch64-linux-gnu-objcopy
- TARGET := aarch64-unknown-linux-gnu
-endif
-
-OUT_DIR := $(CURDIR)/target/$(TARGET)/release
-
-
-all: host strip
-
-host:
- @cargo build --target $(TARGET) --release
-
-strip:
- @$(OBJCOPY) --strip-unneeded $(OUT_DIR)/$(NAME) $(OUT_DIR)/$(NAME)
-
-clean:
- @cargo clean
diff --git a/examples/hotp/Makefile b/examples/hotp-rs/Makefile
similarity index 100%
rename from examples/hotp/Makefile
rename to examples/hotp-rs/Makefile
diff --git a/examples/acipher/host/Cargo.lock b/examples/hotp-rs/host/Cargo.lock
similarity index 99%
rename from examples/acipher/host/Cargo.lock
rename to examples/hotp-rs/host/Cargo.lock
index 39fbf82..4205dd7 100644
--- a/examples/acipher/host/Cargo.lock
+++ b/examples/hotp-rs/host/Cargo.lock
@@ -1,7 +1,12 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
[[package]]
-name = "acipher"
+name = "hex"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "hotp-rs"
version = "0.1.0"
dependencies = [
"libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -10,11 +15,6 @@ dependencies = [
]
[[package]]
-name = "hex"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
name = "libc"
version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/examples/digest/host/Cargo.toml b/examples/hotp-rs/host/Cargo.toml
similarity index 98%
rename from examples/digest/host/Cargo.toml
rename to examples/hotp-rs/host/Cargo.toml
index a53eb5c..ae56675 100644
--- a/examples/digest/host/Cargo.toml
+++ b/examples/hotp-rs/host/Cargo.toml
@@ -16,7 +16,7 @@
# under the License.
[package]
-name = "digest"
+name = "hotp-rs"
version = "0.1.0"
authors = ["Teaclave Contributors <de...@teaclave.apache.org>"]
license = "Apache-2.0"
diff --git a/examples/digest/host/Makefile b/examples/hotp-rs/host/Makefile
similarity index 98%
rename from examples/digest/host/Makefile
rename to examples/hotp-rs/host/Makefile
index 705a466..fdde1c7 100644
--- a/examples/digest/host/Makefile
+++ b/examples/hotp-rs/host/Makefile
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-NAME := digest
+NAME := hotp-rs
ARCH ?= aarch64
OPTEE_DIR ?= ../../../optee
diff --git a/examples/hotp/host/src/main.rs b/examples/hotp-rs/host/src/main.rs
similarity index 100%
rename from examples/hotp/host/src/main.rs
rename to examples/hotp-rs/host/src/main.rs
diff --git a/examples/serde/proto/Cargo.toml b/examples/hotp-rs/proto/Cargo.toml
similarity index 100%
rename from examples/serde/proto/Cargo.toml
rename to examples/hotp-rs/proto/Cargo.toml
diff --git a/examples/hotp/proto/build.rs b/examples/hotp-rs/proto/build.rs
similarity index 100%
rename from examples/hotp/proto/build.rs
rename to examples/hotp-rs/proto/build.rs
diff --git a/examples/hotp/proto/src/lib.rs b/examples/hotp-rs/proto/src/lib.rs
similarity index 100%
rename from examples/hotp/proto/src/lib.rs
rename to examples/hotp-rs/proto/src/lib.rs
diff --git a/examples/big_int/ta/Cargo.lock b/examples/hotp-rs/ta/Cargo.lock
similarity index 100%
rename from examples/big_int/ta/Cargo.lock
rename to examples/hotp-rs/ta/Cargo.lock
diff --git a/examples/hello_world/ta/Cargo.toml b/examples/hotp-rs/ta/Cargo.toml
similarity index 100%
rename from examples/hello_world/ta/Cargo.toml
rename to examples/hotp-rs/ta/Cargo.toml
diff --git a/examples/hotp/ta/Makefile b/examples/hotp-rs/ta/Makefile
similarity index 100%
rename from examples/hotp/ta/Makefile
rename to examples/hotp-rs/ta/Makefile
diff --git a/examples/message_passing_interface/ta/Xargo.toml b/examples/hotp-rs/ta/Xargo.toml
similarity index 100%
rename from examples/message_passing_interface/ta/Xargo.toml
rename to examples/hotp-rs/ta/Xargo.toml
diff --git a/examples/hotp/ta/build.rs b/examples/hotp-rs/ta/build.rs
similarity index 100%
rename from examples/hotp/ta/build.rs
rename to examples/hotp-rs/ta/build.rs
diff --git a/examples/hotp/ta/src/main.rs b/examples/hotp-rs/ta/src/main.rs
similarity index 100%
rename from examples/hotp/ta/src/main.rs
rename to examples/hotp-rs/ta/src/main.rs
diff --git a/examples/message_passing_interface/ta/ta_aarch64.lds b/examples/hotp-rs/ta/ta_aarch64.lds
similarity index 100%
rename from examples/message_passing_interface/ta/ta_aarch64.lds
rename to examples/hotp-rs/ta/ta_aarch64.lds
diff --git a/examples/message_passing_interface/ta/ta_arm.lds b/examples/hotp-rs/ta/ta_arm.lds
similarity index 100%
rename from examples/message_passing_interface/ta/ta_arm.lds
rename to examples/hotp-rs/ta/ta_arm.lds
diff --git a/examples/hotp/ta/ta_static.rs b/examples/hotp-rs/ta/ta_static.rs
similarity index 100%
rename from examples/hotp/ta/ta_static.rs
rename to examples/hotp-rs/ta/ta_static.rs
diff --git a/examples/hotp/uuid.txt b/examples/hotp-rs/uuid.txt
similarity index 100%
rename from examples/hotp/uuid.txt
rename to examples/hotp-rs/uuid.txt
diff --git a/examples/hotp/host/Cargo.lock b/examples/hotp/host/Cargo.lock
deleted file mode 100644
index 0331b89..0000000
--- a/examples/hotp/host/Cargo.lock
+++ /dev/null
@@ -1,104 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-[[package]]
-name = "hex"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "hotp"
-version = "0.1.0"
-dependencies = [
- "libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
- "optee-teec 0.1.0",
- "proto 0.1.0",
-]
-
-[[package]]
-name = "libc"
-version = "0.2.95"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "optee-teec"
-version = "0.1.0"
-dependencies = [
- "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
- "optee-teec-macros 0.1.0",
- "optee-teec-sys 0.1.0",
- "uuid 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "optee-teec-macros"
-version = "0.1.0"
-dependencies = [
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "optee-teec-sys"
-version = "0.1.0"
-dependencies = [
- "libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "0.4.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "proto"
-version = "0.1.0"
-dependencies = [
- "uuid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "quote"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "syn"
-version = "0.15.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "unicode-xid"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "uuid"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "uuid"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[metadata]
-"checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
-"checksum libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)" = "789da6d93f1b866ffe175afc5322a4d76c038605a1c3319bb57b06967ca98a36"
-"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
-"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
-"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
-"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
-"checksum uuid 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0238db0c5b605dd1cf51de0f21766f97fba2645897024461d6a00c036819a768"
-"checksum uuid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
diff --git a/examples/hotp/host/Cargo.toml b/examples/hotp/host/Cargo.toml
deleted file mode 100644
index 103b933..0000000
--- a/examples/hotp/host/Cargo.toml
+++ /dev/null
@@ -1,33 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you 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.
-
-[package]
-name = "hotp"
-version = "0.1.0"
-authors = ["Teaclave Contributors <de...@teaclave.apache.org>"]
-license = "Apache-2.0"
-repository = "https://github.com/apache/incubator-teaclave-trustzone-sdk.git"
-description = "An example of Rust OP-TEE TrustZone SDK."
-edition = "2018"
-
-[dependencies]
-libc = "0.2.48"
-proto = { path = "../proto" }
-optee-teec = { path = "../../../optee-teec" }
-
-[profile.release]
-lto = true
diff --git a/examples/hotp/host/Makefile b/examples/hotp/host/Makefile
deleted file mode 100644
index bb74a7e..0000000
--- a/examples/hotp/host/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you 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.
-
-NAME := hotp
-ARCH ?= aarch64
-
-OPTEE_DIR ?= ../../../optee
-
-ifeq ($(ARCH), arm)
- OPTEE_BIN := $(OPTEE_DIR)/toolchains/aarch32/bin
- OBJCOPY := $(OPTEE_BIN)/arm-linux-gnueabihf-objcopy
- TARGET := arm-unknown-linux-gnueabihf
-else
- OPTEE_BIN := $(OPTEE_DIR)/toolchains/$(ARCH)/bin
- OBJCOPY := $(OPTEE_BIN)/aarch64-linux-gnu-objcopy
- TARGET := aarch64-unknown-linux-gnu
-endif
-
-OUT_DIR := $(CURDIR)/target/$(TARGET)/release
-
-
-all: host strip
-
-host:
- @cargo build --target $(TARGET) --release
-
-strip:
- @$(OBJCOPY) --strip-unneeded $(OUT_DIR)/$(NAME) $(OUT_DIR)/$(NAME)
-
-clean:
- @cargo clean
diff --git a/examples/hello_world/Makefile b/examples/message_passing_interface-rs/Makefile
similarity index 100%
rename from examples/hello_world/Makefile
rename to examples/message_passing_interface-rs/Makefile
diff --git a/examples/message_passing_interface/host/Cargo.lock b/examples/message_passing_interface-rs/host/Cargo.lock
similarity index 99%
rename from examples/message_passing_interface/host/Cargo.lock
rename to examples/message_passing_interface-rs/host/Cargo.lock
index 78fe0b4..89b5ac4 100644
--- a/examples/message_passing_interface/host/Cargo.lock
+++ b/examples/message_passing_interface-rs/host/Cargo.lock
@@ -31,7 +31,7 @@ version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
-name = "message_passing_interface"
+name = "message_passing_interface-rs"
version = "0.1.0"
dependencies = [
"libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/examples/aes/host/Cargo.toml b/examples/message_passing_interface-rs/host/Cargo.toml
similarity index 95%
copy from examples/aes/host/Cargo.toml
copy to examples/message_passing_interface-rs/host/Cargo.toml
index d4d780e..d5d9b64 100644
--- a/examples/aes/host/Cargo.toml
+++ b/examples/message_passing_interface-rs/host/Cargo.toml
@@ -16,7 +16,7 @@
# under the License.
[package]
-name = "aes"
+name = "message_passing_interface-rs"
version = "0.1.0"
authors = ["Teaclave Contributors <de...@teaclave.apache.org>"]
license = "Apache-2.0"
@@ -26,8 +26,6 @@ edition = "2018"
[dependencies]
libc = "0.2.48"
+url = "1.7.2"
proto = { path = "../proto" }
optee-teec = { path = "../../../optee-teec" }
-
-[profile.release]
-lto = true
diff --git a/examples/aes/host/Makefile b/examples/message_passing_interface-rs/host/Makefile
similarity index 97%
copy from examples/aes/host/Makefile
copy to examples/message_passing_interface-rs/host/Makefile
index e2f89f1..61ef2b6 100644
--- a/examples/aes/host/Makefile
+++ b/examples/message_passing_interface-rs/host/Makefile
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-NAME := aes
+NAME := message_passing_interface-rs
ARCH ?= aarch64
OPTEE_DIR ?= ../../../optee
diff --git a/examples/message_passing_interface/host/src/main.rs b/examples/message_passing_interface-rs/host/src/main.rs
similarity index 100%
rename from examples/message_passing_interface/host/src/main.rs
rename to examples/message_passing_interface-rs/host/src/main.rs
diff --git a/examples/message_passing_interface/proto/Cargo.toml b/examples/message_passing_interface-rs/proto/Cargo.toml
similarity index 100%
rename from examples/message_passing_interface/proto/Cargo.toml
rename to examples/message_passing_interface-rs/proto/Cargo.toml
diff --git a/examples/hello_world/proto/build.rs b/examples/message_passing_interface-rs/proto/build.rs
similarity index 100%
rename from examples/hello_world/proto/build.rs
rename to examples/message_passing_interface-rs/proto/build.rs
diff --git a/examples/message_passing_interface/proto/src/lib.rs b/examples/message_passing_interface-rs/proto/src/lib.rs
similarity index 100%
rename from examples/message_passing_interface/proto/src/lib.rs
rename to examples/message_passing_interface-rs/proto/src/lib.rs
diff --git a/examples/message_passing_interface/ta/Cargo.lock b/examples/message_passing_interface-rs/ta/Cargo.lock
similarity index 100%
rename from examples/message_passing_interface/ta/Cargo.lock
rename to examples/message_passing_interface-rs/ta/Cargo.lock
diff --git a/examples/message_passing_interface/ta/Cargo.toml b/examples/message_passing_interface-rs/ta/Cargo.toml
similarity index 100%
rename from examples/message_passing_interface/ta/Cargo.toml
rename to examples/message_passing_interface-rs/ta/Cargo.toml
diff --git a/examples/hello_world/ta/Makefile b/examples/message_passing_interface-rs/ta/Makefile
similarity index 100%
rename from examples/hello_world/ta/Makefile
rename to examples/message_passing_interface-rs/ta/Makefile
diff --git a/examples/hotp/ta/Xargo.toml b/examples/message_passing_interface-rs/ta/Xargo.toml
similarity index 100%
rename from examples/hotp/ta/Xargo.toml
rename to examples/message_passing_interface-rs/ta/Xargo.toml
diff --git a/examples/hello_world/ta/build.rs b/examples/message_passing_interface-rs/ta/build.rs
similarity index 100%
rename from examples/hello_world/ta/build.rs
rename to examples/message_passing_interface-rs/ta/build.rs
diff --git a/examples/message_passing_interface/ta/src/main.rs b/examples/message_passing_interface-rs/ta/src/main.rs
similarity index 100%
rename from examples/message_passing_interface/ta/src/main.rs
rename to examples/message_passing_interface-rs/ta/src/main.rs
diff --git a/examples/hotp/ta/ta_aarch64.lds b/examples/message_passing_interface-rs/ta/ta_aarch64.lds
similarity index 100%
rename from examples/hotp/ta/ta_aarch64.lds
rename to examples/message_passing_interface-rs/ta/ta_aarch64.lds
diff --git a/examples/hotp/ta/ta_arm.lds b/examples/message_passing_interface-rs/ta/ta_arm.lds
similarity index 100%
rename from examples/hotp/ta/ta_arm.lds
rename to examples/message_passing_interface-rs/ta/ta_arm.lds
diff --git a/examples/message_passing_interface/ta/ta_static.rs b/examples/message_passing_interface-rs/ta/ta_static.rs
similarity index 100%
rename from examples/message_passing_interface/ta/ta_static.rs
rename to examples/message_passing_interface-rs/ta/ta_static.rs
diff --git a/examples/message_passing_interface/uuid.txt b/examples/message_passing_interface-rs/uuid.txt
similarity index 100%
rename from examples/message_passing_interface/uuid.txt
rename to examples/message_passing_interface-rs/uuid.txt
diff --git a/examples/message_passing_interface/host/Cargo.toml b/examples/message_passing_interface/host/Cargo.toml
deleted file mode 100644
index f6814b6..0000000
--- a/examples/message_passing_interface/host/Cargo.toml
+++ /dev/null
@@ -1,31 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you 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.
-
-[package]
-name = "message_passing_interface"
-version = "0.1.0"
-authors = ["Teaclave Contributors <de...@teaclave.apache.org>"]
-license = "Apache-2.0"
-repository = "https://github.com/apache/incubator-teaclave-trustzone-sdk.git"
-description = "An example of Rust OP-TEE TrustZone SDK."
-edition = "2018"
-
-[dependencies]
-libc = "0.2.48"
-url = "1.7.2"
-proto = { path = "../proto" }
-optee-teec = { path = "../../../optee-teec" }
\ No newline at end of file
diff --git a/examples/message_passing_interface/host/Makefile b/examples/message_passing_interface/host/Makefile
deleted file mode 100644
index 0c2effa..0000000
--- a/examples/message_passing_interface/host/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you 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.
-
-NAME := message_passing_interface
-ARCH ?= aarch64
-
-OPTEE_DIR ?= ../../../optee
-
-ifeq ($(ARCH), arm)
- OPTEE_BIN := $(OPTEE_DIR)/toolchains/aarch32/bin
- OBJCOPY := $(OPTEE_BIN)/arm-linux-gnueabihf-objcopy
- TARGET := arm-unknown-linux-gnueabihf
-else
- OPTEE_BIN := $(OPTEE_DIR)/toolchains/$(ARCH)/bin
- OBJCOPY := $(OPTEE_BIN)/aarch64-linux-gnu-objcopy
- TARGET := aarch64-unknown-linux-gnu
-endif
-
-OUT_DIR := $(CURDIR)/target/$(TARGET)/release
-
-
-all: host strip
-
-host:
- @cargo build --target $(TARGET) --release
-
-strip:
- @$(OBJCOPY) --strip-unneeded $(OUT_DIR)/$(NAME) $(OUT_DIR)/$(NAME)
-
-clean:
- @cargo clean
diff --git a/examples/digest/Makefile b/examples/random-rs/Makefile
similarity index 100%
rename from examples/digest/Makefile
rename to examples/random-rs/Makefile
diff --git a/examples/digest/host/Cargo.lock b/examples/random-rs/host/Cargo.lock
similarity index 99%
copy from examples/digest/host/Cargo.lock
copy to examples/random-rs/host/Cargo.lock
index 6ad9db0..b7c9297 100644
--- a/examples/digest/host/Cargo.lock
+++ b/examples/random-rs/host/Cargo.lock
@@ -1,15 +1,6 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
[[package]]
-name = "digest"
-version = "0.1.0"
-dependencies = [
- "libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
- "optee-teec 0.1.0",
- "proto 0.1.0",
-]
-
-[[package]]
name = "hex"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -69,6 +60,15 @@ dependencies = [
]
[[package]]
+name = "random-rs"
+version = "0.1.0"
+dependencies = [
+ "libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
+ "optee-teec 0.1.0",
+ "proto 0.1.0",
+]
+
+[[package]]
name = "syn"
version = "0.15.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/examples/aes/host/Cargo.toml b/examples/random-rs/host/Cargo.toml
similarity index 98%
copy from examples/aes/host/Cargo.toml
copy to examples/random-rs/host/Cargo.toml
index d4d780e..d5c21e4 100644
--- a/examples/aes/host/Cargo.toml
+++ b/examples/random-rs/host/Cargo.toml
@@ -16,7 +16,7 @@
# under the License.
[package]
-name = "aes"
+name = "random-rs"
version = "0.1.0"
authors = ["Teaclave Contributors <de...@teaclave.apache.org>"]
license = "Apache-2.0"
diff --git a/examples/aes/host/Makefile b/examples/random-rs/host/Makefile
similarity index 98%
copy from examples/aes/host/Makefile
copy to examples/random-rs/host/Makefile
index e2f89f1..663ed11 100644
--- a/examples/aes/host/Makefile
+++ b/examples/random-rs/host/Makefile
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-NAME := aes
+NAME := random-rs
ARCH ?= aarch64
OPTEE_DIR ?= ../../../optee
diff --git a/examples/random/host/src/main.rs b/examples/random-rs/host/src/main.rs
similarity index 100%
rename from examples/random/host/src/main.rs
rename to examples/random-rs/host/src/main.rs
diff --git a/examples/diffie_hellman/proto/Cargo.toml b/examples/random-rs/proto/Cargo.toml
similarity index 100%
rename from examples/diffie_hellman/proto/Cargo.toml
rename to examples/random-rs/proto/Cargo.toml
diff --git a/examples/digest/proto/build.rs b/examples/random-rs/proto/build.rs
similarity index 100%
rename from examples/digest/proto/build.rs
rename to examples/random-rs/proto/build.rs
diff --git a/examples/random/proto/src/lib.rs b/examples/random-rs/proto/src/lib.rs
similarity index 100%
rename from examples/random/proto/src/lib.rs
rename to examples/random-rs/proto/src/lib.rs
diff --git a/examples/authentication/ta/Cargo.lock b/examples/random-rs/ta/Cargo.lock
similarity index 100%
rename from examples/authentication/ta/Cargo.lock
rename to examples/random-rs/ta/Cargo.lock
diff --git a/examples/digest/ta/Cargo.toml b/examples/random-rs/ta/Cargo.toml
similarity index 100%
rename from examples/digest/ta/Cargo.toml
rename to examples/random-rs/ta/Cargo.toml
diff --git a/examples/digest/ta/Makefile b/examples/random-rs/ta/Makefile
similarity index 100%
rename from examples/digest/ta/Makefile
rename to examples/random-rs/ta/Makefile
diff --git a/examples/hello_world/ta/Xargo.toml b/examples/random-rs/ta/Xargo.toml
similarity index 100%
rename from examples/hello_world/ta/Xargo.toml
rename to examples/random-rs/ta/Xargo.toml
diff --git a/examples/digest/ta/build.rs b/examples/random-rs/ta/build.rs
similarity index 100%
rename from examples/digest/ta/build.rs
rename to examples/random-rs/ta/build.rs
diff --git a/examples/random/ta/src/main.rs b/examples/random-rs/ta/src/main.rs
similarity index 100%
rename from examples/random/ta/src/main.rs
rename to examples/random-rs/ta/src/main.rs
diff --git a/examples/hello_world/ta/ta_aarch64.lds b/examples/random-rs/ta/ta_aarch64.lds
similarity index 100%
rename from examples/hello_world/ta/ta_aarch64.lds
rename to examples/random-rs/ta/ta_aarch64.lds
diff --git a/examples/hello_world/ta/ta_arm.lds b/examples/random-rs/ta/ta_arm.lds
similarity index 100%
rename from examples/hello_world/ta/ta_arm.lds
rename to examples/random-rs/ta/ta_arm.lds
diff --git a/examples/hello_world/ta/ta_static.rs b/examples/random-rs/ta/ta_static.rs
similarity index 100%
rename from examples/hello_world/ta/ta_static.rs
rename to examples/random-rs/ta/ta_static.rs
diff --git a/examples/random/uuid.txt b/examples/random-rs/uuid.txt
similarity index 100%
rename from examples/random/uuid.txt
rename to examples/random-rs/uuid.txt
diff --git a/examples/random/host/Cargo.lock b/examples/random/host/Cargo.lock
deleted file mode 100644
index 395b259..0000000
--- a/examples/random/host/Cargo.lock
+++ /dev/null
@@ -1,104 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-[[package]]
-name = "hex"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "libc"
-version = "0.2.95"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "optee-teec"
-version = "0.1.0"
-dependencies = [
- "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
- "optee-teec-macros 0.1.0",
- "optee-teec-sys 0.1.0",
- "uuid 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "optee-teec-macros"
-version = "0.1.0"
-dependencies = [
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "optee-teec-sys"
-version = "0.1.0"
-dependencies = [
- "libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "0.4.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "proto"
-version = "0.1.0"
-dependencies = [
- "uuid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "quote"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "random"
-version = "0.1.0"
-dependencies = [
- "libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
- "optee-teec 0.1.0",
- "proto 0.1.0",
-]
-
-[[package]]
-name = "syn"
-version = "0.15.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "unicode-xid"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "uuid"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "uuid"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[metadata]
-"checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
-"checksum libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)" = "789da6d93f1b866ffe175afc5322a4d76c038605a1c3319bb57b06967ca98a36"
-"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
-"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
-"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
-"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
-"checksum uuid 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0238db0c5b605dd1cf51de0f21766f97fba2645897024461d6a00c036819a768"
-"checksum uuid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
diff --git a/examples/random/host/Cargo.toml b/examples/random/host/Cargo.toml
deleted file mode 100644
index 31ecff9..0000000
--- a/examples/random/host/Cargo.toml
+++ /dev/null
@@ -1,33 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you 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.
-
-[package]
-name = "random"
-version = "0.1.0"
-authors = ["Teaclave Contributors <de...@teaclave.apache.org>"]
-license = "Apache-2.0"
-repository = "https://github.com/apache/incubator-teaclave-trustzone-sdk.git"
-description = "An example of Rust OP-TEE TrustZone SDK."
-edition = "2018"
-
-[dependencies]
-libc = "0.2.48"
-proto = { path = "../proto" }
-optee-teec = { path = "../../../optee-teec" }
-
-[profile.release]
-lto = true
diff --git a/examples/random/host/Makefile b/examples/random/host/Makefile
deleted file mode 100644
index 78996dc..0000000
--- a/examples/random/host/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you 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.
-
-NAME := random
-ARCH ?= aarch64
-
-OPTEE_DIR ?= ../../../optee
-
-ifeq ($(ARCH), arm)
- OPTEE_BIN := $(OPTEE_DIR)/toolchains/aarch32/bin
- OBJCOPY := $(OPTEE_BIN)/arm-linux-gnueabihf-objcopy
- TARGET := arm-unknown-linux-gnueabihf
-else
- OPTEE_BIN := $(OPTEE_DIR)/toolchains/$(ARCH)/bin
- OBJCOPY := $(OPTEE_BIN)/aarch64-linux-gnu-objcopy
- TARGET := aarch64-unknown-linux-gnu
-endif
-
-OUT_DIR := $(CURDIR)/target/$(TARGET)/release
-
-
-all: host strip
-
-host:
- @cargo build --target $(TARGET) --release
-
-strip:
- @$(OBJCOPY) --strip-unneeded $(OUT_DIR)/$(NAME) $(OUT_DIR)/$(NAME)
-
-clean:
- @cargo clean
diff --git a/examples/diffie_hellman/Makefile b/examples/secure_storage-rs/Makefile
similarity index 100%
rename from examples/diffie_hellman/Makefile
rename to examples/secure_storage-rs/Makefile
diff --git a/examples/authentication/host/Cargo.lock b/examples/secure_storage-rs/host/Cargo.lock
similarity index 99%
rename from examples/authentication/host/Cargo.lock
rename to examples/secure_storage-rs/host/Cargo.lock
index c35373a..362c3ca 100644
--- a/examples/authentication/host/Cargo.lock
+++ b/examples/secure_storage-rs/host/Cargo.lock
@@ -1,15 +1,6 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
[[package]]
-name = "authentication"
-version = "0.1.0"
-dependencies = [
- "libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
- "optee-teec 0.1.0",
- "proto 0.1.0",
-]
-
-[[package]]
name = "hex"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -69,6 +60,15 @@ dependencies = [
]
[[package]]
+name = "secure_storage-rs"
+version = "0.1.0"
+dependencies = [
+ "libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
+ "optee-teec 0.1.0",
+ "proto 0.1.0",
+]
+
+[[package]]
name = "syn"
version = "0.15.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/examples/aes/host/Cargo.toml b/examples/secure_storage-rs/host/Cargo.toml
similarity index 97%
copy from examples/aes/host/Cargo.toml
copy to examples/secure_storage-rs/host/Cargo.toml
index d4d780e..bc48b88 100644
--- a/examples/aes/host/Cargo.toml
+++ b/examples/secure_storage-rs/host/Cargo.toml
@@ -16,7 +16,7 @@
# under the License.
[package]
-name = "aes"
+name = "secure_storage-rs"
version = "0.1.0"
authors = ["Teaclave Contributors <de...@teaclave.apache.org>"]
license = "Apache-2.0"
diff --git a/examples/aes/host/Makefile b/examples/secure_storage-rs/host/Makefile
similarity index 98%
copy from examples/aes/host/Makefile
copy to examples/secure_storage-rs/host/Makefile
index e2f89f1..7dbed02 100644
--- a/examples/aes/host/Makefile
+++ b/examples/secure_storage-rs/host/Makefile
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-NAME := aes
+NAME := secure_storage-rs
ARCH ?= aarch64
OPTEE_DIR ?= ../../../optee
diff --git a/examples/secure_storage/host/src/main.rs b/examples/secure_storage-rs/host/src/main.rs
similarity index 100%
rename from examples/secure_storage/host/src/main.rs
rename to examples/secure_storage-rs/host/src/main.rs
diff --git a/examples/big_int/proto/Cargo.toml b/examples/secure_storage-rs/proto/Cargo.toml
similarity index 100%
rename from examples/big_int/proto/Cargo.toml
rename to examples/secure_storage-rs/proto/Cargo.toml
diff --git a/examples/diffie_hellman/proto/build.rs b/examples/secure_storage-rs/proto/build.rs
similarity index 100%
rename from examples/diffie_hellman/proto/build.rs
rename to examples/secure_storage-rs/proto/build.rs
diff --git a/examples/secure_storage/proto/src/lib.rs b/examples/secure_storage-rs/proto/src/lib.rs
similarity index 100%
rename from examples/secure_storage/proto/src/lib.rs
rename to examples/secure_storage-rs/proto/src/lib.rs
diff --git a/examples/aes/ta/Cargo.lock b/examples/secure_storage-rs/ta/Cargo.lock
similarity index 100%
rename from examples/aes/ta/Cargo.lock
rename to examples/secure_storage-rs/ta/Cargo.lock
diff --git a/examples/diffie_hellman/ta/Cargo.toml b/examples/secure_storage-rs/ta/Cargo.toml
similarity index 100%
rename from examples/diffie_hellman/ta/Cargo.toml
rename to examples/secure_storage-rs/ta/Cargo.toml
diff --git a/examples/diffie_hellman/ta/Makefile b/examples/secure_storage-rs/ta/Makefile
similarity index 100%
rename from examples/diffie_hellman/ta/Makefile
rename to examples/secure_storage-rs/ta/Makefile
diff --git a/examples/digest/ta/Xargo.toml b/examples/secure_storage-rs/ta/Xargo.toml
similarity index 100%
rename from examples/digest/ta/Xargo.toml
rename to examples/secure_storage-rs/ta/Xargo.toml
diff --git a/examples/diffie_hellman/ta/build.rs b/examples/secure_storage-rs/ta/build.rs
similarity index 100%
rename from examples/diffie_hellman/ta/build.rs
rename to examples/secure_storage-rs/ta/build.rs
diff --git a/examples/secure_storage/ta/src/main.rs b/examples/secure_storage-rs/ta/src/main.rs
similarity index 100%
rename from examples/secure_storage/ta/src/main.rs
rename to examples/secure_storage-rs/ta/src/main.rs
diff --git a/examples/digest/ta/ta_aarch64.lds b/examples/secure_storage-rs/ta/ta_aarch64.lds
similarity index 100%
rename from examples/digest/ta/ta_aarch64.lds
rename to examples/secure_storage-rs/ta/ta_aarch64.lds
diff --git a/examples/digest/ta/ta_arm.lds b/examples/secure_storage-rs/ta/ta_arm.lds
similarity index 100%
rename from examples/digest/ta/ta_arm.lds
rename to examples/secure_storage-rs/ta/ta_arm.lds
diff --git a/examples/digest/ta/ta_static.rs b/examples/secure_storage-rs/ta/ta_static.rs
similarity index 100%
rename from examples/digest/ta/ta_static.rs
rename to examples/secure_storage-rs/ta/ta_static.rs
diff --git a/examples/secure_storage/uuid.txt b/examples/secure_storage-rs/uuid.txt
similarity index 100%
rename from examples/secure_storage/uuid.txt
rename to examples/secure_storage-rs/uuid.txt
diff --git a/examples/secure_storage/host/Cargo.lock b/examples/secure_storage/host/Cargo.lock
deleted file mode 100644
index da00894..0000000
--- a/examples/secure_storage/host/Cargo.lock
+++ /dev/null
@@ -1,104 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-[[package]]
-name = "hex"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "libc"
-version = "0.2.95"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "optee-teec"
-version = "0.1.0"
-dependencies = [
- "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
- "optee-teec-macros 0.1.0",
- "optee-teec-sys 0.1.0",
- "uuid 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "optee-teec-macros"
-version = "0.1.0"
-dependencies = [
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "optee-teec-sys"
-version = "0.1.0"
-dependencies = [
- "libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "0.4.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "proto"
-version = "0.1.0"
-dependencies = [
- "uuid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "quote"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "secure_storage"
-version = "0.1.0"
-dependencies = [
- "libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
- "optee-teec 0.1.0",
- "proto 0.1.0",
-]
-
-[[package]]
-name = "syn"
-version = "0.15.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "unicode-xid"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "uuid"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "uuid"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[metadata]
-"checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
-"checksum libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)" = "789da6d93f1b866ffe175afc5322a4d76c038605a1c3319bb57b06967ca98a36"
-"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
-"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
-"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
-"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
-"checksum uuid 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0238db0c5b605dd1cf51de0f21766f97fba2645897024461d6a00c036819a768"
-"checksum uuid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
diff --git a/examples/secure_storage/host/Cargo.toml b/examples/secure_storage/host/Cargo.toml
deleted file mode 100644
index 77c4641..0000000
--- a/examples/secure_storage/host/Cargo.toml
+++ /dev/null
@@ -1,33 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you 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.
-
-[package]
-name = "secure_storage"
-version = "0.1.0"
-authors = ["Teaclave Contributors <de...@teaclave.apache.org>"]
-license = "Apache-2.0"
-repository = "https://github.com/apache/incubator-teaclave-trustzone-sdk.git"
-description = "An example of Rust OP-TEE TrustZone SDK."
-edition = "2018"
-
-[dependencies]
-libc = "0.2.48"
-proto = { path = "../proto" }
-optee-teec = { path = "../../../optee-teec" }
-
-[profile.release]
-lto = true
diff --git a/examples/secure_storage/host/Makefile b/examples/secure_storage/host/Makefile
deleted file mode 100644
index 8f594ab..0000000
--- a/examples/secure_storage/host/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you 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.
-
-NAME := secure_storage
-ARCH ?= aarch64
-
-OPTEE_DIR ?= ../../../optee
-
-ifeq ($(ARCH), arm)
- OPTEE_BIN := $(OPTEE_DIR)/toolchains/aarch32/bin
- OBJCOPY := $(OPTEE_BIN)/arm-linux-gnueabihf-objcopy
- TARGET := arm-unknown-linux-gnueabihf
-else
- OPTEE_BIN := $(OPTEE_DIR)/toolchains/$(ARCH)/bin
- OBJCOPY := $(OPTEE_BIN)/aarch64-linux-gnu-objcopy
- TARGET := aarch64-unknown-linux-gnu
-endif
-
-OUT_DIR := $(CURDIR)/target/$(TARGET)/release
-
-
-all: host strip
-
-host:
- @cargo build --target $(TARGET) --release
-
-strip:
- @$(OBJCOPY) --strip-unneeded $(OUT_DIR)/$(NAME) $(OUT_DIR)/$(NAME)
-
-clean:
- @cargo clean
diff --git a/examples/big_int/Makefile b/examples/serde-rs/Makefile
similarity index 100%
rename from examples/big_int/Makefile
rename to examples/serde-rs/Makefile
diff --git a/examples/serde/host/Cargo.lock b/examples/serde-rs/host/Cargo.lock
similarity index 99%
rename from examples/serde/host/Cargo.lock
rename to examples/serde-rs/host/Cargo.lock
index 172a10b..5c6d0f9 100644
--- a/examples/serde/host/Cargo.lock
+++ b/examples/serde-rs/host/Cargo.lock
@@ -71,6 +71,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "serde"
+version = "1.0.90"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "serde_derive 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "serde-rs"
version = "0.1.0"
dependencies = [
"libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -81,14 +89,6 @@ dependencies = [
]
[[package]]
-name = "serde"
-version = "1.0.90"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "serde_derive 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
name = "serde_derive"
version = "1.0.90"
source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/examples/serde/host/Cargo.toml b/examples/serde-rs/host/Cargo.toml
similarity index 98%
rename from examples/serde/host/Cargo.toml
rename to examples/serde-rs/host/Cargo.toml
index 3fb6442..9bd1c9f 100644
--- a/examples/serde/host/Cargo.toml
+++ b/examples/serde-rs/host/Cargo.toml
@@ -16,7 +16,7 @@
# under the License.
[package]
-name = "serde"
+name = "serde-rs"
version = "0.1.0"
authors = ["Teaclave Contributors <de...@teaclave.apache.org>"]
license = "Apache-2.0"
diff --git a/examples/acipher/host/Makefile b/examples/serde-rs/host/Makefile
similarity index 98%
rename from examples/acipher/host/Makefile
rename to examples/serde-rs/host/Makefile
index 0f85661..8010e57 100644
--- a/examples/acipher/host/Makefile
+++ b/examples/serde-rs/host/Makefile
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-NAME := acipher
+NAME := serde-rs
ARCH ?= aarch64
OPTEE_DIR ?= ../../../optee
diff --git a/examples/serde/host/src/main.rs b/examples/serde-rs/host/src/main.rs
similarity index 100%
rename from examples/serde/host/src/main.rs
rename to examples/serde-rs/host/src/main.rs
diff --git a/examples/hotp/proto/Cargo.toml b/examples/serde-rs/proto/Cargo.toml
similarity index 100%
rename from examples/hotp/proto/Cargo.toml
rename to examples/serde-rs/proto/Cargo.toml
diff --git a/examples/big_int/proto/build.rs b/examples/serde-rs/proto/build.rs
similarity index 100%
rename from examples/big_int/proto/build.rs
rename to examples/serde-rs/proto/build.rs
diff --git a/examples/serde/proto/src/lib.rs b/examples/serde-rs/proto/src/lib.rs
similarity index 100%
rename from examples/serde/proto/src/lib.rs
rename to examples/serde-rs/proto/src/lib.rs
diff --git a/examples/serde/ta/Cargo.lock b/examples/serde-rs/ta/Cargo.lock
similarity index 96%
rename from examples/serde/ta/Cargo.lock
rename to examples/serde-rs/ta/Cargo.lock
index 7025f09..d9f7fd3 100644
--- a/examples/serde/ta/Cargo.lock
+++ b/examples/serde-rs/ta/Cargo.lock
@@ -2,7 +2,7 @@
# It is not intended for manual editing.
[[package]]
name = "bitflags"
-version = "1.1.0"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -23,7 +23,7 @@ version = "0.2.59"
name = "optee-utee"
version = "0.1.0"
dependencies = [
- "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.59",
"optee-utee-macros 0.1.0",
@@ -167,7 +167,7 @@ version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[metadata]
-"checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd"
+"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
"checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
"checksum itoa 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
diff --git a/examples/serde/ta/Cargo.toml b/examples/serde-rs/ta/Cargo.toml
similarity index 100%
rename from examples/serde/ta/Cargo.toml
rename to examples/serde-rs/ta/Cargo.toml
diff --git a/examples/big_int/ta/Makefile b/examples/serde-rs/ta/Makefile
similarity index 100%
rename from examples/big_int/ta/Makefile
rename to examples/serde-rs/ta/Makefile
diff --git a/examples/diffie_hellman/ta/Xargo.toml b/examples/serde-rs/ta/Xargo.toml
similarity index 100%
rename from examples/diffie_hellman/ta/Xargo.toml
rename to examples/serde-rs/ta/Xargo.toml
diff --git a/examples/big_int/ta/build.rs b/examples/serde-rs/ta/build.rs
similarity index 100%
rename from examples/big_int/ta/build.rs
rename to examples/serde-rs/ta/build.rs
diff --git a/examples/serde/ta/src/main.rs b/examples/serde-rs/ta/src/main.rs
similarity index 100%
rename from examples/serde/ta/src/main.rs
rename to examples/serde-rs/ta/src/main.rs
diff --git a/examples/diffie_hellman/ta/ta_aarch64.lds b/examples/serde-rs/ta/ta_aarch64.lds
similarity index 100%
rename from examples/diffie_hellman/ta/ta_aarch64.lds
rename to examples/serde-rs/ta/ta_aarch64.lds
diff --git a/examples/diffie_hellman/ta/ta_arm.lds b/examples/serde-rs/ta/ta_arm.lds
similarity index 100%
rename from examples/diffie_hellman/ta/ta_arm.lds
rename to examples/serde-rs/ta/ta_arm.lds
diff --git a/examples/diffie_hellman/ta/ta_static.rs b/examples/serde-rs/ta/ta_static.rs
similarity index 100%
rename from examples/diffie_hellman/ta/ta_static.rs
rename to examples/serde-rs/ta/ta_static.rs
diff --git a/examples/serde/uuid.txt b/examples/serde-rs/uuid.txt
similarity index 100%
rename from examples/serde/uuid.txt
rename to examples/serde-rs/uuid.txt
diff --git a/examples/serde/host/Makefile b/examples/serde/host/Makefile
deleted file mode 100644
index de1434c..0000000
--- a/examples/serde/host/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you 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.
-
-NAME := serde
-ARCH ?= aarch64
-
-OPTEE_DIR ?= ../../../optee
-
-ifeq ($(ARCH), arm)
- OPTEE_BIN := $(OPTEE_DIR)/toolchains/aarch32/bin
- OBJCOPY := $(OPTEE_BIN)/arm-linux-gnueabihf-objcopy
- TARGET := arm-unknown-linux-gnueabihf
-else
- OPTEE_BIN := $(OPTEE_DIR)/toolchains/$(ARCH)/bin
- OBJCOPY := $(OPTEE_BIN)/aarch64-linux-gnu-objcopy
- TARGET := aarch64-unknown-linux-gnu
-endif
-
-OUT_DIR := $(CURDIR)/target/$(TARGET)/release
-
-
-all: host strip
-
-host:
- @cargo build --target $(TARGET) --release
-
-strip:
- @$(OBJCOPY) --strip-unneeded $(OUT_DIR)/$(NAME) $(OUT_DIR)/$(NAME)
-
-clean:
- @cargo clean
diff --git a/examples/supp_plugin/Makefile b/examples/supp_plugin-rs/Makefile
similarity index 100%
rename from examples/supp_plugin/Makefile
rename to examples/supp_plugin-rs/Makefile
diff --git a/examples/supp_plugin/host/Cargo.lock b/examples/supp_plugin-rs/host/Cargo.lock
similarity index 99%
rename from examples/supp_plugin/host/Cargo.lock
rename to examples/supp_plugin-rs/host/Cargo.lock
index d394d9c..a7e0821 100644
--- a/examples/supp_plugin/host/Cargo.lock
+++ b/examples/supp_plugin-rs/host/Cargo.lock
@@ -60,7 +60,7 @@ dependencies = [
]
[[package]]
-name = "supp_plugin"
+name = "supp_plugin-rs"
version = "0.1.0"
dependencies = [
"libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/examples/aes/host/Cargo.toml b/examples/supp_plugin-rs/host/Cargo.toml
similarity index 98%
copy from examples/aes/host/Cargo.toml
copy to examples/supp_plugin-rs/host/Cargo.toml
index d4d780e..99824a6 100644
--- a/examples/aes/host/Cargo.toml
+++ b/examples/supp_plugin-rs/host/Cargo.toml
@@ -16,7 +16,7 @@
# under the License.
[package]
-name = "aes"
+name = "supp_plugin-rs"
version = "0.1.0"
authors = ["Teaclave Contributors <de...@teaclave.apache.org>"]
license = "Apache-2.0"
diff --git a/examples/aes/host/Makefile b/examples/supp_plugin-rs/host/Makefile
similarity index 98%
copy from examples/aes/host/Makefile
copy to examples/supp_plugin-rs/host/Makefile
index e2f89f1..81a6b7a 100644
--- a/examples/aes/host/Makefile
+++ b/examples/supp_plugin-rs/host/Makefile
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-NAME := aes
+NAME := supp_plugin-rs
ARCH ?= aarch64
OPTEE_DIR ?= ../../../optee
diff --git a/examples/supp_plugin/host/src/main.rs b/examples/supp_plugin-rs/host/src/main.rs
similarity index 100%
rename from examples/supp_plugin/host/src/main.rs
rename to examples/supp_plugin-rs/host/src/main.rs
diff --git a/examples/supp_plugin/plugin/Cargo.lock b/examples/supp_plugin-rs/plugin/Cargo.lock
similarity index 100%
rename from examples/supp_plugin/plugin/Cargo.lock
rename to examples/supp_plugin-rs/plugin/Cargo.lock
diff --git a/examples/supp_plugin/plugin/Cargo.toml b/examples/supp_plugin-rs/plugin/Cargo.toml
similarity index 100%
rename from examples/supp_plugin/plugin/Cargo.toml
rename to examples/supp_plugin-rs/plugin/Cargo.toml
diff --git a/examples/supp_plugin/plugin/Makefile b/examples/supp_plugin-rs/plugin/Makefile
similarity index 100%
rename from examples/supp_plugin/plugin/Makefile
rename to examples/supp_plugin-rs/plugin/Makefile
diff --git a/examples/supp_plugin/plugin/build.rs b/examples/supp_plugin-rs/plugin/build.rs
similarity index 100%
rename from examples/supp_plugin/plugin/build.rs
rename to examples/supp_plugin-rs/plugin/build.rs
diff --git a/examples/supp_plugin/plugin/plugin_static.rs b/examples/supp_plugin-rs/plugin/plugin_static.rs
similarity index 100%
rename from examples/supp_plugin/plugin/plugin_static.rs
rename to examples/supp_plugin-rs/plugin/plugin_static.rs
diff --git a/examples/supp_plugin/plugin/src/lib.rs b/examples/supp_plugin-rs/plugin/src/lib.rs
similarity index 100%
rename from examples/supp_plugin/plugin/src/lib.rs
rename to examples/supp_plugin-rs/plugin/src/lib.rs
diff --git a/examples/supp_plugin/plugin_uuid.txt b/examples/supp_plugin-rs/plugin_uuid.txt
similarity index 100%
rename from examples/supp_plugin/plugin_uuid.txt
rename to examples/supp_plugin-rs/plugin_uuid.txt
diff --git a/examples/supp_plugin/proto/Cargo.toml b/examples/supp_plugin-rs/proto/Cargo.toml
similarity index 100%
rename from examples/supp_plugin/proto/Cargo.toml
rename to examples/supp_plugin-rs/proto/Cargo.toml
diff --git a/examples/supp_plugin/proto/build.rs b/examples/supp_plugin-rs/proto/build.rs
similarity index 100%
rename from examples/supp_plugin/proto/build.rs
rename to examples/supp_plugin-rs/proto/build.rs
diff --git a/examples/supp_plugin/proto/src/lib.rs b/examples/supp_plugin-rs/proto/src/lib.rs
similarity index 100%
rename from examples/supp_plugin/proto/src/lib.rs
rename to examples/supp_plugin-rs/proto/src/lib.rs
diff --git a/examples/supp_plugin/ta/Cargo.lock b/examples/supp_plugin-rs/ta/Cargo.lock
similarity index 93%
rename from examples/supp_plugin/ta/Cargo.lock
rename to examples/supp_plugin-rs/ta/Cargo.lock
index 4e90753..1a58667 100644
--- a/examples/supp_plugin/ta/Cargo.lock
+++ b/examples/supp_plugin-rs/ta/Cargo.lock
@@ -2,7 +2,7 @@
# It is not intended for manual editing.
[[package]]
name = "bitflags"
-version = "1.1.0"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -18,7 +18,7 @@ version = "0.2.59"
name = "optee-utee"
version = "0.1.0"
dependencies = [
- "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.59",
"optee-utee-macros 0.1.0",
@@ -101,7 +101,7 @@ version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[metadata]
-"checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd"
+"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
"checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
"checksum quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db"
diff --git a/examples/big_int/ta/Cargo.toml b/examples/supp_plugin-rs/ta/Cargo.toml
similarity index 100%
rename from examples/big_int/ta/Cargo.toml
rename to examples/supp_plugin-rs/ta/Cargo.toml
diff --git a/examples/supp_plugin/ta/Makefile b/examples/supp_plugin-rs/ta/Makefile
similarity index 100%
rename from examples/supp_plugin/ta/Makefile
rename to examples/supp_plugin-rs/ta/Makefile
diff --git a/examples/big_int/ta/Xargo.toml b/examples/supp_plugin-rs/ta/Xargo.toml
similarity index 100%
rename from examples/big_int/ta/Xargo.toml
rename to examples/supp_plugin-rs/ta/Xargo.toml
diff --git a/examples/supp_plugin/ta/build.rs b/examples/supp_plugin-rs/ta/build.rs
similarity index 100%
rename from examples/supp_plugin/ta/build.rs
rename to examples/supp_plugin-rs/ta/build.rs
diff --git a/examples/supp_plugin/ta/src/main.rs b/examples/supp_plugin-rs/ta/src/main.rs
similarity index 100%
rename from examples/supp_plugin/ta/src/main.rs
rename to examples/supp_plugin-rs/ta/src/main.rs
diff --git a/examples/big_int/ta/ta_aarch64.lds b/examples/supp_plugin-rs/ta/ta_aarch64.lds
similarity index 100%
rename from examples/big_int/ta/ta_aarch64.lds
rename to examples/supp_plugin-rs/ta/ta_aarch64.lds
diff --git a/examples/big_int/ta/ta_arm.lds b/examples/supp_plugin-rs/ta/ta_arm.lds
similarity index 100%
rename from examples/big_int/ta/ta_arm.lds
rename to examples/supp_plugin-rs/ta/ta_arm.lds
diff --git a/examples/big_int/ta/ta_static.rs b/examples/supp_plugin-rs/ta/ta_static.rs
similarity index 100%
rename from examples/big_int/ta/ta_static.rs
rename to examples/supp_plugin-rs/ta/ta_static.rs
diff --git a/examples/supp_plugin/ta_uuid.txt b/examples/supp_plugin-rs/ta_uuid.txt
similarity index 100%
rename from examples/supp_plugin/ta_uuid.txt
rename to examples/supp_plugin-rs/ta_uuid.txt
diff --git a/examples/supp_plugin/host/Cargo.toml b/examples/supp_plugin/host/Cargo.toml
deleted file mode 100644
index 30db64b..0000000
--- a/examples/supp_plugin/host/Cargo.toml
+++ /dev/null
@@ -1,33 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you 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.
-
-[package]
-name = "supp_plugin"
-version = "0.1.0"
-authors = ["Teaclave Contributors <de...@teaclave.apache.org>"]
-license = "Apache-2.0"
-repository = "https://github.com/apache/incubator-teaclave-trustzone-sdk.git"
-description = "An example of Rust OP-TEE TrustZone SDK."
-edition = "2018"
-
-[dependencies]
-libc = "0.2.48"
-proto = { path = "../proto" }
-optee-teec = { path = "../../../optee-teec" }
-
-[profile.release]
-lto = true
diff --git a/examples/supp_plugin/host/Makefile b/examples/supp_plugin/host/Makefile
deleted file mode 100644
index d808f48..0000000
--- a/examples/supp_plugin/host/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you 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.
-
-NAME := supp_plugin
-ARCH ?= aarch64
-
-OPTEE_DIR ?= ../../../optee
-
-ifeq ($(ARCH), arm)
- OPTEE_BIN := $(OPTEE_DIR)/toolchains/aarch32/bin
- OBJCOPY := $(OPTEE_BIN)/arm-linux-gnueabihf-objcopy
- TARGET := arm-unknown-linux-gnueabihf
-else
- OPTEE_BIN := $(OPTEE_DIR)/toolchains/$(ARCH)/bin
- OBJCOPY := $(OPTEE_BIN)/aarch64-linux-gnu-objcopy
- TARGET := aarch64-unknown-linux-gnu
-endif
-
-OUT_DIR := $(CURDIR)/target/$(TARGET)/release
-
-
-all: host strip
-
-host:
- @cargo build --target $(TARGET) --release
-
-strip:
- @$(OBJCOPY) --strip-unneeded $(OUT_DIR)/$(NAME) $(OUT_DIR)/$(NAME)
-
-clean:
- @cargo clean
diff --git a/examples/authentication/Makefile b/examples/tcp_client-rs/Makefile
similarity index 100%
rename from examples/authentication/Makefile
rename to examples/tcp_client-rs/Makefile
diff --git a/examples/digest/host/Cargo.lock b/examples/tcp_client-rs/host/Cargo.lock
similarity index 99%
copy from examples/digest/host/Cargo.lock
copy to examples/tcp_client-rs/host/Cargo.lock
index 6ad9db0..f6b051e 100644
--- a/examples/digest/host/Cargo.lock
+++ b/examples/tcp_client-rs/host/Cargo.lock
@@ -1,15 +1,6 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
[[package]]
-name = "digest"
-version = "0.1.0"
-dependencies = [
- "libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
- "optee-teec 0.1.0",
- "proto 0.1.0",
-]
-
-[[package]]
name = "hex"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -79,6 +70,15 @@ dependencies = [
]
[[package]]
+name = "tcp_client-rs"
+version = "0.1.0"
+dependencies = [
+ "libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
+ "optee-teec 0.1.0",
+ "proto 0.1.0",
+]
+
+[[package]]
name = "unicode-xid"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/examples/aes/host/Cargo.toml b/examples/tcp_client-rs/host/Cargo.toml
similarity index 98%
copy from examples/aes/host/Cargo.toml
copy to examples/tcp_client-rs/host/Cargo.toml
index d4d780e..4c1df7a 100644
--- a/examples/aes/host/Cargo.toml
+++ b/examples/tcp_client-rs/host/Cargo.toml
@@ -16,7 +16,7 @@
# under the License.
[package]
-name = "aes"
+name = "tcp_client-rs"
version = "0.1.0"
authors = ["Teaclave Contributors <de...@teaclave.apache.org>"]
license = "Apache-2.0"
diff --git a/examples/aes/host/Makefile b/examples/tcp_client-rs/host/Makefile
similarity index 98%
copy from examples/aes/host/Makefile
copy to examples/tcp_client-rs/host/Makefile
index e2f89f1..540b970 100644
--- a/examples/aes/host/Makefile
+++ b/examples/tcp_client-rs/host/Makefile
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-NAME := aes
+NAME := tcp_client-rs
ARCH ?= aarch64
OPTEE_DIR ?= ../../../optee
diff --git a/examples/tcp_client/host/src/main.rs b/examples/tcp_client-rs/host/src/main.rs
similarity index 100%
rename from examples/tcp_client/host/src/main.rs
rename to examples/tcp_client-rs/host/src/main.rs
diff --git a/examples/authentication/proto/Cargo.toml b/examples/tcp_client-rs/proto/Cargo.toml
similarity index 100%
rename from examples/authentication/proto/Cargo.toml
rename to examples/tcp_client-rs/proto/Cargo.toml
diff --git a/examples/authentication/proto/build.rs b/examples/tcp_client-rs/proto/build.rs
similarity index 100%
rename from examples/authentication/proto/build.rs
rename to examples/tcp_client-rs/proto/build.rs
diff --git a/examples/udp_socket/proto/src/lib.rs b/examples/tcp_client-rs/proto/src/lib.rs
similarity index 100%
rename from examples/udp_socket/proto/src/lib.rs
rename to examples/tcp_client-rs/proto/src/lib.rs
diff --git a/examples/hello_world/ta/Cargo.lock b/examples/tcp_client-rs/ta/Cargo.lock
similarity index 93%
rename from examples/hello_world/ta/Cargo.lock
rename to examples/tcp_client-rs/ta/Cargo.lock
index 4499911..4fb4331 100644
--- a/examples/hello_world/ta/Cargo.lock
+++ b/examples/tcp_client-rs/ta/Cargo.lock
@@ -2,7 +2,7 @@
# It is not intended for manual editing.
[[package]]
name = "bitflags"
-version = "1.1.0"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -18,7 +18,7 @@ version = "0.2.59"
name = "optee-utee"
version = "0.1.0"
dependencies = [
- "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.59",
"optee-utee-macros 0.1.0",
@@ -96,7 +96,7 @@ version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[metadata]
-"checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd"
+"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
"checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
"checksum quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db"
diff --git a/examples/authentication/ta/Cargo.toml b/examples/tcp_client-rs/ta/Cargo.toml
similarity index 100%
rename from examples/authentication/ta/Cargo.toml
rename to examples/tcp_client-rs/ta/Cargo.toml
diff --git a/examples/authentication/ta/Makefile b/examples/tcp_client-rs/ta/Makefile
similarity index 100%
rename from examples/authentication/ta/Makefile
rename to examples/tcp_client-rs/ta/Makefile
diff --git a/examples/authentication/ta/Xargo.toml b/examples/tcp_client-rs/ta/Xargo.toml
similarity index 100%
rename from examples/authentication/ta/Xargo.toml
rename to examples/tcp_client-rs/ta/Xargo.toml
diff --git a/examples/authentication/ta/build.rs b/examples/tcp_client-rs/ta/build.rs
similarity index 100%
rename from examples/authentication/ta/build.rs
rename to examples/tcp_client-rs/ta/build.rs
diff --git a/examples/tcp_client/ta/src/main.rs b/examples/tcp_client-rs/ta/src/main.rs
similarity index 100%
rename from examples/tcp_client/ta/src/main.rs
rename to examples/tcp_client-rs/ta/src/main.rs
diff --git a/examples/authentication/ta/ta_aarch64.lds b/examples/tcp_client-rs/ta/ta_aarch64.lds
similarity index 100%
rename from examples/authentication/ta/ta_aarch64.lds
rename to examples/tcp_client-rs/ta/ta_aarch64.lds
diff --git a/examples/authentication/ta/ta_arm.lds b/examples/tcp_client-rs/ta/ta_arm.lds
similarity index 100%
rename from examples/authentication/ta/ta_arm.lds
rename to examples/tcp_client-rs/ta/ta_arm.lds
diff --git a/examples/authentication/ta/ta_static.rs b/examples/tcp_client-rs/ta/ta_static.rs
similarity index 100%
rename from examples/authentication/ta/ta_static.rs
rename to examples/tcp_client-rs/ta/ta_static.rs
diff --git a/examples/tcp_client/uuid.txt b/examples/tcp_client-rs/uuid.txt
similarity index 100%
rename from examples/tcp_client/uuid.txt
rename to examples/tcp_client-rs/uuid.txt
diff --git a/examples/tcp_client/host/Cargo.lock b/examples/tcp_client/host/Cargo.lock
deleted file mode 100644
index e97c3d6..0000000
--- a/examples/tcp_client/host/Cargo.lock
+++ /dev/null
@@ -1,104 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-[[package]]
-name = "hex"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "libc"
-version = "0.2.95"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "optee-teec"
-version = "0.1.0"
-dependencies = [
- "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
- "optee-teec-macros 0.1.0",
- "optee-teec-sys 0.1.0",
- "uuid 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "optee-teec-macros"
-version = "0.1.0"
-dependencies = [
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "optee-teec-sys"
-version = "0.1.0"
-dependencies = [
- "libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "0.4.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "proto"
-version = "0.1.0"
-dependencies = [
- "uuid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "quote"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "syn"
-version = "0.15.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "tcp_client"
-version = "0.1.0"
-dependencies = [
- "libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
- "optee-teec 0.1.0",
- "proto 0.1.0",
-]
-
-[[package]]
-name = "unicode-xid"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "uuid"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "uuid"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[metadata]
-"checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
-"checksum libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)" = "789da6d93f1b866ffe175afc5322a4d76c038605a1c3319bb57b06967ca98a36"
-"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
-"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
-"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
-"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
-"checksum uuid 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0238db0c5b605dd1cf51de0f21766f97fba2645897024461d6a00c036819a768"
-"checksum uuid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
diff --git a/examples/tcp_client/host/Cargo.toml b/examples/tcp_client/host/Cargo.toml
deleted file mode 100644
index d02db5a..0000000
--- a/examples/tcp_client/host/Cargo.toml
+++ /dev/null
@@ -1,33 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you 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.
-
-[package]
-name = "tcp_client"
-version = "0.1.0"
-authors = ["Teaclave Contributors <de...@teaclave.apache.org>"]
-license = "Apache-2.0"
-repository = "https://github.com/apache/incubator-teaclave-trustzone-sdk.git"
-description = "An example of Rust OP-TEE TrustZone SDK."
-edition = "2018"
-
-[dependencies]
-libc = "0.2.48"
-proto = { path = "../proto" }
-optee-teec = { path = "../../../optee-teec" }
-
-[profile.release]
-lto = true
diff --git a/examples/tcp_client/host/Makefile b/examples/tcp_client/host/Makefile
deleted file mode 100644
index fdf34ce..0000000
--- a/examples/tcp_client/host/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you 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.
-
-NAME := tcp_client
-ARCH ?= aarch64
-
-OPTEE_DIR ?= ../../../optee
-
-ifeq ($(ARCH), arm)
- OPTEE_BIN := $(OPTEE_DIR)/toolchains/aarch32/bin
- OBJCOPY := $(OPTEE_BIN)/arm-linux-gnueabihf-objcopy
- TARGET := arm-unknown-linux-gnueabihf
-else
- OPTEE_BIN := $(OPTEE_DIR)/toolchains/$(ARCH)/bin
- OBJCOPY := $(OPTEE_BIN)/aarch64-linux-gnu-objcopy
- TARGET := aarch64-unknown-linux-gnu
-endif
-
-OUT_DIR := $(CURDIR)/target/$(TARGET)/release
-
-
-all: host strip
-
-host:
- @cargo build --target $(TARGET) --release
-
-strip:
- @$(OBJCOPY) --strip-unneeded $(OUT_DIR)/$(NAME) $(OUT_DIR)/$(NAME)
-
-clean:
- @cargo clean
diff --git a/examples/aes/Makefile b/examples/time-rs/Makefile
similarity index 100%
rename from examples/aes/Makefile
rename to examples/time-rs/Makefile
diff --git a/examples/big_int/host/Cargo.lock b/examples/time-rs/host/Cargo.lock
similarity index 99%
rename from examples/big_int/host/Cargo.lock
rename to examples/time-rs/host/Cargo.lock
index 7853805..685e594 100644
--- a/examples/big_int/host/Cargo.lock
+++ b/examples/time-rs/host/Cargo.lock
@@ -1,15 +1,6 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
[[package]]
-name = "big_int"
-version = "0.1.0"
-dependencies = [
- "libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
- "optee-teec 0.1.0",
- "proto 0.1.0",
-]
-
-[[package]]
name = "hex"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -79,6 +70,15 @@ dependencies = [
]
[[package]]
+name = "time-rs"
+version = "0.1.0"
+dependencies = [
+ "libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
+ "optee-teec 0.1.0",
+ "proto 0.1.0",
+]
+
+[[package]]
name = "unicode-xid"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/examples/acipher/host/Cargo.toml b/examples/time-rs/host/Cargo.toml
similarity index 98%
rename from examples/acipher/host/Cargo.toml
rename to examples/time-rs/host/Cargo.toml
index a80cbd0..cfdcea8 100644
--- a/examples/acipher/host/Cargo.toml
+++ b/examples/time-rs/host/Cargo.toml
@@ -16,7 +16,7 @@
# under the License.
[package]
-name = "acipher"
+name = "time-rs"
version = "0.1.0"
authors = ["Teaclave Contributors <de...@teaclave.apache.org>"]
license = "Apache-2.0"
diff --git a/examples/big_int/host/Makefile b/examples/time-rs/host/Makefile
similarity index 98%
rename from examples/big_int/host/Makefile
rename to examples/time-rs/host/Makefile
index 8d6bf0b..52b6786 100644
--- a/examples/big_int/host/Makefile
+++ b/examples/time-rs/host/Makefile
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-NAME := big_int
+NAME := time-rs
ARCH ?= aarch64
OPTEE_DIR ?= ../../../optee
diff --git a/examples/time/host/src/main.rs b/examples/time-rs/host/src/main.rs
similarity index 100%
rename from examples/time/host/src/main.rs
rename to examples/time-rs/host/src/main.rs
diff --git a/examples/aes/proto/Cargo.toml b/examples/time-rs/proto/Cargo.toml
similarity index 100%
rename from examples/aes/proto/Cargo.toml
rename to examples/time-rs/proto/Cargo.toml
diff --git a/examples/aes/proto/build.rs b/examples/time-rs/proto/build.rs
similarity index 100%
rename from examples/aes/proto/build.rs
rename to examples/time-rs/proto/build.rs
diff --git a/examples/time/proto/src/lib.rs b/examples/time-rs/proto/src/lib.rs
similarity index 100%
rename from examples/time/proto/src/lib.rs
rename to examples/time-rs/proto/src/lib.rs
diff --git a/examples/acipher/ta/Cargo.lock b/examples/time-rs/ta/Cargo.lock
similarity index 100%
rename from examples/acipher/ta/Cargo.lock
rename to examples/time-rs/ta/Cargo.lock
diff --git a/examples/aes/ta/Cargo.toml b/examples/time-rs/ta/Cargo.toml
similarity index 100%
rename from examples/aes/ta/Cargo.toml
rename to examples/time-rs/ta/Cargo.toml
diff --git a/examples/aes/ta/Makefile b/examples/time-rs/ta/Makefile
similarity index 100%
rename from examples/aes/ta/Makefile
rename to examples/time-rs/ta/Makefile
diff --git a/examples/aes/ta/Xargo.toml b/examples/time-rs/ta/Xargo.toml
similarity index 100%
rename from examples/aes/ta/Xargo.toml
rename to examples/time-rs/ta/Xargo.toml
diff --git a/examples/aes/ta/build.rs b/examples/time-rs/ta/build.rs
similarity index 100%
rename from examples/aes/ta/build.rs
rename to examples/time-rs/ta/build.rs
diff --git a/examples/time/ta/src/main.rs b/examples/time-rs/ta/src/main.rs
similarity index 100%
rename from examples/time/ta/src/main.rs
rename to examples/time-rs/ta/src/main.rs
diff --git a/examples/aes/ta/ta_aarch64.lds b/examples/time-rs/ta/ta_aarch64.lds
similarity index 100%
rename from examples/aes/ta/ta_aarch64.lds
rename to examples/time-rs/ta/ta_aarch64.lds
diff --git a/examples/aes/ta/ta_arm.lds b/examples/time-rs/ta/ta_arm.lds
similarity index 100%
rename from examples/aes/ta/ta_arm.lds
rename to examples/time-rs/ta/ta_arm.lds
diff --git a/examples/aes/ta/ta_static.rs b/examples/time-rs/ta/ta_static.rs
similarity index 100%
rename from examples/aes/ta/ta_static.rs
rename to examples/time-rs/ta/ta_static.rs
diff --git a/examples/time/uuid.txt b/examples/time-rs/uuid.txt
similarity index 100%
rename from examples/time/uuid.txt
rename to examples/time-rs/uuid.txt
diff --git a/examples/time/host/Cargo.lock b/examples/time/host/Cargo.lock
deleted file mode 100644
index 24a5bc9..0000000
--- a/examples/time/host/Cargo.lock
+++ /dev/null
@@ -1,104 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-[[package]]
-name = "hex"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "libc"
-version = "0.2.95"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "optee-teec"
-version = "0.1.0"
-dependencies = [
- "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
- "optee-teec-macros 0.1.0",
- "optee-teec-sys 0.1.0",
- "uuid 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "optee-teec-macros"
-version = "0.1.0"
-dependencies = [
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "optee-teec-sys"
-version = "0.1.0"
-dependencies = [
- "libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "0.4.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "proto"
-version = "0.1.0"
-dependencies = [
- "uuid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "quote"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "syn"
-version = "0.15.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "time"
-version = "0.1.0"
-dependencies = [
- "libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
- "optee-teec 0.1.0",
- "proto 0.1.0",
-]
-
-[[package]]
-name = "unicode-xid"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "uuid"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "uuid"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[metadata]
-"checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
-"checksum libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)" = "789da6d93f1b866ffe175afc5322a4d76c038605a1c3319bb57b06967ca98a36"
-"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
-"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
-"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
-"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
-"checksum uuid 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0238db0c5b605dd1cf51de0f21766f97fba2645897024461d6a00c036819a768"
-"checksum uuid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
diff --git a/examples/time/host/Cargo.toml b/examples/time/host/Cargo.toml
deleted file mode 100644
index c8e9dbc..0000000
--- a/examples/time/host/Cargo.toml
+++ /dev/null
@@ -1,33 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you 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.
-
-[package]
-name = "time"
-version = "0.1.0"
-authors = ["Teaclave Contributors <de...@teaclave.apache.org>"]
-license = "Apache-2.0"
-repository = "https://github.com/apache/incubator-teaclave-trustzone-sdk.git"
-description = "An example of Rust OP-TEE TrustZone SDK."
-edition = "2018"
-
-[dependencies]
-libc = "0.2.48"
-proto = { path = "../proto" }
-optee-teec = { path = "../../../optee-teec" }
-
-[profile.release]
-lto = true
diff --git a/examples/time/host/Makefile b/examples/time/host/Makefile
deleted file mode 100644
index 6f84d9b..0000000
--- a/examples/time/host/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you 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.
-
-NAME := time
-ARCH ?= aarch64
-
-OPTEE_DIR ?= ../../../optee
-
-ifeq ($(ARCH), arm)
- OPTEE_BIN := $(OPTEE_DIR)/toolchains/aarch32/bin
- OBJCOPY := $(OPTEE_BIN)/arm-linux-gnueabihf-objcopy
- TARGET := arm-unknown-linux-gnueabihf
-else
- OPTEE_BIN := $(OPTEE_DIR)/toolchains/$(ARCH)/bin
- OBJCOPY := $(OPTEE_BIN)/aarch64-linux-gnu-objcopy
- TARGET := aarch64-unknown-linux-gnu
-endif
-
-OUT_DIR := $(CURDIR)/target/$(TARGET)/release
-
-
-all: host strip
-
-host:
- @cargo build --target $(TARGET) --release
-
-strip:
- @$(OBJCOPY) --strip-unneeded $(OUT_DIR)/$(NAME) $(OUT_DIR)/$(NAME)
-
-clean:
- @cargo clean
diff --git a/examples/acipher/Makefile b/examples/udp_socket-rs/Makefile
similarity index 100%
rename from examples/acipher/Makefile
rename to examples/udp_socket-rs/Makefile
diff --git a/examples/digest/host/Cargo.lock b/examples/udp_socket-rs/host/Cargo.lock
similarity index 99%
rename from examples/digest/host/Cargo.lock
rename to examples/udp_socket-rs/host/Cargo.lock
index 6ad9db0..5979f6d 100644
--- a/examples/digest/host/Cargo.lock
+++ b/examples/udp_socket-rs/host/Cargo.lock
@@ -1,15 +1,6 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
[[package]]
-name = "digest"
-version = "0.1.0"
-dependencies = [
- "libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
- "optee-teec 0.1.0",
- "proto 0.1.0",
-]
-
-[[package]]
name = "hex"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -79,6 +70,15 @@ dependencies = [
]
[[package]]
+name = "udp_socket-rs"
+version = "0.1.0"
+dependencies = [
+ "libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
+ "optee-teec 0.1.0",
+ "proto 0.1.0",
+]
+
+[[package]]
name = "unicode-xid"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/examples/aes/host/Cargo.toml b/examples/udp_socket-rs/host/Cargo.toml
similarity index 98%
rename from examples/aes/host/Cargo.toml
rename to examples/udp_socket-rs/host/Cargo.toml
index d4d780e..3353eb4 100644
--- a/examples/aes/host/Cargo.toml
+++ b/examples/udp_socket-rs/host/Cargo.toml
@@ -16,7 +16,7 @@
# under the License.
[package]
-name = "aes"
+name = "udp_socket-rs"
version = "0.1.0"
authors = ["Teaclave Contributors <de...@teaclave.apache.org>"]
license = "Apache-2.0"
diff --git a/examples/aes/host/Makefile b/examples/udp_socket-rs/host/Makefile
similarity index 98%
rename from examples/aes/host/Makefile
rename to examples/udp_socket-rs/host/Makefile
index e2f89f1..e765a00 100644
--- a/examples/aes/host/Makefile
+++ b/examples/udp_socket-rs/host/Makefile
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-NAME := aes
+NAME := udp_socket-rs
ARCH ?= aarch64
OPTEE_DIR ?= ../../../optee
diff --git a/examples/udp_socket/host/src/main.rs b/examples/udp_socket-rs/host/src/main.rs
similarity index 100%
rename from examples/udp_socket/host/src/main.rs
rename to examples/udp_socket-rs/host/src/main.rs
diff --git a/examples/acipher/proto/Cargo.toml b/examples/udp_socket-rs/proto/Cargo.toml
similarity index 100%
rename from examples/acipher/proto/Cargo.toml
rename to examples/udp_socket-rs/proto/Cargo.toml
diff --git a/examples/acipher/proto/build.rs b/examples/udp_socket-rs/proto/build.rs
similarity index 100%
rename from examples/acipher/proto/build.rs
rename to examples/udp_socket-rs/proto/build.rs
diff --git a/examples/tcp_client/proto/src/lib.rs b/examples/udp_socket-rs/proto/src/lib.rs
similarity index 100%
rename from examples/tcp_client/proto/src/lib.rs
rename to examples/udp_socket-rs/proto/src/lib.rs
diff --git a/examples/tcp_client/ta/Cargo.lock b/examples/udp_socket-rs/ta/Cargo.lock
similarity index 93%
rename from examples/tcp_client/ta/Cargo.lock
rename to examples/udp_socket-rs/ta/Cargo.lock
index 4499911..4fb4331 100644
--- a/examples/tcp_client/ta/Cargo.lock
+++ b/examples/udp_socket-rs/ta/Cargo.lock
@@ -2,7 +2,7 @@
# It is not intended for manual editing.
[[package]]
name = "bitflags"
-version = "1.1.0"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -18,7 +18,7 @@ version = "0.2.59"
name = "optee-utee"
version = "0.1.0"
dependencies = [
- "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.59",
"optee-utee-macros 0.1.0",
@@ -96,7 +96,7 @@ version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[metadata]
-"checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd"
+"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
"checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
"checksum quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db"
diff --git a/examples/acipher/ta/Cargo.toml b/examples/udp_socket-rs/ta/Cargo.toml
similarity index 100%
rename from examples/acipher/ta/Cargo.toml
rename to examples/udp_socket-rs/ta/Cargo.toml
diff --git a/examples/acipher/ta/Makefile b/examples/udp_socket-rs/ta/Makefile
similarity index 100%
rename from examples/acipher/ta/Makefile
rename to examples/udp_socket-rs/ta/Makefile
diff --git a/examples/acipher/ta/Xargo.toml b/examples/udp_socket-rs/ta/Xargo.toml
similarity index 100%
rename from examples/acipher/ta/Xargo.toml
rename to examples/udp_socket-rs/ta/Xargo.toml
diff --git a/examples/acipher/ta/build.rs b/examples/udp_socket-rs/ta/build.rs
similarity index 100%
rename from examples/acipher/ta/build.rs
rename to examples/udp_socket-rs/ta/build.rs
diff --git a/examples/udp_socket/ta/src/main.rs b/examples/udp_socket-rs/ta/src/main.rs
similarity index 100%
rename from examples/udp_socket/ta/src/main.rs
rename to examples/udp_socket-rs/ta/src/main.rs
diff --git a/examples/acipher/ta/ta_aarch64.lds b/examples/udp_socket-rs/ta/ta_aarch64.lds
similarity index 100%
rename from examples/acipher/ta/ta_aarch64.lds
rename to examples/udp_socket-rs/ta/ta_aarch64.lds
diff --git a/examples/acipher/ta/ta_arm.lds b/examples/udp_socket-rs/ta/ta_arm.lds
similarity index 100%
rename from examples/acipher/ta/ta_arm.lds
rename to examples/udp_socket-rs/ta/ta_arm.lds
diff --git a/examples/acipher/ta/ta_static.rs b/examples/udp_socket-rs/ta/ta_static.rs
similarity index 100%
rename from examples/acipher/ta/ta_static.rs
rename to examples/udp_socket-rs/ta/ta_static.rs
diff --git a/examples/udp_socket/uuid.txt b/examples/udp_socket-rs/uuid.txt
similarity index 100%
rename from examples/udp_socket/uuid.txt
rename to examples/udp_socket-rs/uuid.txt
diff --git a/examples/udp_socket/host/Cargo.lock b/examples/udp_socket/host/Cargo.lock
deleted file mode 100644
index 07056d2..0000000
--- a/examples/udp_socket/host/Cargo.lock
+++ /dev/null
@@ -1,104 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-[[package]]
-name = "hex"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "libc"
-version = "0.2.95"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "optee-teec"
-version = "0.1.0"
-dependencies = [
- "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
- "optee-teec-macros 0.1.0",
- "optee-teec-sys 0.1.0",
- "uuid 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "optee-teec-macros"
-version = "0.1.0"
-dependencies = [
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "optee-teec-sys"
-version = "0.1.0"
-dependencies = [
- "libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "0.4.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "proto"
-version = "0.1.0"
-dependencies = [
- "uuid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "quote"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "syn"
-version = "0.15.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "udp_socket"
-version = "0.1.0"
-dependencies = [
- "libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)",
- "optee-teec 0.1.0",
- "proto 0.1.0",
-]
-
-[[package]]
-name = "unicode-xid"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "uuid"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "uuid"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[metadata]
-"checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
-"checksum libc 0.2.95 (registry+https://github.com/rust-lang/crates.io-index)" = "789da6d93f1b866ffe175afc5322a4d76c038605a1c3319bb57b06967ca98a36"
-"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
-"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
-"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
-"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
-"checksum uuid 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0238db0c5b605dd1cf51de0f21766f97fba2645897024461d6a00c036819a768"
-"checksum uuid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
diff --git a/examples/udp_socket/host/Cargo.toml b/examples/udp_socket/host/Cargo.toml
deleted file mode 100644
index 33ce0e2..0000000
--- a/examples/udp_socket/host/Cargo.toml
+++ /dev/null
@@ -1,33 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you 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.
-
-[package]
-name = "udp_socket"
-version = "0.1.0"
-authors = ["Teaclave Contributors <de...@teaclave.apache.org>"]
-license = "Apache-2.0"
-repository = "https://github.com/apache/incubator-teaclave-trustzone-sdk.git"
-description = "An example of Rust OP-TEE TrustZone SDK."
-edition = "2018"
-
-[dependencies]
-libc = "0.2.48"
-proto = { path = "../proto" }
-optee-teec = { path = "../../../optee-teec" }
-
-[profile.release]
-lto = true
diff --git a/examples/udp_socket/host/Makefile b/examples/udp_socket/host/Makefile
deleted file mode 100644
index 7e23e0b..0000000
--- a/examples/udp_socket/host/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you 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.
-
-NAME := udp_socket
-ARCH ?= aarch64
-
-OPTEE_DIR ?= ../../../optee
-
-ifeq ($(ARCH), arm)
- OPTEE_BIN := $(OPTEE_DIR)/toolchains/aarch32/bin
- OBJCOPY := $(OPTEE_BIN)/arm-linux-gnueabihf-objcopy
- TARGET := arm-unknown-linux-gnueabihf
-else
- OPTEE_BIN := $(OPTEE_DIR)/toolchains/$(ARCH)/bin
- OBJCOPY := $(OPTEE_BIN)/aarch64-linux-gnu-objcopy
- TARGET := aarch64-unknown-linux-gnu
-endif
-
-OUT_DIR := $(CURDIR)/target/$(TARGET)/release
-
-
-all: host strip
-
-host:
- @cargo build --target $(TARGET) --release
-
-strip:
- @$(OBJCOPY) --strip-unneeded $(OUT_DIR)/$(NAME) $(OUT_DIR)/$(NAME)
-
-clean:
- @cargo clean
diff --git a/tests/test_acipher.sh b/tests/test_acipher.sh
index 0714966..8e2e7d9 100755
--- a/tests/test_acipher.sh
+++ b/tests/test_acipher.sh
@@ -25,8 +25,8 @@ rm -rf shared
curl http://mesalock-linux.org/assets/optee-qemuv8-3.13.0-ubuntu-20.04.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
+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
screen -L -d -m -S qemu_screen ./optee-qemuv8.sh
sleep 30
@@ -36,7 +36,7 @@ screen -S qemu_screen -p 0 -X stuff "mkdir shared && mount -t 9p -o trans=virtio
sleep 5
screen -S qemu_screen -p 0 -X stuff "cp *.ta /lib/optee_armtz/\n"
sleep 5
-screen -S qemu_screen -p 0 -X stuff "./acipher 256 teststring\n"
+screen -S qemu_screen -p 0 -X stuff "./acipher-rs 256 teststring\n"
sleep 5
screen -S qemu_screen -p 0 -X stuff "^C"
sleep 5
diff --git a/tests/test_aes.sh b/tests/test_aes.sh
index d34778e..b4175f9 100755
--- a/tests/test_aes.sh
+++ b/tests/test_aes.sh
@@ -25,8 +25,8 @@ rm -rf shared
curl http://mesalock-linux.org/assets/optee-qemuv8-3.13.0-ubuntu-20.04.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
+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
screen -L -d -m -S qemu_screen ./optee-qemuv8.sh
sleep 30
@@ -36,7 +36,7 @@ screen -S qemu_screen -p 0 -X stuff "mkdir shared && mount -t 9p -o trans=virtio
sleep 5
screen -S qemu_screen -p 0 -X stuff "cp *.ta /lib/optee_armtz/\n"
sleep 5
-screen -S qemu_screen -p 0 -X stuff "./aes\n"
+screen -S qemu_screen -p 0 -X stuff "./aes-rs\n"
sleep 5
screen -S qemu_screen -p 0 -X stuff "^C"
sleep 5
diff --git a/tests/test_authentication.sh b/tests/test_authentication.sh
index 4bd188b..2c52cff 100755
--- a/tests/test_authentication.sh
+++ b/tests/test_authentication.sh
@@ -25,8 +25,8 @@ rm -rf shared
curl http://mesalock-linux.org/assets/optee-qemuv8-3.13.0-ubuntu-20.04.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
+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
screen -L -d -m -S qemu_screen ./optee-qemuv8.sh
sleep 30
@@ -36,7 +36,7 @@ screen -S qemu_screen -p 0 -X stuff "mkdir shared && mount -t 9p -o trans=virtio
sleep 5
screen -S qemu_screen -p 0 -X stuff "cp *.ta /lib/optee_armtz/\n"
sleep 5
-screen -S qemu_screen -p 0 -X stuff "./authentication\n"
+screen -S qemu_screen -p 0 -X stuff "./authentication-rs\n"
sleep 5
screen -S qemu_screen -p 0 -X stuff "^C"
sleep 5
diff --git a/tests/test_big_int.sh b/tests/test_big_int.sh
index 10d19f4..ed73078 100755
--- a/tests/test_big_int.sh
+++ b/tests/test_big_int.sh
@@ -25,8 +25,8 @@ rm -rf shared
curl http://mesalock-linux.org/assets/optee-qemuv8-3.13.0-ubuntu-20.04.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
+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
screen -L -d -m -S qemu_screen ./optee-qemuv8.sh
sleep 30
@@ -36,7 +36,7 @@ screen -S qemu_screen -p 0 -X stuff "mkdir shared && mount -t 9p -o trans=virtio
sleep 5
screen -S qemu_screen -p 0 -X stuff "cp *.ta /lib/optee_armtz/\n"
sleep 5
-screen -S qemu_screen -p 0 -X stuff "./big_int\n"
+screen -S qemu_screen -p 0 -X stuff "./big_int-rs\n"
sleep 5
screen -S qemu_screen -p 0 -X stuff "^C"
sleep 5
diff --git a/tests/test_diffie_hellman.sh b/tests/test_diffie_hellman.sh
index 37fac9b..16d15e4 100755
--- a/tests/test_diffie_hellman.sh
+++ b/tests/test_diffie_hellman.sh
@@ -25,8 +25,8 @@ rm -rf shared
curl http://mesalock-linux.org/assets/optee-qemuv8-3.13.0-ubuntu-20.04.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
+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
screen -L -d -m -S qemu_screen ./optee-qemuv8.sh
sleep 30
@@ -36,7 +36,7 @@ screen -S qemu_screen -p 0 -X stuff "mkdir shared && mount -t 9p -o trans=virtio
sleep 5
screen -S qemu_screen -p 0 -X stuff "cp *.ta /lib/optee_armtz/\n"
sleep 5
-screen -S qemu_screen -p 0 -X stuff "./diffie_hellman\n"
+screen -S qemu_screen -p 0 -X stuff "./diffie_hellman-rs\n"
sleep 5
screen -S qemu_screen -p 0 -X stuff "^C"
sleep 5
diff --git a/tests/test_digest.sh b/tests/test_digest.sh
index 0aeefc2..f1e5414 100755
--- a/tests/test_digest.sh
+++ b/tests/test_digest.sh
@@ -25,8 +25,8 @@ rm -rf shared
curl http://mesalock-linux.org/assets/optee-qemuv8-3.13.0-ubuntu-20.04.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
+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
screen -L -d -m -S qemu_screen ./optee-qemuv8.sh
sleep 30
@@ -36,7 +36,7 @@ screen -S qemu_screen -p 0 -X stuff "mkdir shared && mount -t 9p -o trans=virtio
sleep 5
screen -S qemu_screen -p 0 -X stuff "cp *.ta /lib/optee_armtz/\n"
sleep 5
-screen -S qemu_screen -p 0 -X stuff "./digest message1 message2\n"
+screen -S qemu_screen -p 0 -X stuff "./digest-rs message1 message2\n"
sleep 5
screen -S qemu_screen -p 0 -X stuff "^C"
sleep 5
diff --git a/tests/test_hello_world.sh b/tests/test_hello_world.sh
index 6dcc70a..d30a3bc 100755
--- a/tests/test_hello_world.sh
+++ b/tests/test_hello_world.sh
@@ -25,8 +25,8 @@ rm -rf shared
curl http://mesalock-linux.org/assets/optee-qemuv8-3.13.0-ubuntu-20.04.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
+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
screen -L -d -m -S qemu_screen ./optee-qemuv8.sh
sleep 30
@@ -36,7 +36,7 @@ screen -S qemu_screen -p 0 -X stuff "mkdir shared && mount -t 9p -o trans=virtio
sleep 5
screen -S qemu_screen -p 0 -X stuff "cp *.ta /lib/optee_armtz/\n"
sleep 5
-screen -S qemu_screen -p 0 -X stuff "./hello_world\n"
+screen -S qemu_screen -p 0 -X stuff "./hello_world-rs\n"
sleep 5
screen -S qemu_screen -p 0 -X stuff "^C"
sleep 5
diff --git a/tests/test_hotp.sh b/tests/test_hotp.sh
index 83bb4c5..fa4cdc2 100755
--- a/tests/test_hotp.sh
+++ b/tests/test_hotp.sh
@@ -25,8 +25,8 @@ rm -rf shared
curl http://mesalock-linux.org/assets/optee-qemuv8-3.13.0-ubuntu-20.04.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
+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
screen -L -d -m -S qemu_screen ./optee-qemuv8.sh
sleep 30
@@ -36,7 +36,7 @@ screen -S qemu_screen -p 0 -X stuff "mkdir shared && mount -t 9p -o trans=virtio
sleep 5
screen -S qemu_screen -p 0 -X stuff "cp *.ta /lib/optee_armtz/\n"
sleep 5
-screen -S qemu_screen -p 0 -X stuff "./hotp\n"
+screen -S qemu_screen -p 0 -X stuff "./hotp-rs\n"
sleep 5
screen -S qemu_screen -p 0 -X stuff "^C"
sleep 5
diff --git a/tests/test_message_passing_interface.sh b/tests/test_message_passing_interface.sh
index 5034810..72e7c9c 100755
--- a/tests/test_message_passing_interface.sh
+++ b/tests/test_message_passing_interface.sh
@@ -25,8 +25,8 @@ rm -rf shared
curl http://mesalock-linux.org/assets/optee-qemuv8-3.13.0-ubuntu-20.04.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
+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
screen -L -d -m -S qemu_screen ./optee-qemuv8.sh
sleep 30
@@ -36,7 +36,7 @@ screen -S qemu_screen -p 0 -X stuff "mkdir shared && mount -t 9p -o trans=virtio
sleep 5
screen -S qemu_screen -p 0 -X stuff "cp *.ta /lib/optee_armtz/\n"
sleep 5
-screen -S qemu_screen -p 0 -X stuff "./message_passing_interface\n"
+screen -S qemu_screen -p 0 -X stuff "./message_passing_interface-rs\n"
sleep 5
screen -S qemu_screen -p 0 -X stuff "^C"
sleep 5
diff --git a/tests/test_random.sh b/tests/test_random.sh
index 1e91139..d9e89f1 100755
--- a/tests/test_random.sh
+++ b/tests/test_random.sh
@@ -25,8 +25,8 @@ rm -rf shared
curl http://mesalock-linux.org/assets/optee-qemuv8-3.13.0-ubuntu-20.04.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
+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
screen -L -d -m -S qemu_screen ./optee-qemuv8.sh
sleep 30
@@ -36,7 +36,7 @@ screen -S qemu_screen -p 0 -X stuff "mkdir shared && mount -t 9p -o trans=virtio
sleep 5
screen -S qemu_screen -p 0 -X stuff "cp *.ta /lib/optee_armtz/\n"
sleep 5
-screen -S qemu_screen -p 0 -X stuff "./random\n"
+screen -S qemu_screen -p 0 -X stuff "./random-rs\n"
sleep 5
screen -S qemu_screen -p 0 -X stuff "^C"
sleep 5
diff --git a/tests/test_secure_storage.sh b/tests/test_secure_storage.sh
index 639f3dc..4838a51 100755
--- a/tests/test_secure_storage.sh
+++ b/tests/test_secure_storage.sh
@@ -25,8 +25,8 @@ rm -rf shared
curl http://mesalock-linux.org/assets/optee-qemuv8-3.13.0-ubuntu-20.04.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
+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
screen -L -d -m -S qemu_screen ./optee-qemuv8.sh
sleep 30
@@ -36,7 +36,7 @@ screen -S qemu_screen -p 0 -X stuff "mkdir shared && mount -t 9p -o trans=virtio
sleep 5
screen -S qemu_screen -p 0 -X stuff "cp *.ta /lib/optee_armtz/\n"
sleep 5
-screen -S qemu_screen -p 0 -X stuff "./secure_storage\n"
+screen -S qemu_screen -p 0 -X stuff "./secure_storage-rs\n"
sleep 5
screen -S qemu_screen -p 0 -X stuff "^C"
sleep 5
diff --git a/tests/test_serde.sh b/tests/test_serde.sh
index 847eb5f..8275662 100755
--- a/tests/test_serde.sh
+++ b/tests/test_serde.sh
@@ -25,8 +25,8 @@ rm -rf shared
curl http://mesalock-linux.org/assets/optee-qemuv8-3.13.0-ubuntu-20.04.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
+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
screen -L -d -m -S qemu_screen ./optee-qemuv8.sh
sleep 30
@@ -36,7 +36,7 @@ screen -S qemu_screen -p 0 -X stuff "mkdir shared && mount -t 9p -o trans=virtio
sleep 5
screen -S qemu_screen -p 0 -X stuff "cp *.ta /lib/optee_armtz/\n"
sleep 5
-screen -S qemu_screen -p 0 -X stuff "./serde\n"
+screen -S qemu_screen -p 0 -X stuff "./serde-rs\n"
sleep 5
screen -S qemu_screen -p 0 -X stuff "^C"
sleep 5
diff --git a/tests/test_supp_plugin.sh b/tests/test_supp_plugin.sh
index 5fe3e08..828965c 100755
--- a/tests/test_supp_plugin.sh
+++ b/tests/test_supp_plugin.sh
@@ -25,9 +25,9 @@ rm -rf shared
curl http://mesalock-linux.org/assets/optee-qemuv8-3.13.0-ubuntu-20.04.tar.gz | tar zxv
mkdir shared
-cp ../examples/supp_plugin/ta/target/aarch64-unknown-optee-trustzone/release/*.ta shared
-cp ../examples/supp_plugin/host/target/aarch64-unknown-linux-gnu/release/supp_plugin shared
-cp ../examples/supp_plugin/plugin/target/aarch64-unknown-linux-gnu/release/*.plugin.so 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
+cp ../examples/supp_plugin-rs/plugin/target/aarch64-unknown-linux-gnu/release/*.plugin.so shared
screen -L -d -m -S qemu_screen ./optee-qemuv8.sh
sleep 30
@@ -43,7 +43,7 @@ screen -S qemu_screen -p 0 -X stuff "kill \$(pidof tee-supplicant)\n"
sleep 5
screen -S qemu_screen -p 0 -X stuff "/usr/sbin/tee-supplicant &\n\n"
sleep 5
-screen -S qemu_screen -p 0 -X stuff "./supp_plugin\n"
+screen -S qemu_screen -p 0 -X stuff "./supp_plugin-rs\n"
sleep 5
screen -S qemu_screen -p 0 -X stuff "^C"
sleep 5
diff --git a/tests/test_tcp_client.sh b/tests/test_tcp_client.sh
index f51d6f0..7019419 100755
--- a/tests/test_tcp_client.sh
+++ b/tests/test_tcp_client.sh
@@ -25,8 +25,8 @@ rm -rf shared
curl http://mesalock-linux.org/assets/optee-qemuv8-3.13.0-ubuntu-20.04.tar.gz | tar zxv
mkdir shared
-cp ../examples/tcp_client/ta/target/aarch64-unknown-optee-trustzone/release/*.ta shared
-cp ../examples/tcp_client/host/target/aarch64-unknown-linux-gnu/release/tcp_client 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
screen -L -d -m -S qemu_screen ./optee-qemuv8.sh
sleep 30
@@ -36,7 +36,7 @@ screen -S qemu_screen -p 0 -X stuff "mkdir shared && mount -t 9p -o trans=virtio
sleep 5
screen -S qemu_screen -p 0 -X stuff "cp *.ta /lib/optee_armtz/\n"
sleep 5
-screen -S qemu_screen -p 0 -X stuff "./tcp_client\n"
+screen -S qemu_screen -p 0 -X stuff "./tcp_client-rs\n"
sleep 5
screen -S qemu_screen -p 0 -X stuff "^C"
sleep 5
diff --git a/tests/test_time.sh b/tests/test_time.sh
index a3fbe0d..4604302 100755
--- a/tests/test_time.sh
+++ b/tests/test_time.sh
@@ -25,8 +25,8 @@ rm -rf shared
curl http://mesalock-linux.org/assets/optee-qemuv8-3.13.0-ubuntu-20.04.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
+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
screen -L -d -m -S qemu_screen ./optee-qemuv8.sh
sleep 30
@@ -36,7 +36,7 @@ screen -S qemu_screen -p 0 -X stuff "mkdir shared && mount -t 9p -o trans=virtio
sleep 5
screen -S qemu_screen -p 0 -X stuff "cp *.ta /lib/optee_armtz/\n"
sleep 5
-screen -S qemu_screen -p 0 -X stuff "./time\n"
+screen -S qemu_screen -p 0 -X stuff "./time-rs\n"
sleep 5
screen -S qemu_screen -p 0 -X stuff "^C"
sleep 5
diff --git a/tests/test_udp_socket.sh b/tests/test_udp_socket.sh
index 15d731f..fb13238 100755
--- a/tests/test_udp_socket.sh
+++ b/tests/test_udp_socket.sh
@@ -25,8 +25,8 @@ rm -rf shared
curl http://mesalock-linux.org/assets/optee-qemuv8-3.13.0-ubuntu-20.04.tar.gz | tar zxv
mkdir shared
-cp ../examples/udp_socket/ta/target/aarch64-unknown-optee-trustzone/release/*.ta shared
-cp ../examples/udp_socket/host/target/aarch64-unknown-linux-gnu/release/udp_socket 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
screen -L -d -m -S qemu_screen ./optee-qemuv8.sh
sleep 30
@@ -36,7 +36,7 @@ screen -S qemu_screen -p 0 -X stuff "mkdir shared && mount -t 9p -o trans=virtio
sleep 5
screen -S qemu_screen -p 0 -X stuff "cp *.ta /lib/optee_armtz/\n"
sleep 5
-screen -S qemu_screen -p 0 -X stuff "./udp_socket\n"
+screen -S qemu_screen -p 0 -X stuff "./udp_socket-rs\n"
sleep 5
screen -S qemu_screen -p 0 -X stuff "^C"
sleep 5
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@teaclave.apache.org
For additional commands, e-mail: commits-help@teaclave.apache.org