Skip to content

Fix mink adaptor linkage to QCBOR and add deprecated TEEC error code #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
harshaldev27 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix mink adaptor linkage to QCBOR and add deprecated TEEC error code #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd9ced4
libminkadaptor: Ensure minkadaptor directly links to qcbor
harshaldev27 Jan 12, 2026
2362162
libminkteec: Add deprecated TEEC_ERROR_EXTERNAL_CANCEL error code
harshaldev27 Jan 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions libminkadaptor/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@ endif()

include_directories(${QCOMTEE_INCLUDE_DIRS})

set(QCBOR_DIR_HINT "" CACHE PATH "Hint path for QCBOR directory")

find_package(QCBOR REQUIRED)
if(NOT QCBOR_FOUND)
message(FATAL_ERROR "QCBOR not found")
endif()

# ''Source files''.

set(SRC
Expand Down Expand Up @@ -61,6 +68,7 @@ target_include_directories(minkadaptor

target_link_libraries(minkadaptor
PRIVATE ${QCOMTEE_LIBRARIES}
PRIVATE ${QCBOR_LIBRARIES}
PRIVATE ${CMAKE_THREAD_LIBS_INIT}
)

Expand Down
0 ...ts/smcinvoke_client/cmake/FindQCBOR.cmake → libminkadaptor/cmake/FindQCBOR.cmake
View file
Open in desktop
File renamed without changes.
15 changes: 0 additions & 15 deletions libminkadaptor/tests/smcinvoke_client/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,5 @@
project(smcinvoke_client CXX)

# ''Packages''.

# Append modules directory.
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

set(QCBOR_DIR_HINT "" CACHE PATH "Hint path for QCBOR directory")

find_package(QCBOR REQUIRED)
if(NOT QCBOR_FOUND)
message(FATAL_ERROR "QCBOR not found")
endif()

include_directories(${QCBOR_INCLUDE_DIRS})

# ''CXX configuration''.

set(CMAKE_CXX_STANDARD 11)
Expand Down Expand Up @@ -86,7 +72,6 @@ target_include_directories(${PROJECT_NAME}

target_link_libraries(${PROJECT_NAME}
PRIVATE minkadaptor
PRIVATE ${QCBOR_LIBRARIES}
)

install(TARGETS ${PROJECT_NAME} DESTINATION "${CMAKE_INSTALL_BINDIR}")
3 changes: 3 additions & 0 deletions libminkteec/include/tee_client_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@ typedef uint32_t TEEC_Result;
/* An external event has caused a User Interface operation to be aborted */
#define TEE_ERROR_EXTERNAL_CANCEL 0xFFFF0011

/* Deprecated: not specified in client API, use TEE_ERROR_EXTERNAL_CANCEL intead. */
#define TEEC_ERROR_EXTERNAL_CANCEL 0xFFFF0011

/* Internal TEE error - documented for completeness*/
#define TEE_ERROR_OVERFLOW 0xFFFF300F

Expand Down
11 changes: 0 additions & 11 deletions libminkteec/tests/gp_test_client/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,6 @@ project(gp_test_client C)

# ''Packages''.

# Append modules directory.
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

set(QCBOR_DIR_HINT "" CACHE PATH "Hint path for QCBOR directory")

find_package(QCBOR REQUIRED)
if(NOT QCBOR_FOUND)
message(FATAL_ERROR "QCBOR not found")
endif()

find_package(Threads REQUIRED)
if(NOT THREADS_FOUND)
message(FATAL_ERROR "Threads not found")
Expand Down Expand Up @@ -79,7 +69,6 @@ target_include_directories(${PROJECT_NAME}
target_link_libraries(${PROJECT_NAME}
PRIVATE minkteec
PRIVATE minkadaptor
PRIVATE ${QCBOR_LIBRARIES}
PRIVATE ${CMAKE_THREAD_LIBS_INIT}
)

Expand Down
21 changes: 0 additions & 21 deletions libminkteec/tests/gp_test_client/cmake/FindQCBOR.cmake
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions listeners/libfsservice/fs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,6 @@ project(libfsservice

# ''Packages''.

# Append modules directory.
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

set(QCBOR_DIR_HINT "" CACHE PATH "Hint path for QCBOR directory")

find_package(QCBOR REQUIRED)
if(NOT QCBOR_FOUND)
message(FATAL_ERROR "QCBOR not found")
endif()

find_package(Threads REQUIRED)
if(NOT THREADS_FOUND)
message(FATAL_ERROR "Threads not found")
Expand Down Expand Up @@ -51,7 +41,6 @@ target_include_directories(fsservice

target_link_libraries(fsservice
PRIVATE minkadaptor
PRIVATE ${QCBOR_LIBRARIES}
)

if(${USE_GLIB})
Expand Down
21 changes: 0 additions & 21 deletions listeners/libfsservice/fs/cmake/FindQCBOR.cmake
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions listeners/libfsservice/gpfs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,6 @@ project(libgpfsservice

# ''Packages''.

# Append modules directory.
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

set(QCBOR_DIR_HINT "" CACHE PATH "Hint path for QCBOR directory")

find_package(QCBOR REQUIRED)
if(NOT QCBOR_FOUND)
message(FATAL_ERROR "QCBOR not found")
endif()

find_package(Threads REQUIRED)
if(NOT THREADS_FOUND)
message(FATAL_ERROR "Threads not found")
Expand Down Expand Up @@ -51,7 +41,6 @@ target_include_directories(gpfsservice

target_link_libraries(gpfsservice
PRIVATE minkadaptor
PRIVATE ${QCBOR_LIBRARIES}
)

if(${USE_GLIB})
Expand Down
21 changes: 0 additions & 21 deletions listeners/libfsservice/gpfs/cmake/FindQCBOR.cmake
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions listeners/libtimeservice/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,6 @@ project(libtimeservice

# ''Packages''.

# Append modules directory.
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

set(QCBOR_DIR_HINT "" CACHE PATH "Hint path for QCBOR directory")

find_package(QCBOR REQUIRED)
if(NOT QCBOR_FOUND)
message(FATAL_ERROR "QCBOR not found")
endif()

find_package(Threads REQUIRED)
if(NOT THREADS_FOUND)
message(FATAL_ERROR "Threads not found")
Expand Down Expand Up @@ -54,7 +44,6 @@ target_include_directories(timeservice

target_link_libraries(timeservice
PRIVATE minkadaptor
PRIVATE ${QCBOR_LIBRARIES}
)

# ''Install targets''.
Expand Down
21 changes: 0 additions & 21 deletions listeners/libtimeservice/cmake/FindQCBOR.cmake
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions qtee_supplicant/cmake/FindQCBOR.cmake
View file
Open in desktop

This file was deleted.

Loading