commit 2609e2a85f0487497a001103ebc78457caead960
Author: Liqiang Jin <liqiang.jin@amlogic.com>
Date: Sun Apr 7 15:11:55 2024 +0800
plugin: fix plugin dir in "/vendor/lib/tee-supplicant/plugins/" [1/1]
PD#RSP-6204
Problem:
need to fix plugin installation dir
Solution:
update mk
Verify:
Android + S7/S905Y5
Change-Id: Iefbc401262898a8fa38118b1eb3d69db6ff4ba15
Signed-off-by: Liqiang Jin <liqiang.jin@amlogic.com>
Change-Id: I471b218ea003aea0265d8f227e8144a98f0021bd
Signed-off-by: gerrit.automerge <gerrit.automerge@amlogic.com>
diff --git a/ca_export_arm/bin/tee-supplicant b/ca_export_arm/bin/tee-supplicant
index dd1437f..5c5915c 100755
--- a/ca_export_arm/bin/tee-supplicant
+++ b/ca_export_arm/bin/tee-supplicant
Binary files differ
diff --git a/ca_export_arm/bin_android/tee-supplicant b/ca_export_arm/bin_android/tee-supplicant
index 10ddc69..a1ce6c2 100755
--- a/ca_export_arm/bin_android/tee-supplicant
+++ b/ca_export_arm/bin_android/tee-supplicant
Binary files differ
diff --git a/ca_export_arm/include/tee_client_socket.h b/ca_export_arm/include/tee_client_socket.h
new file mode 100644
index 0000000..5dc2f85
--- /dev/null
+++ b/ca_export_arm/include/tee_client_socket.h
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
+ *
+ * All information contained herein is Amlogic confidential.
+ *
+ * This software is provided to you pursuant to Software License
+ * Agreement (SLA) with Amlogic Inc ("Amlogic"). This software may be
+ * used only in accordance with the terms of this agreement.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification is strictly prohibited without prior written permission
+ * from Amlogic.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef TEE_CLIENT_SOCKET_H_
+#define TEE_CLIENT_SOCKET_H_
+
+#include <tee_client_api.h>
+
+typedef void* TEEC_SocketHandle;
+
+typedef struct {
+ uint32_t magic;
+ TEEC_Context teec_ctx;
+ uint32_t pipe_id;
+ uint32_t pipe_type;
+} data_pipe_descriptor_t;
+
+/**
+ * TEEC_SocketOpen() - Open a socket handle for communication
+ *
+ * @param flag, reserved for future
+ *
+ * @param handle, out parameter return a socket handle
+ *
+ * @return TEEC_SUCCESS on success
+ * @return other value is failed
+ */
+TEEC_Result TEEC_SocketOpen(int flag, TEEC_SocketHandle *handle);
+
+/**
+ * TEEC_SocketClose() - Close the socket handle that opened by TEEC_SocketOpen()
+ *
+ * @param handle, the socket handle
+ *
+ * @return TEEC_SUCCESS on success
+ * @return other value is failed
+ */
+TEEC_Result TEEC_SocketClose(TEEC_SocketHandle handle);
+
+/**
+ * TEEC_SocketRead() - Read data from the socket handle into the buf
+ *
+ * @param handle, the socket handle
+ *
+ * @param buf, the read buffer pointer
+ *
+ * @param len, in/out parameter, the read buffer length, return the number of bytes read
+ *
+ * @return TEEC_SUCCESS on success
+ * @return other value is failed
+ */
+TEEC_Result TEEC_SocketRead(TEEC_SocketHandle handle, void *buf, size_t *len);
+
+/**
+ * TEEC_SocketWrite() - Write data to the socket handle from the buf
+ *
+ * @param handle, the socket handle
+ *
+ * @param buf, the write buffer pointer
+ *
+ * @param len, in/out parameter, the write buffer length, return the number of bytes write
+ *
+ * @return TEEC_SUCCESS on success
+ * @return other value is failed
+ */
+TEEC_Result TEEC_SocketWrite(TEEC_SocketHandle handle, const void *buf, size_t *len);
+
+/**
+ * TEEC_SocketListen() - Start listen
+ *
+ * @backlog, max connection count
+ *
+ * @return TEEC_SUCCESS on success
+ * @return other value is failed
+ */
+TEEC_Result TEEC_SocketListen(uint32_t backlog);
+
+/**
+ * TEEC_SocketAccept() - Accept a socket handle for communication
+ *
+ * @param handle, out parameter return a socket handle
+ *
+ * @return TEEC_SUCCESS on success
+ * @return other value is failed
+ */
+TEEC_Result TEEC_SocketAccept(TEEC_SocketHandle *handle);
+
+#endif
diff --git a/ca_export_arm/lib/libckteec.a b/ca_export_arm/lib/libckteec.a
index cf06e2c..ea3fce0 100644
--- a/ca_export_arm/lib/libckteec.a
+++ b/ca_export_arm/lib/libckteec.a
Binary files differ
diff --git a/ca_export_arm/lib/libckteec.so.0.1.0 b/ca_export_arm/lib/libckteec.so.0.1.0
index 987f411..892d816 100644
--- a/ca_export_arm/lib/libckteec.so.0.1.0
+++ b/ca_export_arm/lib/libckteec.so.0.1.0
Binary files differ
diff --git a/ca_export_arm/lib/libseteec.a b/ca_export_arm/lib/libseteec.a
index f9ca69c..31b0535 100644
--- a/ca_export_arm/lib/libseteec.a
+++ b/ca_export_arm/lib/libseteec.a
Binary files differ
diff --git a/ca_export_arm/lib/libseteec.so.0.1.0 b/ca_export_arm/lib/libseteec.so.0.1.0
index c1c4596..ee1dea5 100644
--- a/ca_export_arm/lib/libseteec.so.0.1.0
+++ b/ca_export_arm/lib/libseteec.so.0.1.0
Binary files differ
diff --git a/ca_export_arm/lib/libteec.a b/ca_export_arm/lib/libteec.a
index 5ad8b2b..6aa3472 100644
--- a/ca_export_arm/lib/libteec.a
+++ b/ca_export_arm/lib/libteec.a
Binary files differ
diff --git a/ca_export_arm/lib/libteec.so.1.0.0 b/ca_export_arm/lib/libteec.so.1.0.0
index cadcaf1..687638a 100644
--- a/ca_export_arm/lib/libteec.so.1.0.0
+++ b/ca_export_arm/lib/libteec.so.1.0.0
Binary files differ
diff --git a/ca_export_arm/lib_android/libckteec.so b/ca_export_arm/lib_android/libckteec.so
index 5549625..d657aa0 100644
--- a/ca_export_arm/lib_android/libckteec.so
+++ b/ca_export_arm/lib_android/libckteec.so
Binary files differ
diff --git a/ca_export_arm/lib_android/libteec.so b/ca_export_arm/lib_android/libteec.so
index f33b710..5ad2e31 100644
--- a/ca_export_arm/lib_android/libteec.so
+++ b/ca_export_arm/lib_android/libteec.so
Binary files differ
diff --git a/ca_export_arm/lib_android/libteec_sys.so b/ca_export_arm/lib_android/libteec_sys.so
index aea6a04..5ce2adc 100644
--- a/ca_export_arm/lib_android/libteec_sys.so
+++ b/ca_export_arm/lib_android/libteec_sys.so
Binary files differ
diff --git a/ca_export_arm64/bin/tee-supplicant b/ca_export_arm64/bin/tee-supplicant
index c5b1403..3413820 100755
--- a/ca_export_arm64/bin/tee-supplicant
+++ b/ca_export_arm64/bin/tee-supplicant
Binary files differ
diff --git a/ca_export_arm64/bin_android/tee-supplicant b/ca_export_arm64/bin_android/tee-supplicant
index 635074c..5cb8809 100755
--- a/ca_export_arm64/bin_android/tee-supplicant
+++ b/ca_export_arm64/bin_android/tee-supplicant
Binary files differ
diff --git a/ca_export_arm64/include/tee_client_socket.h b/ca_export_arm64/include/tee_client_socket.h
new file mode 100644
index 0000000..5dc2f85
--- /dev/null
+++ b/ca_export_arm64/include/tee_client_socket.h
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
+ *
+ * All information contained herein is Amlogic confidential.
+ *
+ * This software is provided to you pursuant to Software License
+ * Agreement (SLA) with Amlogic Inc ("Amlogic"). This software may be
+ * used only in accordance with the terms of this agreement.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification is strictly prohibited without prior written permission
+ * from Amlogic.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef TEE_CLIENT_SOCKET_H_
+#define TEE_CLIENT_SOCKET_H_
+
+#include <tee_client_api.h>
+
+typedef void* TEEC_SocketHandle;
+
+typedef struct {
+ uint32_t magic;
+ TEEC_Context teec_ctx;
+ uint32_t pipe_id;
+ uint32_t pipe_type;
+} data_pipe_descriptor_t;
+
+/**
+ * TEEC_SocketOpen() - Open a socket handle for communication
+ *
+ * @param flag, reserved for future
+ *
+ * @param handle, out parameter return a socket handle
+ *
+ * @return TEEC_SUCCESS on success
+ * @return other value is failed
+ */
+TEEC_Result TEEC_SocketOpen(int flag, TEEC_SocketHandle *handle);
+
+/**
+ * TEEC_SocketClose() - Close the socket handle that opened by TEEC_SocketOpen()
+ *
+ * @param handle, the socket handle
+ *
+ * @return TEEC_SUCCESS on success
+ * @return other value is failed
+ */
+TEEC_Result TEEC_SocketClose(TEEC_SocketHandle handle);
+
+/**
+ * TEEC_SocketRead() - Read data from the socket handle into the buf
+ *
+ * @param handle, the socket handle
+ *
+ * @param buf, the read buffer pointer
+ *
+ * @param len, in/out parameter, the read buffer length, return the number of bytes read
+ *
+ * @return TEEC_SUCCESS on success
+ * @return other value is failed
+ */
+TEEC_Result TEEC_SocketRead(TEEC_SocketHandle handle, void *buf, size_t *len);
+
+/**
+ * TEEC_SocketWrite() - Write data to the socket handle from the buf
+ *
+ * @param handle, the socket handle
+ *
+ * @param buf, the write buffer pointer
+ *
+ * @param len, in/out parameter, the write buffer length, return the number of bytes write
+ *
+ * @return TEEC_SUCCESS on success
+ * @return other value is failed
+ */
+TEEC_Result TEEC_SocketWrite(TEEC_SocketHandle handle, const void *buf, size_t *len);
+
+/**
+ * TEEC_SocketListen() - Start listen
+ *
+ * @backlog, max connection count
+ *
+ * @return TEEC_SUCCESS on success
+ * @return other value is failed
+ */
+TEEC_Result TEEC_SocketListen(uint32_t backlog);
+
+/**
+ * TEEC_SocketAccept() - Accept a socket handle for communication
+ *
+ * @param handle, out parameter return a socket handle
+ *
+ * @return TEEC_SUCCESS on success
+ * @return other value is failed
+ */
+TEEC_Result TEEC_SocketAccept(TEEC_SocketHandle *handle);
+
+#endif
diff --git a/ca_export_arm64/lib/libckteec.a b/ca_export_arm64/lib/libckteec.a
index 316a5ac..b630e66 100644
--- a/ca_export_arm64/lib/libckteec.a
+++ b/ca_export_arm64/lib/libckteec.a
Binary files differ
diff --git a/ca_export_arm64/lib/libckteec.so.0.1.0 b/ca_export_arm64/lib/libckteec.so.0.1.0
index 76f6722..43d9d34 100644
--- a/ca_export_arm64/lib/libckteec.so.0.1.0
+++ b/ca_export_arm64/lib/libckteec.so.0.1.0
Binary files differ
diff --git a/ca_export_arm64/lib/libseteec.a b/ca_export_arm64/lib/libseteec.a
index c5d9974..f7cf5d7 100644
--- a/ca_export_arm64/lib/libseteec.a
+++ b/ca_export_arm64/lib/libseteec.a
Binary files differ
diff --git a/ca_export_arm64/lib/libseteec.so.0.1.0 b/ca_export_arm64/lib/libseteec.so.0.1.0
index 7bd4ecb..ec13baa 100644
--- a/ca_export_arm64/lib/libseteec.so.0.1.0
+++ b/ca_export_arm64/lib/libseteec.so.0.1.0
Binary files differ
diff --git a/ca_export_arm64/lib/libteec.a b/ca_export_arm64/lib/libteec.a
index 876e16f..c686482 100644
--- a/ca_export_arm64/lib/libteec.a
+++ b/ca_export_arm64/lib/libteec.a
Binary files differ
diff --git a/ca_export_arm64/lib/libteec.so.1.0.0 b/ca_export_arm64/lib/libteec.so.1.0.0
index f5f0ac8..0d1213b 100644
--- a/ca_export_arm64/lib/libteec.so.1.0.0
+++ b/ca_export_arm64/lib/libteec.so.1.0.0
Binary files differ
diff --git a/ca_export_arm64/lib_android/libckteec.so b/ca_export_arm64/lib_android/libckteec.so
index 3095abe..8f1d412 100644
--- a/ca_export_arm64/lib_android/libckteec.so
+++ b/ca_export_arm64/lib_android/libckteec.so
Binary files differ
diff --git a/ca_export_arm64/lib_android/libteec.so b/ca_export_arm64/lib_android/libteec.so
index 073b78a..b34eb78 100644
--- a/ca_export_arm64/lib_android/libteec.so
+++ b/ca_export_arm64/lib_android/libteec.so
Binary files differ
diff --git a/ca_export_arm64/lib_android/libteec_sys.so b/ca_export_arm64/lib_android/libteec_sys.so
index fdf501c..371175d 100644
--- a/ca_export_arm64/lib_android/libteec_sys.so
+++ b/ca_export_arm64/lib_android/libteec_sys.so
Binary files differ