Skip to content

Commit 900fc09

Browse files
committed
Avoid invalid compiler options for MSVC
Fixes open-quantum-safe#2238, Fixes open-quantum-safe#2177 Signed-off-by: Mattias Lindblad <matlin@gmail.com>
1 parent 01de36c commit 900fc09

3 files changed

Lines changed: 9 additions & 4 deletions

File tree

src/common/CMakeLists.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,13 @@ else()
2626
if (OQS_DIST_X86_64_BUILD OR OQS_USE_AES_INSTRUCTIONS)
2727
set(AES_IMPL ${AES_IMPL} aes/aes128_ni.c)
2828
set(AES_IMPL ${AES_IMPL} aes/aes256_ni.c)
29-
set_source_files_properties(aes/aes128_ni.c PROPERTIES COMPILE_FLAGS "-maes -mssse3")
30-
set_source_files_properties(aes/aes256_ni.c PROPERTIES COMPILE_FLAGS "-maes -mssse3")
29+
if(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
30+
set_source_files_properties(aes/aes128_ni.c PROPERTIES COMPILE_FLAGS "")
31+
set_source_files_properties(aes/aes256_ni.c PROPERTIES COMPILE_FLAGS "")
32+
else()
33+
set_source_files_properties(aes/aes128_ni.c PROPERTIES COMPILE_FLAGS "-maes -mssse3")
34+
set_source_files_properties(aes/aes256_ni.c PROPERTIES COMPILE_FLAGS "-maes -mssse3")
35+
endif()
3136
elseif (OQS_DIST_ARM64_V8_BUILD)
3237
set(AES_IMPL ${AES_IMPL} aes/aes128_armv8.c)
3338
set(AES_IMPL ${AES_IMPL} aes/aes256_armv8.c)

tests/test_sig.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ static OQS_STATUS sig_test_correctness(const char *method_name, bool bitflips_al
4949
if (bitflips_all[i]) {
5050
snprintf(bitflips_as_str[i], sizeof(bitflips_as_str[i]), "all");
5151
} else {
52-
snprintf(bitflips_as_str[i], sizeof(bitflips_as_str[i]), "%ld random", bitflips[i]);
52+
snprintf(bitflips_as_str[i], sizeof(bitflips_as_str[i]), "%zu random", bitflips[i]);
5353
}
5454
}
5555

tests/test_sig_stfl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ static OQS_STATUS sig_stfl_test_correctness(const char *method_name, const char
436436
if (bitflips_all[i]) {
437437
snprintf(bitflips_as_str[i], sizeof(bitflips_as_str[i]), "all");
438438
} else {
439-
snprintf(bitflips_as_str[i], sizeof(bitflips_as_str[i]), "%ld random", bitflips[i]);
439+
snprintf(bitflips_as_str[i], sizeof(bitflips_as_str[i]), "%zu random", bitflips[i]);
440440
}
441441
}
442442

0 commit comments

Comments
 (0)