diff options
Diffstat (limited to 'mac.c')
-rw-r--r-- | mac.c | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -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 | |||
149 | mac_init(Mac *mac) | 150 | mac_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); |