tests: Set OPENSSL_ENABLE_SHA1_SIGNATURES=1 for all tests

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Reviewed-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>

tests/CMakeLists.txt

@@ -246,6 +246,7 @@ if (CLIENT_TESTING OR SERVER_TESTING)
     list(APPEND TORTURE_ENVIRONMENT NSS_WRAPPER_GROUP=${CMAKE_CURRENT_BINARY_DIR}/etc/group)
     list(APPEND TORTURE_ENVIRONMENT PAM_WRAPPER_SERVICE_DIR=${CMAKE_CURRENT_BINARY_DIR}/etc/pam.d)
     list(APPEND TORTURE_ENVIRONMENT LSAN_OPTIONS=suppressions=${CMAKE_CURRENT_SOURCE_DIR}/suppressions/lsan.supp)
+    list(APPEND TORTURE_ENVIRONMENT OPENSSL_ENABLE_SHA1_SIGNATURES=1)
 
     # Give bob some keys
     file(COPY keys/id_rsa DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/home/bob/.ssh/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE)

tests/pkd/CMakeLists.txt

@@ -35,22 +35,21 @@ target_link_libraries(pkd_hello ${pkd_libs})
 # are not 100% reproducible.
 #
 add_test(pkd_hello_i1 ${CMAKE_CURRENT_BINARY_DIR}/pkd_hello -e -o -i1 -w /tmp/pkd_socket_wrapper_XXXXXX)
+#
+# Configure environment for cwrap socket wrapper.
+#
+if (OSX)
+    set(PKD_ENVIRONMENT "DYLD_FORCE_FLAT_NAMESPACE=1;DYLD_INSERT_LIBRARIES=${SOCKET_WRAPPER_LIBRARY}")
+else ()
+    set(PKD_ENVIRONMENT "LD_PRELOAD=${SOCKET_WRAPPER_LIBRARY};OPENSSL_ENABLE_SHA1_SIGNATURES=1")
+endif ()
+message(STATUS "PKD_ENVIRONMENT=${PKD_ENVIRONMENT}")
+set_property(TEST pkd_hello_i1 PROPERTY ENVIRONMENT ${PKD_ENVIRONMENT})
 
 #
 # pkd_hello_rekey is used to test server-side implementation of rekeying.
 #
 add_test(pkd_hello_rekey ${CMAKE_CURRENT_BINARY_DIR}/pkd_hello -t torture_pkd_openssh_rsa_rsa_default -i1 --rekey=16 -v -v -v -w /tmp/pkd_socket_wrapper_XXXXXX)
-
-#
-# Configure environment for cwrap socket wrapper.
-#
-find_package(socket_wrapper 1.1.5 REQUIRED)
-if (OSX)
-    set(PKD_ENVIRONMENT "DYLD_FORCE_FLAT_NAMESPACE=1;DYLD_INSERT_LIBRARIES=${SOCKET_WRAPPER_LIBRARY}")
-else ()
-    set(PKD_ENVIRONMENT "LD_PRELOAD=${SOCKET_WRAPPER_LIBRARY}")
-endif ()
-message(STATUS "PKD_ENVIRONMENT=${PKD_ENVIRONMENT}")
-set_property(TEST pkd_hello_i1 PROPERTY ENVIRONMENT ${PKD_ENVIRONMENT})
+set_property(TEST pkd_hello_rekey PROPERTY ENVIRONMENT OPENSSL_ENABLE_SHA1_SIGNATURES=1)
 
 endif (WITH_SERVER AND UNIX AND NOT WIN32)

tests/unittests/CMakeLists.txt

@@ -104,7 +104,8 @@ foreach(_UNIT_TEST ${LIBSSH_UNIT_TESTS})
 
     set_property(TEST ${_UNIT_TEST}
                  PROPERTY
-                     ENVIRONMENT LSAN_OPTIONS=suppressions=${libssh-tests_SOURCE_DIR}/suppressions/lsan.supp)
+                     ENVIRONMENT
+                        LSAN_OPTIONS=suppressions=${libssh-tests_SOURCE_DIR}/suppressions/lsan.supp;OPENSSL_ENABLE_SHA1_SIGNATURES=1)
 endforeach()
 
 if (CMAKE_USE_PTHREADS_INIT)
@@ -117,7 +118,8 @@ if (CMAKE_USE_PTHREADS_INIT)
 
     set_property(TEST ${_UNIT_TEST}
                  PROPERTY
-                    ENVIRONMENT LSAN_OPTIONS=suppressions=${libssh-tests_SOURCE_DIR}/suppressions/lsan.supp)
+                    ENVIRONMENT
+                        LSAN_OPTIONS=suppressions=${libssh-tests_SOURCE_DIR}/suppressions/lsan.supp;OPENSSL_ENABLE_SHA1_SIGNATURES=1)
     endforeach()
 endif ()