- djm@cvs.openbsd.org 2014/02/07 06:55:54

     [cipher.c mac.c]
     remove some logging that makes ssh debugging output very verbose;
     ok markus

diff --git a/ChangeLog b/ChangeLog
index d44388c13f0ad065c3c2dc5d9332b55886027985..057582f4044c139bacca114556a6199919a18f8f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+20140224
+ - OpenBSD CVS Sync
+   - djm@cvs.openbsd.org 2014/02/07 06:55:54
+     [cipher.c mac.c]
+     remove some logging that makes ssh debugging output very verbose;
+     ok markus
+
 20140221
  - (tim) [configure.ac]  Fix cut-and-paste error. Patch from Bryan Drewery.
 

diff --git a/cipher.c b/cipher.c
index ee79a1ef4ad8b541402e16ace8ccc0007456192a..53d9b4fb7131eac38949a06d99685b616c8e539d 100644 (file)
--- a/cipher.c
+++ b/cipher.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cipher.c,v 1.96 2014/02/02 03:44:31 djm Exp $ */
+/* $OpenBSD: cipher.c,v 1.97 2014/02/07 06:55:54 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -228,8 +228,6 @@ ciphers_valid(const char *names)
                        debug("bad cipher %s [%s]", p, names);
                        free(cipher_list);
                        return 0;
-               } else {
-                       debug3("cipher ok: %s [%s]", p, names);
                }
        }
        debug3("ciphers ok: [%s]", names);

diff --git a/mac.c b/mac.c
index 4c4a6bf5328e849a9ebffcefd4d302075befecbb..0977572130bb3b2a84f0c00a88670329eb610f76 100644 (file)
--- a/mac.c
+++ b/mac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mac.c,v 1.27 2014/01/27 18:58:14 markus Exp $ */
+/* $OpenBSD: mac.c,v 1.28 2014/02/07 06:55:54 djm Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  *
@@ -136,9 +136,10 @@ mac_setup(Mac *mac, char *name)
        for (m = macs; m->name != NULL; m++) {
                if (strcmp(name, m->name) != 0)
                        continue;
-               if (mac != NULL)
+               if (mac != NULL) {
                        mac_setup_by_alg(mac, m);
-               debug2("mac_setup: found %s", name);
+                       debug2("mac_setup: setup %s", name);
+               }
                return (0);
        }
        debug2("mac_setup: unknown %s", name);
@@ -149,7 +150,7 @@ int
 mac_init(Mac *mac)
 {
        if (mac->key == NULL)
-               fatal("mac_init: no key");
+               fatal("%s: no key", __func__);
        switch (mac->type) {
        case SSH_DIGEST:
                if (mac->hmac_ctx == NULL ||
@@ -237,8 +238,6 @@ mac_valid(const char *names)
                        debug("bad mac %s [%s]", p, names);
                        free(maclist);
                        return (0);
-               } else {
-                       debug3("mac ok: %s [%s]", p, names);
                }
        }
        debug3("macs ok: [%s]", names);