2 files changed, 10 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 605e982b4..5fc9c204a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20080630
+ - (djm) OpenBSD CVS Sync
+   - dtucker@cvs.openbsd.org 2008/06/10 23:13:43
+     [regress/Makefile regress/key-options.sh]
+     Add regress test for key options.  ok djm@
+
 20080629
  - (djm) OpenBSD CVS Sync
    - martynas@cvs.openbsd.org 2008/06/21 07:46:46
@@ -4465,4 +4471,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.5034 2008/06/29 14:07:00 djm Exp $
+$Id: ChangeLog,v 1.5035 2008/06/29 22:06:25 djm Exp $
diff --git a/regress/Makefile b/regress/Makefile
index aa4e6525d..492f84d7c 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile,v 1.45 2008/06/10 05:23:32 dtucker Exp $
+#       $OpenBSD: Makefile,v 1.46 2008/06/10 23:13:43 dtucker Exp $
 
 REGRESS_TARGETS=        t1 t2 t3 t4 t5 t6 t7 t-exec
 tests:          $(REGRESS_TARGETS)
@@ -34,6 +34,7 @@ LTESTS= 	connect \
                 agent-ptrace \
                 keyscan \
                 keygen-change \
+                key-options \
                 scp \
                 sftp \
                 sftp-cmds \
@@ -49,6 +50,7 @@ LTESTS= 	connect \
                 cfgmatch \
                 addrmatch \
                 localcommand \
+                cipher-speed \
                 forcecommand
 
 INTEROP_TESTS=  putty-transfer putty-ciphers putty-kex