forked from pool/libssh
Dominique Leuenberger
bef0b8acbf
- Update to version 0.8.2 * Added sha256 fingerprints for pubkeys * Improved compiler flag detection * Fixed race condition in reading sftp messages * Fixed doxygen generation and added modern style * Fixed library initialization on Windows * Fixed __bounded__ attribute detection * Fixed a bug in the options parser * Fixed documentation for new knwon_hosts API - Added patch: 0001-poll-Fix-size-types-in-ssh_event_free.patch * Fix compiler warning on SLE12 - Add missing zlib-devel dependency which was previously pulled in by libopenssl-devel - Remove the libssh_threads.so symlink - Update to version 0.8.1 * Fixed version number in the header * Fixed version number in pkg-config and cmake config * Fixed library initialization * Fixed attribute detection - Update to version 0.8.0 * Removed support for deprecated SSHv1 protocol * Added new connector API for clients * Added new known_hosts parsing API * Added support for OpenSSL 1.1 * Added support for chacha20-poly1305 cipher * Added crypto backend for mbedtls crypto library * Added ECDSA support with gcrypt backend * Added advanced client and server testing using cwrap.org * Added support for curve25519-sha256 alias * Added support for global known_hosts file * Added support for symbol versioning * Improved ssh_config parsing * Improved threading support - Removed 0001-libcrypto-Remove-AES_ctr128_encrypt.patch - Removed 0001-libcrypto-Introduce-a-libcrypto-compat-file.patch - Removed 0001-libcrypto-Use-newer-API-for-HMAC.patch - Removed 0001-libcrypto-Use-a-pointer-for-EVP_MD_CTX.patch - Removed 0001-libcrypto-Use-a-pointer-for-EVP_CIPHER_CTX.patch - Removed 0001-pki_crypto-Use-getters-and-setters-for-opaque-keys-a.patch - Removed 0001-threads-Use-new-API-call-for-OpenSSL-CRYPTO-THREADID.patch - Removed 0001-cmake-Use-configure-check-for-CRYPTO_ctr128_encrypt.patch - Removed 0001-config-Bugfix-Dont-skip-unseen-opcodes.patch OBS-URL: https://build.opensuse.org/request/show/632446 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libssh?expand=0&rev=48
54 lines
2.1 KiB
Diff
54 lines
2.1 KiB
Diff
Index: libssh-0.8.2/tests/unittests/torture_misc.c
|
|
===================================================================
|
|
--- libssh-0.8.2.orig/tests/unittests/torture_misc.c 2018-08-30 08:12:50.355846083 +0200
|
|
+++ libssh-0.8.2/tests/unittests/torture_misc.c 2018-08-30 08:12:54.831889573 +0200
|
|
@@ -197,11 +197,13 @@ static void torture_timeout_elapsed(void
|
|
(void) state;
|
|
ssh_timestamp_init(&ts);
|
|
usleep(50000);
|
|
+#ifndef SLOW_TEST_SYSTEM
|
|
assert_true(ssh_timeout_elapsed(&ts,25));
|
|
assert_false(ssh_timeout_elapsed(&ts,30000));
|
|
assert_false(ssh_timeout_elapsed(&ts,75));
|
|
assert_true(ssh_timeout_elapsed(&ts,0));
|
|
assert_false(ssh_timeout_elapsed(&ts,-1));
|
|
+#endif /* SLOW_TEST_SYSTEM */
|
|
}
|
|
|
|
static void torture_timeout_update(void **state){
|
|
@@ -209,11 +211,13 @@ static void torture_timeout_update(void
|
|
(void) state;
|
|
ssh_timestamp_init(&ts);
|
|
usleep(50000);
|
|
+#ifndef SLOW_TEST_SYSTEM
|
|
assert_int_equal(ssh_timeout_update(&ts,25), 0);
|
|
assert_in_range(ssh_timeout_update(&ts,30000),29000,29960);
|
|
assert_in_range(ssh_timeout_update(&ts,75),1,40);
|
|
assert_int_equal(ssh_timeout_update(&ts,0),0);
|
|
assert_int_equal(ssh_timeout_update(&ts,-1),-1);
|
|
+#endif /* SLOW_TEST_SYSTEM */
|
|
}
|
|
|
|
static void torture_ssh_analyze_banner(void **state) {
|
|
Index: libssh-0.8.2/DefineOptions.cmake
|
|
===================================================================
|
|
--- libssh-0.8.2.orig/DefineOptions.cmake 2018-08-30 08:12:50.355846083 +0200
|
|
+++ libssh-0.8.2/DefineOptions.cmake 2018-08-30 08:13:25.020182668 +0200
|
|
@@ -20,6 +20,7 @@ option(WITH_SYMBOL_VERSIONING "Build wit
|
|
option(WITH_ABI_BREAK "Allow ABI break" OFF)
|
|
option(FUZZ_TESTING "Build with fuzzer for the server" OFF)
|
|
option(PICKY_DEVELOPER "Build with picky developer flags" OFF)
|
|
+option(SLOW_TEST_SYSTEM "Disable tests that fail on slow systems" OFF)
|
|
|
|
if (WITH_ZLIB)
|
|
set(WITH_LIBZ ON)
|
|
@@ -46,3 +47,8 @@ endif (WITH_NACL)
|
|
if (WITH_ABI_BREAK)
|
|
set(WITH_SYMBOL_VERSIONING ON)
|
|
endif (WITH_ABI_BREAK)
|
|
+
|
|
+if (SLOW_TEST_SYSTEM)
|
|
+ set (SLOW_TEST_SYSTEM ON)
|
|
+ add_definitions(-DSLOW_TEST_SYSTEM)
|
|
+endif (SLOW_TEST_SYSTEM)
|