sharpetronics/liboqs
1
0
Fork 0
mirror of https://github.com/open-quantum-safe/liboqs.git synced 2025-10-04 00:02:01 -04:00
Code Issues Projects Releases Wiki Activity

Avoid invalid compiler options for MSVC (#2239)

Browse Source 
Fixes #2238, Fixes #2177

Signed-off-by: Mattias Lindblad <matlin@gmail.com>
This commit is contained in:
matlimatli 2025-08-19 14:26:13 +02:00 committed by GitHub
parent 2dc4afc2cf
commit 5f9736304f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/CMakeLists.txt
View File

@ -26,8 +26,13 @@ else()
if (OQS_DIST_X86_64_BUILD OR OQS_USE_AES_INSTRUCTIONS) if (OQS_DIST_X86_64_BUILD OR OQS_USE_AES_INSTRUCTIONS)
set(AES_IMPL ${AES_IMPL} aes/aes128_ni.c) set(AES_IMPL ${AES_IMPL} aes/aes128_ni.c)
set(AES_IMPL ${AES_IMPL} aes/aes256_ni.c) set(AES_IMPL ${AES_IMPL} aes/aes256_ni.c)
set_source_files_properties(aes/aes128_ni.c PROPERTIES COMPILE_FLAGS "-maes -mssse3") if(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
set_source_files_properties(aes/aes256_ni.c PROPERTIES COMPILE_FLAGS "-maes -mssse3") set_source_files_properties(aes/aes128_ni.c PROPERTIES COMPILE_FLAGS "")
set_source_files_properties(aes/aes256_ni.c PROPERTIES COMPILE_FLAGS "")
else()
set_source_files_properties(aes/aes128_ni.c PROPERTIES COMPILE_FLAGS "-maes -mssse3")
set_source_files_properties(aes/aes256_ni.c PROPERTIES COMPILE_FLAGS "-maes -mssse3")
endif()
elseif (OQS_DIST_ARM64_V8_BUILD) elseif (OQS_DIST_ARM64_V8_BUILD)
set(AES_IMPL ${AES_IMPL} aes/aes128_armv8.c) set(AES_IMPL ${AES_IMPL} aes/aes128_armv8.c)
set(AES_IMPL ${AES_IMPL} aes/aes256_armv8.c) set(AES_IMPL ${AES_IMPL} aes/aes256_armv8.c)

2
tests/test_sig.c
View File

@ -49,7 +49,7 @@ static OQS_STATUS sig_test_correctness(const char *method_name, bool bitflips_al
if (bitflips_all[i]) { if (bitflips_all[i]) {
snprintf(bitflips_as_str[i], sizeof(bitflips_as_str[i]), "all"); snprintf(bitflips_as_str[i], sizeof(bitflips_as_str[i]), "all");
} else { } else {
snprintf(bitflips_as_str[i], sizeof(bitflips_as_str[i]), "%ld random", bitflips[i]); snprintf(bitflips_as_str[i], sizeof(bitflips_as_str[i]), "%zu random", bitflips[i]);
} }
} }

2
tests/test_sig_stfl.c
View File

@ -436,7 +436,7 @@ static OQS_STATUS sig_stfl_test_correctness(const char *method_name, const char
if (bitflips_all[i]) { if (bitflips_all[i]) {
snprintf(bitflips_as_str[i], sizeof(bitflips_as_str[i]), "all"); snprintf(bitflips_as_str[i], sizeof(bitflips_as_str[i]), "all");
} else { } else {
snprintf(bitflips_as_str[i], sizeof(bitflips_as_str[i]), "%ld random", bitflips[i]); snprintf(bitflips_as_str[i], sizeof(bitflips_as_str[i]), "%zu random", bitflips[i]);
} }
} }