summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/mac.c
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2014-02-07 06:55:54 +0000
committerdjm <djm@openbsd.org>2014-02-07 06:55:54 +0000
commit5f6c7c897bc36fcc689dc38fbd1e782c6a9b953c (patch)
tree9d3d62f9f8bce3c2e7873fbcb24fc95415b7f5b5 /usr.bin/ssh/mac.c
parenthttp 404 is definitive, so treat it like 550 ftp. (diff)
downloadwireguard-openbsd-5f6c7c897bc36fcc689dc38fbd1e782c6a9b953c.tar.xz
wireguard-openbsd-5f6c7c897bc36fcc689dc38fbd1e782c6a9b953c.zip
remove some logging that makes ssh debugging output very verbose;
ok markus
Diffstat (limited to 'usr.bin/ssh/mac.c')
-rw-r--r--usr.bin/ssh/mac.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/usr.bin/ssh/mac.c b/usr.bin/ssh/mac.c
index 8d4fc2d4c7d..e0bdbb3dba5 100644
--- a/usr.bin/ssh/mac.c
+++ b/usr.bin/ssh/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.
*
@@ -129,9 +129,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);
@@ -142,7 +143,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 ||
@@ -230,8 +231,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);