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
|
Description: Remove DSA from probed host keys for the SSH probe
The DSA-type host key support has been removed from openssh 10.0. Somkeping's
SSH probe is however still using it which causes errors.
Author: Gabriel Filion <gabster@lelutin.ca>
Bug-Debian: https://bugs.debian.org/1110355
Bug: https://github.com/oetiker/SmokePing/issues/447
Forwarded: https://github.com/oetiker/SmokePing/pull/450
Applied-Upstream: commit:a1244391c482d0b0e063a25de095b57cebad9e3f
---
--- a/lib/Smokeping/probes/SSH.pm
+++ b/lib/Smokeping/probes/SSH.pm
@@ -55,7 +55,7 @@ sub new($$$)
# no need for this if we run as a cgi
unless ( $ENV{SERVER_SOFTWARE} ) {
- my $call = "$self->{properties}{binary} -t dsa,rsa,ecdsa 127.0.0.1";
+ my $call = "$self->{properties}{binary} -t rsa,ecdsa,ed25519 127.0.0.1";
my $return = `$call 2>&1`;
if ($return =~ m/$ssh_re/s){
print "### parsing ssh-keyscan output...OK\n";
@@ -132,8 +132,8 @@ sub targetvars {
return $class->_makevars($class->SUPER::targetvars, {
keytype => {
_doc => "Type of key, used in ssh-keyscan -t I<keytype>",
- _re => "[ecdr]sa*",
- _example => 'dsa',
+ _re => "(rsa|ecdsa|ed25519)",
+ _example => 'ecdsa',
_default => 'rsa',
},
port => {
|
