3 files changed, 30 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 34a8e81fe..5c0c14803 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,9 @@
    - djm@cvs.openbsd.org 2004/10/08 02:01:50
      [reexec.sh]
      shrink and tidy; ok dtucker@
+   - djm@cvs.openbsd.org 2004/10/29 23:59:22
+     [Makefile added brokenkeys.sh]
+     regression test for handling of corrupt keys in authorized_keys file
 
 20041203
  - (dtucker) OpenBSD CVS Sync
@@ -1908,4 +1911,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3594 2004/12/06 12:05:52 dtucker Exp $
+$Id: ChangeLog,v 1.3595 2004/12/06 12:07:37 dtucker Exp $
diff --git a/regress/Makefile b/regress/Makefile
index dc7b6e35a..3e22d547f 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile,v 1.32 2004/07/09 19:45:43 david Exp $
+#       $OpenBSD: Makefile,v 1.33 2004/10/29 23:59:22 djm Exp $
 
 REGRESS_TARGETS=        t1 t2 t3 t4 t5 t6 t7 t-exec
 tests:          $(REGRESS_TARGETS)
@@ -38,7 +38,8 @@ LTESTS= 	connect \
                 dynamic-forward \
                 forwarding \
                 multiplex \
-                reexec
+                reexec \
+                brokenkeys
 
 USER!=          id -un
 CLEANFILES=     t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
diff --git a/regress/brokenkeys.sh b/regress/brokenkeys.sh
new file mode 100644
index 000000000..3e70c348a
--- /dev/null
+++ b/regress/brokenkeys.sh
@@ -0,0 +1,23 @@
+#       $OpenBSD: brokenkeys.sh,v 1.1 2004/10/29 23:59:22 djm Exp $
+#       Placed in the Public Domain.
+
+tid="broken keys"
+
+KEYS="$OBJ/authorized_keys_${USER}"
+
+start_sshd
+
+mv ${KEYS} ${KEYS}.bak
+
+# Truncated key
+echo "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEABTM= bad key" > $KEYS
+cat ${KEYS}.bak >> ${KEYS}
+cat $OBJ/$t.pub >> $OBJ/authorized_keys_$USER
+
+${SSH} -2 -F $OBJ/ssh_config somehost true
+if [ $? -ne 0 ]; then
+        fail "ssh connect with protocol $p failed"
+fi
+
+mv ${KEYS}.bak ${KEYS}
+