summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--cipher.c4
-rw-r--r--mac.c11
3 files changed, 13 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index d44388c13..057582f40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
120140224
2 - OpenBSD CVS Sync
3 - djm@cvs.openbsd.org 2014/02/07 06:55:54
4 [cipher.c mac.c]
5 remove some logging that makes ssh debugging output very verbose;
6 ok markus
7
120140221 820140221
2 - (tim) [configure.ac] Fix cut-and-paste error. Patch from Bryan Drewery. 9 - (tim) [configure.ac] Fix cut-and-paste error. Patch from Bryan Drewery.
3 10
diff --git a/cipher.c b/cipher.c
index ee79a1ef4..53d9b4fb7 100644
--- a/cipher.c
+++ b/cipher.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: cipher.c,v 1.96 2014/02/02 03:44:31 djm Exp $ */ 1/* $OpenBSD: cipher.c,v 1.97 2014/02/07 06:55:54 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -228,8 +228,6 @@ ciphers_valid(const char *names)
228 debug("bad cipher %s [%s]", p, names); 228 debug("bad cipher %s [%s]", p, names);
229 free(cipher_list); 229 free(cipher_list);
230 return 0; 230 return 0;
231 } else {
232 debug3("cipher ok: %s [%s]", p, names);
233 } 231 }
234 } 232 }
235 debug3("ciphers ok: [%s]", names); 233 debug3("ciphers ok: [%s]", names);
diff --git a/mac.c b/mac.c
index 4c4a6bf53..097757213 100644
--- a/mac.c
+++ b/mac.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: mac.c,v 1.27 2014/01/27 18:58:14 markus Exp $ */ 1/* $OpenBSD: mac.c,v 1.28 2014/02/07 06:55:54 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2001 Markus Friedl. All rights reserved. 3 * Copyright (c) 2001 Markus Friedl. All rights reserved.
4 * 4 *
@@ -136,9 +136,10 @@ mac_setup(Mac *mac, char *name)
136 for (m = macs; m->name != NULL; m++) { 136 for (m = macs; m->name != NULL; m++) {
137 if (strcmp(name, m->name) != 0) 137 if (strcmp(name, m->name) != 0)
138 continue; 138 continue;
139 if (mac != NULL) 139 if (mac != NULL) {
140 mac_setup_by_alg(mac, m); 140 mac_setup_by_alg(mac, m);
141 debug2("mac_setup: found %s", name); 141 debug2("mac_setup: setup %s", name);
142 }
142 return (0); 143 return (0);
143 } 144 }
144 debug2("mac_setup: unknown %s", name); 145 debug2("mac_setup: unknown %s", name);
@@ -149,7 +150,7 @@ int
149mac_init(Mac *mac) 150mac_init(Mac *mac)
150{ 151{
151 if (mac->key == NULL) 152 if (mac->key == NULL)
152 fatal("mac_init: no key"); 153 fatal("%s: no key", __func__);
153 switch (mac->type) { 154 switch (mac->type) {
154 case SSH_DIGEST: 155 case SSH_DIGEST:
155 if (mac->hmac_ctx == NULL || 156 if (mac->hmac_ctx == NULL ||
@@ -237,8 +238,6 @@ mac_valid(const char *names)
237 debug("bad mac %s [%s]", p, names); 238 debug("bad mac %s [%s]", p, names);
238 free(maclist); 239 free(maclist);
239 return (0); 240 return (0);
240 } else {
241 debug3("mac ok: %s [%s]", p, names);
242 } 241 }
243 } 242 }
244 debug3("macs ok: [%s]", names); 243 debug3("macs ok: [%s]", names);