summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtyom V. Poptsov <poptsov.artyom@gmail.com>2016-02-21 20:47:25 +0300
committerArtyom V. Poptsov <poptsov.artyom@gmail.com>2016-02-21 20:52:35 +0300
commite1ffb6841aa0dec634a65db6c4e6ce34f68319bd (patch)
tree070788aa47421cce0f14338bb073cadcf95a5ba4
parenttests/server.scm: Use 'test-assert-with-log' (diff)
downloadguile-ssh-e1ffb6841aa0dec634a65db6c4e6ce34f68319bd.tar.gz
tests/server.scm ("server-set!, valid values"): Adjust for libssh 0.7
-rw-r--r--tests/server.scm8
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/server.scm b/tests/server.scm
index f0edd7c..17bf25b 100644
--- a/tests/server.scm
+++ b/tests/server.scm
@@ -21,9 +21,13 @@
(use-modules (srfi srfi-64)
(ssh server)
+ (ssh version)
;; Helper procedures
(tests common))
+(define %libssh-minor-version
+ (string->number (cadr (string-split (get-libssh-version) #\.))))
+
(test-begin "server")
@@ -53,7 +57,9 @@
(topdir (getenv "abs_top_srcdir"))
(options `((bindaddr "127.0.0.1")
(bindport 22)
- (hostkey "ssh-rsa" "ssh-dss")
+ ,(if (= %libssh-minor-version 7)
+ (list 'hostkey %rsakey %dsakey)
+ '(hostkey "ssh-rsa" "ssh-dss"))
(rsakey ,%rsakey)
(dsakey ,%dsakey)
(banner "string")