diff options
Diffstat (limited to 'mac.c')
-rw-r--r-- | mac.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: mac.c,v 1.24 2013/06/03 00:03:18 dtucker Exp $ */ | 1 | /* $OpenBSD: mac.c,v 1.26 2014/01/04 17:50:55 tedu Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -91,9 +91,9 @@ static const struct macalg macs[] = { | |||
91 | { NULL, 0, NULL, 0, 0, 0, 0 } | 91 | { NULL, 0, NULL, 0, 0, 0, 0 } |
92 | }; | 92 | }; |
93 | 93 | ||
94 | /* Returns a comma-separated list of supported MACs. */ | 94 | /* Returns a list of supported MACs separated by the specified char. */ |
95 | char * | 95 | char * |
96 | mac_alg_list(void) | 96 | mac_alg_list(char sep) |
97 | { | 97 | { |
98 | char *ret = NULL; | 98 | char *ret = NULL; |
99 | size_t nlen, rlen = 0; | 99 | size_t nlen, rlen = 0; |
@@ -101,7 +101,7 @@ mac_alg_list(void) | |||
101 | 101 | ||
102 | for (m = macs; m->name != NULL; m++) { | 102 | for (m = macs; m->name != NULL; m++) { |
103 | if (ret != NULL) | 103 | if (ret != NULL) |
104 | ret[rlen++] = '\n'; | 104 | ret[rlen++] = sep; |
105 | nlen = strlen(m->name); | 105 | nlen = strlen(m->name); |
106 | ret = xrealloc(ret, 1, rlen + nlen + 2); | 106 | ret = xrealloc(ret, 1, rlen + nlen + 2); |
107 | memcpy(ret + rlen, m->name, nlen + 1); | 107 | memcpy(ret + rlen, m->name, nlen + 1); |
@@ -181,8 +181,8 @@ mac_compute(Mac *mac, u_int32_t seqno, u_char *data, int datalen) | |||
181 | u_char b[4], nonce[8]; | 181 | u_char b[4], nonce[8]; |
182 | 182 | ||
183 | if (mac->mac_len > sizeof(u)) | 183 | if (mac->mac_len > sizeof(u)) |
184 | fatal("mac_compute: mac too long %u %lu", | 184 | fatal("mac_compute: mac too long %u %zu", |
185 | mac->mac_len, (u_long)sizeof(u)); | 185 | mac->mac_len, sizeof(u)); |
186 | 186 | ||
187 | switch (mac->type) { | 187 | switch (mac->type) { |
188 | case SSH_EVP: | 188 | case SSH_EVP: |