Fix interop tests for recent regress changes

A recent regress change (2a9b3a2ce411d16cda9c79ab713c55f65b0ec257 in
portable) broke the PuTTY and Twisted Conch interop tests, because the
key they want to use is now called ssh-rsa rather than rsa.  Fix them.

Forwarded: https://bugzilla.mindrot.org/show_bug.cgi?id=3020
Last-Update: 2019-06-14

Patch-Name: fix-interop-tests.patch

1 files changed, 3 insertions, 2 deletions

diff --git a/regress/Makefile b/regress/Makefile
index 925edf71a..781400fd0 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -113,8 +113,9 @@ CLEANFILES=	*.core actual agent-key.* authorized_keys_${USERNAME} \
                 rsa1 rsa1-agent rsa1-agent.pub rsa1.pub rsa_ssh2_cr.prv \
                 rsa_ssh2_crnl.prv scp-ssh-wrapper.exe \
                 scp-ssh-wrapper.scp setuid-allowed sftp-server.log \
-                sftp-server.sh sftp.log ssh-log-wrapper.sh ssh.log \
-                ssh_config ssh_config.* ssh_proxy ssh_proxy_bak \
+                sftp-server.sh sftp.log ssh-log-wrapper.sh \
+                ssh-rsa_oldfmt \
+                ssh.log ssh_config ssh_config.* ssh_proxy ssh_proxy_bak \
                 ssh_proxy_envpass sshd.log sshd_config sshd_config_minimal \
                 sshd_config.orig sshd_proxy sshd_proxy.* sshd_proxy_bak \
                 sshd_proxy_orig t10.out t10.out.pub t12.out t12.out.pub \