Skip to content

Enable Intel CET support in assembler sources #56

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
nefigtut wants to merge 1 commit into
base: develop
Choose a base branch
from
+30 −0
Open

Enable Intel CET support in assembler sources #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 15 additions & 0 deletions sources/isal/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,3 +103,18 @@ if (NOT MSVC)
# Setting POSIX compliance level for Linux builds (to use strnlen() function on Linux)
target_compile_definitions(isal PRIVATE _POSIX_C_SOURCE=200809L)
endif()

# Enable Intel CET support in assembler sources
check_c_source_compiles("
#if !defined(__CET__) || (__CET__ & 1) == 0
#error CET_BIT_1_NOT_SET
#endif
int main() { return 0; }
" INTEL_CET_ENABLED)

if(INTEL_CET_ENABLED)
target_compile_options(isal_asm PUBLIC "-DINTEL_CET_ENABLED")
message(STATUS "Intel CET protection is ENABLED")
else()
message(STATUS "Intel CET protection is NOT enabled")
endif()
15 changes: 15 additions & 0 deletions sources/isal/include/reg_sizes.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,21 @@

%define XWORD(reg) reg %+ x

%ifdef INTEL_CET_ENABLED
%ifdef __NASM_VER__
%ifidn __OUTPUT_FORMAT__,elf32
section .note.gnu.property note alloc noexec align=4
DD 0x00000004,0x0000000c,0x00000005,0x00554e47
DD 0xc0000002,0x00000004,0x00000003
%endif
%ifidn __OUTPUT_FORMAT__,elf64
section .note.gnu.property note alloc noexec align=8
DD 0x00000004,0x00000010,0x00000005,0x00554e47
DD 0xc0000002,0x00000004,0x00000003,0x00000000
%endif
%endif
%endif

%ifidn __OUTPUT_FORMAT__,elf32
section .note.GNU-stack noalloc noexec nowrite progbits
section .text
Expand Down