7 files changed, 10 insertions, 8 deletions

diff --git a/regress/authorized_keys_root b/regress/authorized_keys_root
deleted file mode 100644
index 328537120..000000000
--- a/regress/authorized_keys_root
+++ /dev/null
@@ -1,2 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAt6ttBacbgvLPsF1VWWfT51t55/5Mj62Xp8EaoH5SNSaLiGIgrrja077lKEept75U4uKFUYU5JJX9GPE9A7Y43LXv+/A6Jm4rEj/U0s4H8tf0UmzVC3t6xh0sRK0hYVNILyoHnIAgdY8CmOiybw7p6DxJY8MRAehD3n9+kFcachU= root@xenon
-1024 35 132789427207755621599908461558918671787816692978751485815532032934821830960131244604702969298486352138126114080367609979552547448841583955126231410604842765726397407176910594168641969541792069550006878863592030567875913190224374005367884774859544943329148178663694126456638431428703289837638970464685771819219 root@xenon
diff --git a/regress/conch-ciphers.sh b/regress/conch-ciphers.sh
index 84b190618..5b65cd993 100644
--- a/regress/conch-ciphers.sh
+++ b/regress/conch-ciphers.sh
@@ -7,7 +7,8 @@ DATA=/bin/ls
 COPY=${OBJ}/copy
 
 if test "x$REGRESS_INTEROP_CONCH" != "xyes" ; then
-        fatal "conch interop tests not enabled"
+        echo "conch interop tests not enabled"
+        exit 0
 fi
 
 start_sshd
diff --git a/regress/copy.1 b/regress/copy.1
deleted file mode 100755
index 92d4d20f9..000000000
--- a/regress/copy.1
+++ /dev/null
diff --git a/regress/copy.2 b/regress/copy.2
deleted file mode 100755
index 92d4d20f9..000000000
--- a/regress/copy.2
+++ /dev/null
diff --git a/regress/putty-ciphers.sh b/regress/putty-ciphers.sh
index 40435ef41..928ea60d2 100644
--- a/regress/putty-ciphers.sh
+++ b/regress/putty-ciphers.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: putty-ciphers.sh,v 1.2 2008/06/30 10:31:11 djm Exp $
+#       $OpenBSD: putty-ciphers.sh,v 1.3 2008/11/10 02:06:35 djm Exp $
 #       Placed in the Public Domain.
 
 tid="putty ciphers"
@@ -7,10 +7,11 @@ DATA=/bin/ls
 COPY=${OBJ}/copy
 
 if test "x$REGRESS_INTEROP_PUTTY" != "xyes" ; then
-        fatal "putty interop tests not enabled"
+        echo "putty interop tests not enabled"
+        exit 0
 fi
 
-for c in aes blowfish 3des arcfour ; do
+for c in aes blowfish 3des arcfour aes128-ctr aes192-ctr aes256-ctr ; do
         verbose "$tid: cipher $c"
         cp ${OBJ}/.putty/sessions/localhost_proxy \
             ${OBJ}/.putty/sessions/cipher_$c
diff --git a/regress/putty-kex.sh b/regress/putty-kex.sh
index 2534b8575..293885a8a 100644
--- a/regress/putty-kex.sh
+++ b/regress/putty-kex.sh
@@ -7,7 +7,8 @@ DATA=/bin/ls
 COPY=${OBJ}/copy
 
 if test "x$REGRESS_INTEROP_PUTTY" != "xyes" ; then
-        fatal "putty interop tests not enabled"
+        echo "putty interop tests not enabled"
+        exit 0
 fi
 
 for k in dh-gex-sha1 dh-group1-sha1 dh-group14-sha1 ; do
diff --git a/regress/putty-transfer.sh b/regress/putty-transfer.sh
index 6b21f3be7..9e1e1550a 100644
--- a/regress/putty-transfer.sh
+++ b/regress/putty-transfer.sh
@@ -7,7 +7,8 @@ DATA=/bin/ls
 COPY=${OBJ}/copy
 
 if test "x$REGRESS_INTEROP_PUTTY" != "xyes" ; then
-        fatal "putty interop tests not enabled"
+        echo "putty interop tests not enabled"
+        exit 0
 fi
 
 # XXX support protocol 1 too