Fix dos2unix on KAT files

Author: thomwiggers

avx2/CMakeLists.txt

@@ -133,7 +133,7 @@ target_compile_options(PQCgenKAT_kem_avx2 PUBLIC)
 target_link_libraries(PQCgenKAT_kem_avx2 PRIVATE kyber ${OPENSSL_CRYPTO_LIBRARY})
 if (WIN32) 
       # Necessary cludge to make hashes be ignorant of Windows CRLF file formatting:
-      add_test(NAME PQCgenKAT_kem_avx2 COMMAND ${CMAKE_COMMAND} -E chdir $<TARGET_FILE_DIR:PQCgenKAT_kem_avx2> $ENV{ComSpec} /c "$<TARGET_FILE_NAME:PQCgenKAT_kem_avx2> && dos2unix -n PQCsignKAT_KEM.rsp ../PQCsignKAT_KEM.rsp && dos2unix -n PQCsignKAT_KEM.req ../PQCsignKAT_KEM.req")
+      add_test(NAME PQCgenKAT_kem_avx2 COMMAND ${CMAKE_COMMAND} -E chdir $<TARGET_FILE_DIR:PQCgenKAT_kem_avx2> $ENV{ComSpec} /c "$<TARGET_FILE_NAME:PQCgenKAT_kem_avx2> && dos2unix -n PQCkemKAT_KEM.rsp ../PQCkemKAT_KEM.rsp && dos2unix -n PQCkemKAT_KEM.req ../PQCkemKAT_KEM.req")
 else()
       add_test(PQCgenKAT_kem_avx2 PQCgenKAT_kem_avx2)
 endif()

ref/CMakeLists.txt

@@ -108,7 +108,7 @@ foreach(X RANGE 2 4)
    add_executable(test_vectors${K${X}}-90s_ref ${VECTOR_SRCS})
    target_compile_options(test_vectors${K${X}}-90s_ref PUBLIC -DKYBER_K=${X} -DKYBER_90S)
    target_link_libraries(test_vectors${K${X}}-90s_ref PRIVATE kyber ${OPENSSL_CRYPTO_LIBRARY})
-   if (WIN32) 
+   if (WIN32)
       add_test(NAME test_vectors${X}-90s_ref COMMAND ${CMAKE_COMMAND} -E chdir $<TARGET_FILE_DIR:test_vectors${K${X}}-90s_ref> $ENV{ComSpec} /c "$<TARGET_FILE_NAME:test_vectors${K${X}}-90s_ref> | dos2unix > ../tvecs${K${X}}-90s")
    else()
       add_test(NAME test_vectors${K${X}}-90s_ref COMMAND sh -c "$<TARGET_FILE:test_vectors${K${X}}-90s_ref> > tvecs${K${X}}-90s")
@@ -120,9 +120,9 @@ endforeach()
 add_executable(PQCgenKAT_kem_ref ${PQCKAT_SRCS})
 target_compile_options(PQCgenKAT_kem_ref PUBLIC)
 target_link_libraries(PQCgenKAT_kem_ref PRIVATE kyber ${OPENSSL_CRYPTO_LIBRARY})
-if (WIN32) 
+if (WIN32)
       # Necessary cludge to make hashes be ignorant of Windows CRLF file formatting:
-      add_test(NAME PQCgenKAT_kem_ref COMMAND ${CMAKE_COMMAND} -E chdir $<TARGET_FILE_DIR:PQCgenKAT_kem_ref> $ENV{ComSpec} /c "$<TARGET_FILE_NAME:PQCgenKAT_kem_ref> && dos2unix -n PQCsignKAT_KEM.rsp ../PQCsignKAT_KEM.rsp && dos2unix -n PQCsignKAT_KEM.req ../PQCsignKAT_KEM.req")
+      add_test(NAME PQCgenKAT_kem_ref COMMAND ${CMAKE_COMMAND} -E chdir $<TARGET_FILE_DIR:PQCgenKAT_kem_ref> $ENV{ComSpec} /c "$<TARGET_FILE_NAME:PQCgenKAT_kem_ref> && dos2unix -n PQCkemKAT_KEM.rsp ../PQCkemKAT_KEM.rsp && dos2unix -n PQCkemKAT_KEM.req ../PQCkemKAT_KEM.req")
 else()
       add_test(PQCgenKAT_kem_ref PQCgenKAT_kem_ref)
 endif()