2 files changed, 9 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index de0d346ed..3c5bfb042 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+20070808
+ - (djm) OpenBSD CVS Sync
+   - ray@cvs.openbsd.org 2007/07/12 05:48:05
+     [key.c]
+     Delint: remove some unreachable statements, from Bret Lambert.
+     OK markus@ and dtucker@.
+
 20070724
  - (tim) [openssh.xml.in] make FMRI match what package scripts use.
  - (tim) [openbsd-compat/regress/closefromtest.c] Bug 1345: fix open() call.
@@ -3116,4 +3123,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.4715 2007/07/25 04:40:59 tim Exp $
+$Id: ChangeLog,v 1.4716 2007/08/08 04:28:26 djm Exp $
diff --git a/key.c b/key.c
index 93b2d41fe..8fef9b40f 100644
--- a/key.c
+++ b/key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: key.c,v 1.68 2006/11/06 21:25:28 markus Exp $ */
+/* $OpenBSD: key.c,v 1.69 2007/07/12 05:48:05 ray Exp $ */
 /*
  * read_bignum():
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -170,9 +170,7 @@ key_equal(const Key *a, const Key *b)
                     BN_cmp(a->dsa->pub_key, b->dsa->pub_key) == 0;
         default:
                 fatal("key_equal: bad key type %d", a->type);
-                break;
         }
-        return 0;
 }
 
 u_char*