1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
From 9d0c7c2bb10b1b2cc02de1540a830f5756e6495d Mon Sep 17 00:00:00 2001
From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
Date: Wed, 18 Sep 2024 22:02:53 +0300
Subject: [PATCH] tests/server ("make-server", "server-get"): Fix
* tests/server.scm ("make-server", "server-get"): Don't try to use DSA key
when it is disabled.
---
tests/server.scm | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/tests/server.scm b/tests/server.scm
index f24a9d2..2e4ee3e 100644
--- a/tests/server.scm
+++ b/tests/server.scm
@@ -1,6 +1,6 @@
;;; server.scm -- Testing of server procedures without a client.
-;; Copyright (C) 2014, 2015, 2016 Artyom V. Poptsov <poptsov.artyom@gmail.com>
+;; Copyright (C) 2014, 2015, 2016, 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;
;; This file is a part of Guile-SSH.
;;
@@ -127,7 +127,7 @@
(make-server #:bindaddr "127.0.0.1"
#:bindport 123456
#:rsakey %rsakey
- #:dsakey %dsakey
+ #:dsakey (and (dsa-support?) %dsakey)
#:banner "banner"
#:log-verbosity 'nolog
#:blocking-mode #f)))
@@ -142,14 +142,16 @@
(server (make-server #:bindaddr bindaddr
#:bindport bindport
#:rsakey %rsakey
- #:dsakey %dsakey
+ #:dsakey (and (dsa-support?) %dsakey)
#:banner banner
#:log-verbosity log-verbosity
#:blocking-mode blocking-mode)))
(and (eq? (server-get server 'bindaddr) bindaddr)
(eq? (server-get server 'bindport) bindport)
(eq? (server-get server 'rsakey) %rsakey)
- (eq? (server-get server 'dsakey) %dsakey)
+ (if (dsa-support?)
+ (eq? (server-get server 'dsakey) %dsakey)
+ #t)
(eq? (server-get server 'banner) banner)
(eq? (server-get server 'log-verbosity) log-verbosity)
(eq? (server-get server 'blocking-mode) blocking-mode))))
|
