From c82884da2a9768522896b548b715dad037f6bf77 Mon Sep 17 00:00:00 2001
From: Flora Hu <flora.hu@nxp.com>
Date: Mon, 4 Nov 2024 16:56:19 +0800
Subject: secure-obj: Update to latest from NXP 6.6.36-2.1.0

 - secure-obj: update license; update revision to 4706a65; make it compatible with OPTEE 3.17+
 - secure-obj-module: update license; update revision to 4706a65

Signed-off-by: Flora Hu <flora.hu@nxp.com>
(cherry picked from commit 1e3e3eb90e58a652899c9e9a9c49cecccc586b9c)
---
 recipes-extended/secure-obj/secure-obj-module_git.bb |  2 +-
 recipes-extended/secure-obj/secure-obj.inc           |  4 ++--
 recipes-extended/secure-obj/secure-obj_git.bb        | 13 ++++++++-----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/recipes-extended/secure-obj/secure-obj-module_git.bb b/recipes-extended/secure-obj/secure-obj-module_git.bb
index 3866dde48..1e5709b6d 100644
--- a/recipes-extended/secure-obj/secure-obj-module_git.bb
+++ b/recipes-extended/secure-obj/secure-obj-module_git.bb
@@ -1,6 +1,6 @@
 require secure-obj.inc
 
-LIC_FILES_CHKSUM = "file://../README;md5=82b72e88f23cded9dd23f0fb1790b8d2"
+LIC_FILES_CHKSUM = "file://../LICENSE;md5=751419260aa954499f7abaabaa882bbe"
 
 DEPENDS += "virtual/kernel"
 
diff --git a/recipes-extended/secure-obj/secure-obj.inc b/recipes-extended/secure-obj/secure-obj.inc
index 64e4a6b71..16115ff03 100644
--- a/recipes-extended/secure-obj/secure-obj.inc
+++ b/recipes-extended/secure-obj/secure-obj.inc
@@ -1,5 +1,5 @@
 DESCRIPTION = "Secure Object"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 
 DEPENDS = "openssl optee-os-qoriq optee-client-qoriq"
 RDEPENDS:${PN} = "bash libcrypto libssl"
@@ -11,7 +11,7 @@ inherit python3native
 LDFLAGS += "${TOOLCHAIN_OPTIONS}"
 
 SRC_URI = "git://github.com/nxp-qoriq/secure_obj;protocol=https;nobranch=1"
-SRCREV = "5ff1231f74b4b01744be95a3137a14ad0a483e61"
+SRCREV = "4706a6534ec09f9a46bfe305c5e49badca32b4c6"
 
 WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}"
 export SECURE_STORAGE_PATH = "${S}/secure_storage_ta/ta/"
diff --git a/recipes-extended/secure-obj/secure-obj_git.bb b/recipes-extended/secure-obj/secure-obj_git.bb
index 84ecea1ea..64f59f474 100644
--- a/recipes-extended/secure-obj/secure-obj_git.bb
+++ b/recipes-extended/secure-obj/secure-obj_git.bb
@@ -1,9 +1,11 @@
 require secure-obj.inc
 
-LIC_FILES_CHKSUM = "file://README;md5=82b72e88f23cded9dd23f0fb1790b8d2"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
 
 S = "${WORKDIR}/git"
 
+DEPENDS:remove = " python3-pycryptodomex-native"
+DEPENDS:append = " python3-cryptography-native optee-os-qoriq-tadevkit"
 RDEPENDS:{PN}  += "secure-obj-module"
 
 WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}"
@@ -17,14 +19,15 @@ CFLAGS += "${TOOLCHAIN_OPTIONS}"
 
 do_compile() {
         unset LDFLAGS
-        export TA_DEV_KIT_DIR="${RECIPE_SYSROOT}/usr/include/optee/export-user_ta"
+        export TA_DEV_KIT_DIR=${STAGING_INCDIR}/optee/export-user_ta/
         export CROSS_COMPILE="${WRAP_TARGET_PREFIX}"
-        export OPENSSL_PATH="${RECIPE_SYSROOT}/usr" 
-        for APP in  secure_storage_ta securekey_lib secure_obj-openssl-engine; do        
+        export OPENSSL_PATH="${RECIPE_SYSROOT}/usr"
+        export OPENSSL_MODULES=${STAGING_LIBDIR_NATIVE}/ossl-modules
+        for APP in  secure_storage_ta securekey_lib secure_obj-openssl-engine; do
             cd  ${APP}
             oe_runmake
 	    cd ..
-        done       
+        done
 }
 
 do_install() {
-- 
cgit v1.2.3-54-g00ecf