diff options
Diffstat (limited to 'regress')
-rw-r--r-- | regress/Makefile | 2 | ||||
-rw-r--r-- | regress/conch-ciphers.sh | 2 | ||||
-rw-r--r-- | regress/test-exec.sh | 12 |
3 files changed, 14 insertions, 2 deletions
diff --git a/regress/Makefile b/regress/Makefile index 62794d25f..53a50ffca 100644 --- a/regress/Makefile +++ b/regress/Makefile | |||
@@ -121,7 +121,7 @@ CLEANFILES= *.core actual agent-key.* authorized_keys_${USERNAME} \ | |||
121 | rsa_ssh2_crnl.prv scp-ssh-wrapper.exe \ | 121 | rsa_ssh2_crnl.prv scp-ssh-wrapper.exe \ |
122 | scp-ssh-wrapper.scp setuid-allowed sftp-server.log \ | 122 | scp-ssh-wrapper.scp setuid-allowed sftp-server.log \ |
123 | sftp-server.sh sftp.log ssh-log-wrapper.sh ssh.log \ | 123 | sftp-server.sh sftp.log ssh-log-wrapper.sh ssh.log \ |
124 | ssh-rsa_oldfmt \ | 124 | ssh-rsa_oldfmt ssh-rsa_oldfmt.pub \ |
125 | ssh_config ssh_config.* ssh_proxy ssh_proxy_bak \ | 125 | ssh_config ssh_config.* ssh_proxy ssh_proxy_bak \ |
126 | ssh_proxy_envpass sshd.log sshd_config sshd_config_minimal \ | 126 | ssh_proxy_envpass sshd.log sshd_config sshd_config_minimal \ |
127 | sshd_config.* sshd_proxy sshd_proxy.* sshd_proxy_bak \ | 127 | sshd_config.* sshd_proxy sshd_proxy.* sshd_proxy_bak \ |
diff --git a/regress/conch-ciphers.sh b/regress/conch-ciphers.sh index 6678813a2..6ff5da20b 100644 --- a/regress/conch-ciphers.sh +++ b/regress/conch-ciphers.sh | |||
@@ -16,7 +16,7 @@ for c in aes256-ctr aes256-cbc aes192-ctr aes192-cbc aes128-ctr aes128-cbc \ | |||
16 | rm -f ${COPY} | 16 | rm -f ${COPY} |
17 | # XXX the 2nd "cat" seems to be needed because of buggy FD handling | 17 | # XXX the 2nd "cat" seems to be needed because of buggy FD handling |
18 | # in conch | 18 | # in conch |
19 | ${CONCH} --identity $OBJ/ssh-rsa --port $PORT --user $USER -e none \ | 19 | ${CONCH} --identity $OBJ/ssh-rsa_oldfmt --port $PORT --user $USER -e none \ |
20 | --known-hosts $OBJ/known_hosts --notty --noagent --nox11 -n \ | 20 | --known-hosts $OBJ/known_hosts --notty --noagent --nox11 -n \ |
21 | 127.0.0.1 "cat ${DATA}" 2>/dev/null | cat > ${COPY} | 21 | 127.0.0.1 "cat ${DATA}" 2>/dev/null | cat > ${COPY} |
22 | if [ $? -ne 0 ]; then | 22 | if [ $? -ne 0 ]; then |
diff --git a/regress/test-exec.sh b/regress/test-exec.sh index 5dc975d07..d8491b2be 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh | |||
@@ -587,6 +587,18 @@ REGRESS_INTEROP_CONCH=no | |||
587 | if test -x "$CONCH" ; then | 587 | if test -x "$CONCH" ; then |
588 | REGRESS_INTEROP_CONCH=yes | 588 | REGRESS_INTEROP_CONCH=yes |
589 | fi | 589 | fi |
590 | case "$SCRIPT" in | ||
591 | *conch*) ;; | ||
592 | *) REGRESS_INTEROP_CONCH=no | ||
593 | esac | ||
594 | |||
595 | if test "$REGRESS_INTEROP_CONCH" = "yes" ; then | ||
596 | # Convert rsa key to old format to work around | ||
597 | # https://twistedmatrix.com/trac/ticket/9515 | ||
598 | cp $OBJ/ssh-rsa $OBJ/ssh-rsa_oldfmt | ||
599 | cp $OBJ/ssh-rsa.pub $OBJ/ssh-rsa_oldfmt.pub | ||
600 | ${SSHKEYGEN} -p -N '' -m PEM -f $OBJ/ssh-rsa_oldfmt >/dev/null | ||
601 | fi | ||
590 | 602 | ||
591 | # If PuTTY is present and we are running a PuTTY test, prepare keys and | 603 | # If PuTTY is present and we are running a PuTTY test, prepare keys and |
592 | # configuration | 604 | # configuration |