Deleted Added
sdiff udiff text old ( 248619 ) new ( 255767 )
full compact
mac.c (248619) mac.c (255767)
1/* $OpenBSD: mac.c,v 1.21 2012/12/11 22:51:45 sthen Exp $ */
1/* $OpenBSD: mac.c,v 1.24 2013/06/03 00:03:18 dtucker Exp $ */
2/*
3 * Copyright (c) 2001 Markus Friedl. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.

--- 35 unchanged lines hidden (view full) ---

45#include "umac.h"
46
47#include "openbsd-compat/openssl-compat.h"
48
49#define SSH_EVP 1 /* OpenSSL EVP-based MAC */
50#define SSH_UMAC 2 /* UMAC (not integrated with OpenSSL) */
51#define SSH_UMAC128 3
52
2/*
3 * Copyright (c) 2001 Markus Friedl. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.

--- 35 unchanged lines hidden (view full) ---

45#include "umac.h"
46
47#include "openbsd-compat/openssl-compat.h"
48
49#define SSH_EVP 1 /* OpenSSL EVP-based MAC */
50#define SSH_UMAC 2 /* UMAC (not integrated with OpenSSL) */
51#define SSH_UMAC128 3
52
53struct {
53struct macalg {
54 char *name;
55 int type;
56 const EVP_MD * (*mdfunc)(void);
57 int truncatebits; /* truncate digest if != 0 */
58 int key_len; /* just for UMAC */
59 int len; /* just for UMAC */
60 int etm; /* Encrypt-then-MAC */
54 char *name;
55 int type;
56 const EVP_MD * (*mdfunc)(void);
57 int truncatebits; /* truncate digest if != 0 */
58 int key_len; /* just for UMAC */
59 int len; /* just for UMAC */
60 int etm; /* Encrypt-then-MAC */
61} macs[] = {
61};
62
63static const struct macalg macs[] = {
62 /* Encrypt-and-MAC (encrypt-and-authenticate) variants */
63 { "hmac-sha1", SSH_EVP, EVP_sha1, 0, 0, 0, 0 },
64 { "hmac-sha1-96", SSH_EVP, EVP_sha1, 96, 0, 0, 0 },
65#ifdef HAVE_EVP_SHA256
66 { "hmac-sha2-256", SSH_EVP, EVP_sha256, 0, 0, 0, 0 },
67 { "hmac-sha2-512", SSH_EVP, EVP_sha512, 0, 0, 0, 0 },
68#endif
69 { "hmac-md5", SSH_EVP, EVP_md5, 0, 0, 0, 0 },

--- 14 unchanged lines hidden (view full) ---

84 { "hmac-md5-96-etm@openssh.com", SSH_EVP, EVP_md5, 96, 0, 0, 1 },
85 { "hmac-ripemd160-etm@openssh.com", SSH_EVP, EVP_ripemd160, 0, 0, 0, 1 },
86 { "umac-64-etm@openssh.com", SSH_UMAC, NULL, 0, 128, 64, 1 },
87 { "umac-128-etm@openssh.com", SSH_UMAC128, NULL, 0, 128, 128, 1 },
88
89 { NULL, 0, NULL, 0, 0, 0, 0 }
90};
91
64 /* Encrypt-and-MAC (encrypt-and-authenticate) variants */
65 { "hmac-sha1", SSH_EVP, EVP_sha1, 0, 0, 0, 0 },
66 { "hmac-sha1-96", SSH_EVP, EVP_sha1, 96, 0, 0, 0 },
67#ifdef HAVE_EVP_SHA256
68 { "hmac-sha2-256", SSH_EVP, EVP_sha256, 0, 0, 0, 0 },
69 { "hmac-sha2-512", SSH_EVP, EVP_sha512, 0, 0, 0, 0 },
70#endif
71 { "hmac-md5", SSH_EVP, EVP_md5, 0, 0, 0, 0 },

--- 14 unchanged lines hidden (view full) ---

86 { "hmac-md5-96-etm@openssh.com", SSH_EVP, EVP_md5, 96, 0, 0, 1 },
87 { "hmac-ripemd160-etm@openssh.com", SSH_EVP, EVP_ripemd160, 0, 0, 0, 1 },
88 { "umac-64-etm@openssh.com", SSH_UMAC, NULL, 0, 128, 64, 1 },
89 { "umac-128-etm@openssh.com", SSH_UMAC128, NULL, 0, 128, 128, 1 },
90
91 { NULL, 0, NULL, 0, 0, 0, 0 }
92};
93
94/* Returns a comma-separated list of supported MACs. */
95char *
96mac_alg_list(void)
97{
98 char *ret = NULL;
99 size_t nlen, rlen = 0;
100 const struct macalg *m;
101
102 for (m = macs; m->name != NULL; m++) {
103 if (ret != NULL)
104 ret[rlen++] = '\n';
105 nlen = strlen(m->name);
106 ret = xrealloc(ret, 1, rlen + nlen + 2);
107 memcpy(ret + rlen, m->name, nlen + 1);
108 rlen += nlen;
109 }
110 return ret;
111}
112
92static void
113static void
93mac_setup_by_id(Mac *mac, int which)
114mac_setup_by_alg(Mac *mac, const struct macalg *macalg)
94{
95 int evp_len;
115{
116 int evp_len;
96 mac->type = macs[which].type;
117
118 mac->type = macalg->type;
97 if (mac->type == SSH_EVP) {
119 if (mac->type == SSH_EVP) {
98 mac->evp_md = (*macs[which].mdfunc)();
120 mac->evp_md = macalg->mdfunc();
99 if ((evp_len = EVP_MD_size(mac->evp_md)) <= 0)
100 fatal("mac %s len %d", mac->name, evp_len);
101 mac->key_len = mac->mac_len = (u_int)evp_len;
102 } else {
121 if ((evp_len = EVP_MD_size(mac->evp_md)) <= 0)
122 fatal("mac %s len %d", mac->name, evp_len);
123 mac->key_len = mac->mac_len = (u_int)evp_len;
124 } else {
103 mac->mac_len = macs[which].len / 8;
104 mac->key_len = macs[which].key_len / 8;
125 mac->mac_len = macalg->len / 8;
126 mac->key_len = macalg->key_len / 8;
105 mac->umac_ctx = NULL;
106 }
127 mac->umac_ctx = NULL;
128 }
107 if (macs[which].truncatebits != 0)
108 mac->mac_len = macs[which].truncatebits / 8;
109 mac->etm = macs[which].etm;
129 if (macalg->truncatebits != 0)
130 mac->mac_len = macalg->truncatebits / 8;
131 mac->etm = macalg->etm;
110}
111
112int
113mac_setup(Mac *mac, char *name)
114{
132}
133
134int
135mac_setup(Mac *mac, char *name)
136{
115 int i;
137 const struct macalg *m;
116
138
117 for (i = 0; macs[i].name; i++) {
118 if (strcmp(name, macs[i].name) == 0) {
119 if (mac != NULL)
120 mac_setup_by_id(mac, i);
121 debug2("mac_setup: found %s", name);
122 return (0);
123 }
139 for (m = macs; m->name != NULL; m++) {
140 if (strcmp(name, m->name) != 0)
141 continue;
142 if (mac != NULL)
143 mac_setup_by_alg(mac, m);
144 debug2("mac_setup: found %s", name);
145 return (0);
124 }
125 debug2("mac_setup: unknown %s", name);
126 return (-1);
127}
128
129int
130mac_init(Mac *mac)
131{

--- 15 unchanged lines hidden (view full) ---

147 default:
148 return -1;
149 }
150}
151
152u_char *
153mac_compute(Mac *mac, u_int32_t seqno, u_char *data, int datalen)
154{
146 }
147 debug2("mac_setup: unknown %s", name);
148 return (-1);
149}
150
151int
152mac_init(Mac *mac)
153{

--- 15 unchanged lines hidden (view full) ---

169 default:
170 return -1;
171 }
172}
173
174u_char *
175mac_compute(Mac *mac, u_int32_t seqno, u_char *data, int datalen)
176{
155 static u_char m[EVP_MAX_MD_SIZE];
177 static union {
178 u_char m[EVP_MAX_MD_SIZE];
179 u_int64_t for_align;
180 } u;
156 u_char b[4], nonce[8];
157
181 u_char b[4], nonce[8];
182
158 if (mac->mac_len > sizeof(m))
183 if (mac->mac_len > sizeof(u))
159 fatal("mac_compute: mac too long %u %lu",
184 fatal("mac_compute: mac too long %u %lu",
160 mac->mac_len, (u_long)sizeof(m));
185 mac->mac_len, (u_long)sizeof(u));
161
162 switch (mac->type) {
163 case SSH_EVP:
164 put_u32(b, seqno);
165 /* reset HMAC context */
166 HMAC_Init(&mac->evp_ctx, NULL, 0, NULL);
167 HMAC_Update(&mac->evp_ctx, b, sizeof(b));
168 HMAC_Update(&mac->evp_ctx, data, datalen);
186
187 switch (mac->type) {
188 case SSH_EVP:
189 put_u32(b, seqno);
190 /* reset HMAC context */
191 HMAC_Init(&mac->evp_ctx, NULL, 0, NULL);
192 HMAC_Update(&mac->evp_ctx, b, sizeof(b));
193 HMAC_Update(&mac->evp_ctx, data, datalen);
169 HMAC_Final(&mac->evp_ctx, m, NULL);
194 HMAC_Final(&mac->evp_ctx, u.m, NULL);
170 break;
171 case SSH_UMAC:
172 put_u64(nonce, seqno);
173 umac_update(mac->umac_ctx, data, datalen);
195 break;
196 case SSH_UMAC:
197 put_u64(nonce, seqno);
198 umac_update(mac->umac_ctx, data, datalen);
174 umac_final(mac->umac_ctx, m, nonce);
199 umac_final(mac->umac_ctx, u.m, nonce);
175 break;
176 case SSH_UMAC128:
177 put_u64(nonce, seqno);
178 umac128_update(mac->umac_ctx, data, datalen);
200 break;
201 case SSH_UMAC128:
202 put_u64(nonce, seqno);
203 umac128_update(mac->umac_ctx, data, datalen);
179 umac128_final(mac->umac_ctx, m, nonce);
204 umac128_final(mac->umac_ctx, u.m, nonce);
180 break;
181 default:
182 fatal("mac_compute: unknown MAC type");
183 }
205 break;
206 default:
207 fatal("mac_compute: unknown MAC type");
208 }
184 return (m);
209 return (u.m);
185}
186
187void
188mac_clear(Mac *mac)
189{
190 if (mac->type == SSH_UMAC) {
191 if (mac->umac_ctx != NULL)
192 umac_delete(mac->umac_ctx);

--- 15 unchanged lines hidden (view full) ---

208
209 if (names == NULL || strcmp(names, "") == 0)
210 return (0);
211 maclist = cp = xstrdup(names);
212 for ((p = strsep(&cp, MAC_SEP)); p && *p != '\0';
213 (p = strsep(&cp, MAC_SEP))) {
214 if (mac_setup(NULL, p) < 0) {
215 debug("bad mac %s [%s]", p, names);
210}
211
212void
213mac_clear(Mac *mac)
214{
215 if (mac->type == SSH_UMAC) {
216 if (mac->umac_ctx != NULL)
217 umac_delete(mac->umac_ctx);

--- 15 unchanged lines hidden (view full) ---

233
234 if (names == NULL || strcmp(names, "") == 0)
235 return (0);
236 maclist = cp = xstrdup(names);
237 for ((p = strsep(&cp, MAC_SEP)); p && *p != '\0';
238 (p = strsep(&cp, MAC_SEP))) {
239 if (mac_setup(NULL, p) < 0) {
240 debug("bad mac %s [%s]", p, names);
216 xfree(maclist);
241 free(maclist);
217 return (0);
218 } else {
219 debug3("mac ok: %s [%s]", p, names);
220 }
221 }
222 debug3("macs ok: [%s]", names);
242 return (0);
243 } else {
244 debug3("mac ok: %s [%s]", p, names);
245 }
246 }
247 debug3("macs ok: [%s]", names);
223 xfree(maclist);
248 free(maclist);
224 return (1);
225}
249 return (1);
250}