Merge branch 'maint'

Author: u3s

.github/dockerfiles/Dockerfile.ubuntu-base

@@ -129,7 +129,9 @@ USER ${USER}
 ## Need to set USER and create a keygen file for ssh tests to pass
 ENV USER=${USER}
 RUN ssh-keygen -q -t rsa -N '' -f $HOME/.ssh/id_rsa && \
-    cp $HOME/.ssh/id_rsa.pub $HOME/.ssh/authorized_keys
+    ssh-keygen -q -t ed25519 -N '' -f $HOME/.ssh/id_ed25519 && \
+    ssh-keygen -q -t ecdsa -b 256 -N '' -f $HOME/.ssh/id_ecdsa && \
+    cat $HOME/.ssh/id_rsa.pub $HOME/.ssh/id_ed25519.pub $HOME/.ssh/id_ecdsa.pub > $HOME/.ssh/authorized_keys
 
 COPY --chown=${USER}:${GROUP} dockerfiles/.profile /home/otptest/.profile
 

lib/ssh/test/Makefile

@@ -57,6 +57,7 @@ MODULES= \
 	ssh_key_cb \
 	ssh_key_cb_options \
 	ssh_key_cb_engine_keys \
+	ssh_algorithms_key_cb \
 	ssh_trpt_test_lib \
 	ssh_chan_behaviours_client \
 	ssh_chan_behaviours_server \
@@ -84,6 +85,8 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
 SPEC_FILES = \
 	ssh.spec \
 	ssh_bench.spec \
+	ssh_dev.spec \
+	ssh_gh.spec \
 	ssh_sup.spec
 
 COVER_FILE = ssh.cover