Change hash algorithm from md5 to sha256 (#634)

* This patch changes the hash algorithm for tester3 from md5 to sha256

* Add internal sha256 subroutines

---------

Co-authored-by: Naoki Shibata <shibatch.sf.net@gmail.com>

Author: shibatch

Configure.cmake

@@ -11,35 +11,40 @@ if (SLEEF_BUILD_STATIC_TEST_BINS)
   set(CMAKE_EXE_LINKER_FLAGS "-static")
 endif()
 
-set(OPENSSL_EXTRA_LIBRARIES "" CACHE STRING "Extra libraries for openssl")
-if (NOT CMAKE_CROSSCOMPILING AND NOT SLEEF_FORCE_FIND_PACKAGE_SSL)
-  if (SLEEF_BUILD_STATIC_TEST_BINS)
-    set(OPENSSL_USE_STATIC_LIBS TRUE)
-  endif()
-  find_package(OpenSSL)
-  if (OPENSSL_FOUND)
-    set(SLEEF_OPENSSL_FOUND TRUE)
-    set(SLEEF_OPENSSL_LIBRARIES ${OPENSSL_LIBRARIES})
-    # Work around for tester3 sig segv, when linking versions of openssl (1.1.1) statically.
-    # This is a known issue https://github.com/openssl/openssl/issues/13872.
+if (NOT SLEEF_DISABLE_SSL)
+  set(OPENSSL_EXTRA_LIBRARIES "" CACHE STRING "Extra libraries for openssl")
+  if (NOT CMAKE_CROSSCOMPILING AND NOT SLEEF_FORCE_FIND_PACKAGE_SSL)
     if (SLEEF_BUILD_STATIC_TEST_BINS)
-      string(REGEX REPLACE
-             "-lpthread" "-Wl,--whole-archive -lpthread -Wl,--no-whole-archive"
-             SLEEF_OPENSSL_LIBRARIES "${OPENSSL_LIBRARIES}")
+      set(OPENSSL_USE_STATIC_LIBS TRUE)
+    endif()
+    find_package(OpenSSL)
+    if (OPENSSL_FOUND)
+      set(SLEEF_OPENSSL_FOUND TRUE)
+      set(SLEEF_OPENSSL_LIBRARIES ${OPENSSL_LIBRARIES})
+      # Work around for tester3 sig segv, when linking versions of openssl (1.1.1) statically.
+      # This is a known issue https://github.com/openssl/openssl/issues/13872.
+      if (SLEEF_BUILD_STATIC_TEST_BINS)
+	string(REGEX REPLACE
+          "-lpthread" "-Wl,--whole-archive -lpthread -Wl,--no-whole-archive"
+          SLEEF_OPENSSL_LIBRARIES "${OPENSSL_LIBRARIES}")
+      endif()
+      set(SLEEF_OPENSSL_VERSION ${OPENSSL_VERSION})
+      set(SLEEF_OPENSSL_LIBRARIES ${SLEEF_OPENSSL_LIBRARIES} ${OPENSSL_EXTRA_LIBRARIES})
+      set(SLEEF_OPENSSL_INCLUDE_DIR ${OPENSSL_INCLUDE_DIR})
+    endif()
+  else()
+    # find_package cannot find OpenSSL when cross-compiling
+    find_library(LIBSSL ssl)
+    find_library(LIBCRYPTO crypto)
+    if (LIBSSL AND LIBCRYPTO)
+      set(SLEEF_OPENSSL_FOUND TRUE)
+      set(SLEEF_OPENSSL_LIBRARIES ${LIBSSL} ${LIBCRYPTO} ${OPENSSL_EXTRA_LIBRARIES})
+      set(SLEEF_OPENSSL_VERSION ${LIBSSL})
     endif()
-    set(SLEEF_OPENSSL_VERSION ${OPENSSL_VERSION})
-    set(SLEEF_OPENSSL_LIBRARIES ${SLEEF_OPENSSL_LIBRARIES} ${OPENSSL_EXTRA_LIBRARIES})
-    set(SLEEF_OPENSSL_INCLUDE_DIR ${OPENSSL_INCLUDE_DIR})
   endif()
 else()
-  # find_package cannot find OpenSSL when cross-compiling
-  find_library(LIBSSL ssl)
-  find_library(LIBCRYPTO crypto)
-  if (LIBSSL AND LIBCRYPTO)
-    set(SLEEF_OPENSSL_FOUND TRUE)
-    set(SLEEF_OPENSSL_LIBRARIES ${LIBSSL} ${LIBCRYPTO} ${OPENSSL_EXTRA_LIBRARIES})
-    set(SLEEF_OPENSSL_VERSION ${LIBSSL})
-  endif()
+  set(SLEEF_OPENSSL_FOUND FALSE)
+  message(STATUS "Detection of OpenSSL is skipped since SLEEF_DISABLE_SSL is specified")
 endif()
 
 if (SLEEF_ENFORCE_TESTER3 AND NOT SLEEF_OPENSSL_FOUND)
@@ -79,10 +84,6 @@ if (SLEEF_DISABLE_MPFR)
   set(LIB_MPFR "")
 endif()
 
-if (SLEEF_DISABLE_SSL)
-  set(SLEEF_OPENSSL_FOUND FALSE)
-endif()
-
 # Include submodules
 
 set(SLEEF_SUBMODULE_INSTALL_DIR "${CMAKE_BINARY_DIR}/submodules")

Jenkinsfile

@@ -36,7 +36,7 @@ pipeline {
 		     	 bat """
 			 call "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\VC\\Auxiliary\\Build\\vcvars64.bat"
 			 if not %ERRORLEVEL% == 0 exit /b %ERRORLEVEL%
-			 call "winbuild-msvc.bat" -DCMAKE_BUILD_TYPE=Release -DSLEEF_SHOW_CONFIG=1 -DSLEEF_BUILD_DFT=TRUE -DSLEEF_BUILD_QUAD=TRUE -DSLEEF_ENFORCE_SSE2=TRUE -DSLEEF_ENFORCE_SSE4=TRUE -DSLEEF_ENFORCE_AVX=TRUE -DSLEEF_ENFORCE_AVX2=TRUE -DSLEEF_ENFORCE_AVX512F=TRUE -DSLEEF_ENABLE_TESTER4=True
+			 call "winbuild-msvc.bat" -DCMAKE_BUILD_TYPE=Release -DSLEEF_SHOW_CONFIG=1 -DSLEEF_BUILD_DFT=TRUE -DSLEEF_BUILD_QUAD=TRUE -DSLEEF_ENFORCE_SSE2=TRUE -DSLEEF_ENFORCE_SSE4=TRUE -DSLEEF_ENFORCE_AVX=TRUE -DSLEEF_ENFORCE_AVX2=TRUE -DSLEEF_ENFORCE_AVX512F=TRUE -DSLEEF_ENABLE_TESTER4=True -DSLEEF_DISABLE_SSL=True
 			 if not %ERRORLEVEL% == 0 exit /b %ERRORLEVEL%
 			 ctest -j 4 --output-on-failure
 			 exit /b %ERRORLEVEL%
@@ -48,6 +48,9 @@ pipeline {
             	     agent { label 'riscv && ubuntu23' }
                      options { skipDefaultCheckout() }
             	     steps {
+		         script {
+			     System.setProperty("org.jenkinsci.plugins.durabletask.BourneShellScript.HEARTBEAT_CHECK_INTERVAL", "86400");
+			 }
                          cleanWs()
                          checkout scm
 	    	     	 sh '''

src/libm-tester/CMakeLists.txt

@@ -167,6 +167,10 @@ endif()
 
 set(IUT_SRC iutsimd.c ${sleef_SOURCE_DIR}/src/common/main_checkfeature.c testerutil.c)
 
+if (NOT SLEEF_OPENSSL_FOUND)
+  add_library(obj_psha OBJECT psha2_capi.cpp)
+endif()
+
 # Add vector extension `iut`s
 macro(test_extension SIMD)
   if(COMPILER_SUPPORTS_${SIMD})
@@ -361,22 +365,30 @@ macro(test_extension SIMD)
       endforeach()
     endif()
 
-    if(NOT ${SIMD} STREQUAL NEON32 AND NOT ${SIMD} STREQUAL NEON32VFPV4 AND SLEEF_OPENSSL_FOUND)
+    if(NOT ${SIMD} STREQUAL NEON32 AND NOT ${SIMD} STREQUAL NEON32VFPV4)
       # Build tester3
       string(TOLOWER ${SIMD} SCSIMD)
       set(T "tester3${SCSIMD}")
       add_executable(${T} tester3.c ${sleef_SOURCE_DIR}/src/common/main_checkfeature.c testerutil.c)
       target_compile_options(${T} PRIVATE ${FLAGS_ENABLE_${SIMD}})
       target_compile_definitions(${T} PRIVATE ${COMMON_TARGET_DEFINITIONS} ${TESTER3_DEFINITIONS_${SIMD}})
+      if (NOT SLEEF_OPENSSL_FOUND)
+	target_compile_definitions(${T} PRIVATE SLEEF_USE_INTERNAL_SHA256=1)
+      endif()
       set_target_properties(${T} PROPERTIES ${COMMON_TARGET_PROPERTIES})
 
       # Enable Vector PCS for Advanced SIMD (if supported)
       if(FORCE_AAVPCS)
         host_target_AAVPCS_definitions(${T})
       endif()
 
-      target_link_libraries(${T} ${TARGET_LIBSLEEF} ${LIBM} ${SLEEF_OPENSSL_LIBRARIES})
-      target_include_directories(${T} PRIVATE ${SLEEF_OPENSSL_INCLUDE_DIR})
+      if (SLEEF_OPENSSL_FOUND)
+	target_link_libraries(${T} ${TARGET_LIBSLEEF} ${LIBM} ${SLEEF_OPENSSL_LIBRARIES})
+	target_include_directories(${T} PRIVATE ${SLEEF_OPENSSL_INCLUDE_DIR})
+      else()
+	target_link_libraries(${T} ${TARGET_LIBSLEEF} ${LIBM} obj_psha)
+      endif()
+
       add_dependencies(${T} ${TARGET_HEADERS})
       add_dependencies(${T} ${TARGET_LIBSLEEF})
 
@@ -644,3 +656,18 @@ if (FILECHECK_COMMAND AND COMPILER_SUPPORTS_OPENMP AND SLEEF_ARCH_X86 AND CMAKE_
   add_test(NAME testervecabi-sse2 COMMAND sh -c "${CMAKE_C_COMPILER} -Wno-attributes -fopenmp -msse2 -O3 ${CMAKE_CURRENT_SOURCE_DIR}/testervecabi.c -I${sleef_BINARY_DIR}/include -S -o- | ${FILECHECK_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR}/testervecabi.c -check-prefix=CHECK-SSE2")
   add_test(NAME testervecabi-avx2 COMMAND sh -c "${CMAKE_C_COMPILER} -Wno-attributes -fopenmp -mavx2 -O3 ${CMAKE_CURRENT_SOURCE_DIR}/testervecabi.c -I${sleef_BINARY_DIR}/include -S -o- | ${FILECHECK_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR}/testervecabi.c -check-prefix=CHECK-AVX2")
 endif()
+
+# Tests for internal sha256
+
+if (SLEEF_OPENSSL_FOUND)
+  add_executable(test_psha test_psha2.cpp)
+  target_link_libraries(test_psha ${SLEEF_OPENSSL_LIBRARIES})
+  target_include_directories(test_psha PRIVATE ${SLEEF_OPENSSL_INCLUDE_DIR})
+  add_test(NAME test_psha COMMAND test_psha)
+
+  add_executable(test_psha_capi test_psha2.cpp)
+  target_compile_definitions(test_psha_capi PRIVATE TEST_CAPI=1)
+  target_link_libraries(test_psha_capi ${SLEEF_OPENSSL_LIBRARIES})
+  target_include_directories(test_psha_capi PRIVATE ${SLEEF_OPENSSL_INCLUDE_DIR})
+  add_test(NAME test_psha_capi COMMAND test_psha_capi)
+endif()