2 48c4bdc1 2019-04-04 martijn * Copyright (c) 2019 Martijn van Duren <martijn@openbsd.org>
4 48c4bdc1 2019-04-04 martijn * Permission to use, copy, modify, and distribute this software for any
5 48c4bdc1 2019-04-04 martijn * purpose with or without fee is hereby granted, provided that the above
6 48c4bdc1 2019-04-04 martijn * copyright notice and this permission notice appear in all copies.
8 48c4bdc1 2019-04-04 martijn * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 48c4bdc1 2019-04-04 martijn * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 48c4bdc1 2019-04-04 martijn * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 48c4bdc1 2019-04-04 martijn * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 48c4bdc1 2019-04-04 martijn * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 48c4bdc1 2019-04-04 martijn * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 48c4bdc1 2019-04-04 martijn * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 6bcbc798 2021-05-16 martijn #include <openssl/err.h>
17 48c4bdc1 2019-04-04 martijn #include <openssl/evp.h>
18 06f6b49b 2019-04-06 martijn #include <openssl/pem.h>
19 48c4bdc1 2019-04-04 martijn #include <openssl/sha.h>
21 48c4bdc1 2019-04-04 martijn #include <ctype.h>
22 c826412d 2019-05-02 martijn #include <errno.h>
23 1308710c 2019-04-09 martijn #include <fcntl.h>
24 48c4bdc1 2019-04-04 martijn #include <stdio.h>
25 48c4bdc1 2019-04-04 martijn #include <stdlib.h>
26 48c4bdc1 2019-04-04 martijn #include <string.h>
27 48c4bdc1 2019-04-04 martijn #include <syslog.h>
28 48c4bdc1 2019-04-04 martijn #include <time.h>
29 48c4bdc1 2019-04-04 martijn #include <unistd.h>
31 babf5d5a 2021-05-11 martijn #include "openbsd-compat.h"
32 6840f1a1 2019-08-22 martijn #include "opensmtpd.h"
33 40cd76f4 2020-08-30 martijn #include "mheader.h"
35 06f6b49b 2019-04-06 martijn struct dkim_signature {
36 06f6b49b 2019-04-06 martijn char *signature;
37 06f6b49b 2019-04-06 martijn size_t size;
38 06f6b49b 2019-04-06 martijn size_t len;
41 6840f1a1 2019-08-22 martijn struct dkim_message {
42 48c4bdc1 2019-04-04 martijn FILE *origf;
43 48c4bdc1 2019-04-04 martijn int parsing_headers;
44 48c4bdc1 2019-04-04 martijn char **headers;
45 48c4bdc1 2019-04-04 martijn int lastheader;
46 48c4bdc1 2019-04-04 martijn size_t body_whitelines;
47 48c4bdc1 2019-04-04 martijn int has_body;
48 06f6b49b 2019-04-06 martijn struct dkim_signature signature;
49 6bcbc798 2021-05-16 martijn EVP_MD_CTX *dctx;
52 37c6191b 2019-04-06 martijn /* RFC 6376 section 5.4.1 */
53 37c6191b 2019-04-06 martijn static char *dsign_headers[] = {
55 37c6191b 2019-04-06 martijn "reply-to",
56 37c6191b 2019-04-06 martijn "subject",
60 37c6191b 2019-04-06 martijn "resent-date",
61 37c6191b 2019-04-06 martijn "resent-from",
62 37c6191b 2019-04-06 martijn "resent-to",
63 37c6191b 2019-04-06 martijn "resent-cc",
64 37c6191b 2019-04-06 martijn "in-reply-to",
65 37c6191b 2019-04-06 martijn "references",
66 37c6191b 2019-04-06 martijn "list-id",
67 37c6191b 2019-04-06 martijn "list-help",
68 37c6191b 2019-04-06 martijn "list-unsubscribe",
69 37c6191b 2019-04-06 martijn "list-subscribe",
70 37c6191b 2019-04-06 martijn "list-post",
71 37c6191b 2019-04-06 martijn "list-owner",
72 37c6191b 2019-04-06 martijn "list-archive"
74 37c6191b 2019-04-06 martijn static char **sign_headers = dsign_headers;
75 37c6191b 2019-04-06 martijn static size_t nsign_headers = sizeof(dsign_headers) / sizeof(*dsign_headers);
77 fddd7e1e 2019-04-06 martijn static char *hashalg = "sha256";
78 fddd7e1e 2019-04-06 martijn static char *cryptalg = "rsa";
80 48c4bdc1 2019-04-04 martijn #define CANON_SIMPLE 0
81 48c4bdc1 2019-04-04 martijn #define CANON_RELAXED 1
82 48c4bdc1 2019-04-04 martijn static int canonheader = CANON_SIMPLE;
83 48c4bdc1 2019-04-04 martijn static int canonbody = CANON_SIMPLE;
85 e7076cef 2019-05-02 martijn static int addtime = 0;
86 e974922c 2019-05-02 martijn static long long addexpire = 0;
87 c826412d 2019-05-02 martijn static int addheaders = 0;
89 40cd76f4 2020-08-30 martijn static char **domain = NULL;
90 40cd76f4 2020-08-30 martijn static size_t ndomains = 0;
91 06f6b49b 2019-04-06 martijn static char *selector = NULL;
93 06f6b49b 2019-04-06 martijn static EVP_PKEY *pkey;
94 06f6b49b 2019-04-06 martijn static const EVP_MD *hash_md;
95 6bcbc798 2021-05-16 martijn static int keyid = EVP_PKEY_RSA;
96 6bcbc798 2021-05-16 martijn static int sephash = 0;
98 06f6b49b 2019-04-06 martijn #define DKIM_SIGNATURE_LINELEN 78
100 48c4bdc1 2019-04-04 martijn void usage(void);
101 5fdffb49 2022-01-27 martijn void dkim_adddomain(char *);
102 48c4bdc1 2019-04-04 martijn void dkim_headers_set(char *);
103 6840f1a1 2019-08-22 martijn void dkim_dataline(struct osmtpd_ctx *, const char *);
104 6840f1a1 2019-08-22 martijn void *dkim_message_new(struct osmtpd_ctx *);
105 6840f1a1 2019-08-22 martijn void dkim_message_free(struct osmtpd_ctx *, void *);
106 6840f1a1 2019-08-22 martijn void dkim_parse_header(struct dkim_message *, char *, int);
107 6840f1a1 2019-08-22 martijn void dkim_parse_body(struct dkim_message *, char *);
108 6840f1a1 2019-08-22 martijn void dkim_sign(struct osmtpd_ctx *);
109 6840f1a1 2019-08-22 martijn int dkim_signature_printheader(struct dkim_message *, const char *);
110 6840f1a1 2019-08-22 martijn int dkim_signature_printf(struct dkim_message *, char *, ...)
111 06f6b49b 2019-04-06 martijn __attribute__((__format__ (printf, 2, 3)));
112 6840f1a1 2019-08-22 martijn int dkim_signature_normalize(struct dkim_message *);
113 40cd76f4 2020-08-30 martijn const char *dkim_domain_select(struct dkim_message *, char *);
114 6840f1a1 2019-08-22 martijn int dkim_signature_need(struct dkim_message *, size_t);
115 6840f1a1 2019-08-22 martijn int dkim_sign_init(struct dkim_message *);
118 48c4bdc1 2019-04-04 martijn main(int argc, char *argv[])
121 5fdffb49 2022-01-27 martijn FILE *file;
122 5fdffb49 2022-01-27 martijn char *line;
123 5fdffb49 2022-01-27 martijn size_t linesz;
124 5fdffb49 2022-01-27 martijn ssize_t linelen;
125 e974922c 2019-05-02 martijn const char *errstr;
127 5fdffb49 2022-01-27 martijn while ((ch = getopt(argc, argv, "a:c:D:d:h:k:s:tx:z")) != -1) {
128 48c4bdc1 2019-04-04 martijn switch (ch) {
129 48c4bdc1 2019-04-04 martijn case 'a':
130 6bcbc798 2021-05-16 martijn if (strncmp(optarg, "rsa-", 4) == 0) {
131 6bcbc798 2021-05-16 martijn cryptalg = "rsa";
132 6bcbc798 2021-05-16 martijn hashalg = optarg + 4;
133 6bcbc798 2021-05-16 martijn keyid = EVP_PKEY_RSA;
134 6bcbc798 2021-05-16 martijn sephash = 0;
135 33a7c297 2022-12-16 martijn #ifdef HAVE_ED25519
136 6bcbc798 2021-05-16 martijn } else if (strncmp(optarg, "ed25519-", 8) == 0) {
137 6bcbc798 2021-05-16 martijn hashalg = optarg + 8;
138 6bcbc798 2021-05-16 martijn cryptalg = "ed25519";
139 6bcbc798 2021-05-16 martijn keyid = EVP_PKEY_ED25519;
140 6bcbc798 2021-05-16 martijn sephash = 1;
143 6bcbc798 2021-05-16 martijn osmtpd_errx(1, "invalid algorithm");
145 48c4bdc1 2019-04-04 martijn case 'c':
146 48c4bdc1 2019-04-04 martijn if (strncmp(optarg, "simple", 6) == 0) {
147 48c4bdc1 2019-04-04 martijn canonheader = CANON_SIMPLE;
148 48c4bdc1 2019-04-04 martijn optarg += 6;
149 48c4bdc1 2019-04-04 martijn } else if (strncmp(optarg, "relaxed", 7) == 0) {
150 48c4bdc1 2019-04-04 martijn canonheader = CANON_RELAXED;
151 48c4bdc1 2019-04-04 martijn optarg += 7;
153 d581ea1c 2025-01-29 kirill osmtpd_errx(1, "Invalid canonicalization");
154 48c4bdc1 2019-04-04 martijn if (optarg[0] == '/') {
155 48c4bdc1 2019-04-04 martijn if (strcmp(optarg + 1, "simple") == 0)
156 48c4bdc1 2019-04-04 martijn canonbody = CANON_SIMPLE;
157 48c4bdc1 2019-04-04 martijn else if (strcmp(optarg + 1, "relaxed") == 0)
158 48c4bdc1 2019-04-04 martijn canonbody = CANON_RELAXED;
160 d581ea1c 2025-01-29 kirill osmtpd_errx(1,
161 6840f1a1 2019-08-22 martijn "Invalid canonicalization");
162 48c4bdc1 2019-04-04 martijn } else if (optarg[0] == '\0')
163 48c4bdc1 2019-04-04 martijn canonbody = CANON_SIMPLE;
165 d581ea1c 2025-01-29 kirill osmtpd_errx(1, "Invalid canonicalization");
167 5fdffb49 2022-01-27 martijn case 'D':
168 5fdffb49 2022-01-27 martijn if ((file = fopen(optarg, "r")) == NULL)
169 5fdffb49 2022-01-27 martijn osmtpd_err(1, "Can't open domain file (%s)",
170 5fdffb49 2022-01-27 martijn optarg);
172 5fdffb49 2022-01-27 martijn line = NULL;
173 5fdffb49 2022-01-27 martijn linesz = 0;
174 5fdffb49 2022-01-27 martijn linelen = getline(&line, &linesz, file);
175 5fdffb49 2022-01-27 martijn if (linelen > 0) {
176 5fdffb49 2022-01-27 martijn if (line[linelen - 1] == '\n')
177 5fdffb49 2022-01-27 martijn line[linelen - 1] = '\0';
178 3c3725bd 2025-01-27 kirill if (line[0] == '#')
179 3c3725bd 2025-01-27 kirill continue;
180 5fdffb49 2022-01-27 martijn dkim_adddomain(line);
182 5fdffb49 2022-01-27 martijn } while (linelen != -1);
183 5fdffb49 2022-01-27 martijn if (ferror(file))
184 5fdffb49 2022-01-27 martijn osmtpd_err(1, "Error reading domain file (%s)",
185 5fdffb49 2022-01-27 martijn optarg);
186 5fdffb49 2022-01-27 martijn fclose(file);
188 48c4bdc1 2019-04-04 martijn case 'd':
189 5fdffb49 2022-01-27 martijn dkim_adddomain(optarg);
191 06f6b49b 2019-04-06 martijn case 'h':
192 06f6b49b 2019-04-06 martijn dkim_headers_set(optarg);
194 06f6b49b 2019-04-06 martijn case 'k':
195 5fdffb49 2022-01-27 martijn if ((file = fopen(optarg, "r")) == NULL)
196 6840f1a1 2019-08-22 martijn osmtpd_err(1, "Can't open key file (%s)",
197 6840f1a1 2019-08-22 martijn optarg);
198 5fdffb49 2022-01-27 martijn pkey = PEM_read_PrivateKey(file, NULL, NULL, NULL);
199 06f6b49b 2019-04-06 martijn if (pkey == NULL)
200 6840f1a1 2019-08-22 martijn osmtpd_errx(1, "Can't read key file");
201 5fdffb49 2022-01-27 martijn fclose(file);
203 06f6b49b 2019-04-06 martijn case 's':
204 06f6b49b 2019-04-06 martijn selector = optarg;
206 e7076cef 2019-05-02 martijn case 't':
207 e7076cef 2019-05-02 martijn addtime = 1;
209 e974922c 2019-05-02 martijn case 'x':
210 e974922c 2019-05-02 martijn addexpire = strtonum(optarg, 1, INT64_MAX, &errstr);
211 e974922c 2019-05-02 martijn if (addexpire == 0)
212 6840f1a1 2019-08-22 martijn osmtpd_errx(1, "Expire offset is %s", errstr);
214 c826412d 2019-05-02 martijn case 'z':
215 6840f1a1 2019-08-22 martijn addheaders++;
217 48c4bdc1 2019-04-04 martijn default:
218 48c4bdc1 2019-04-04 martijn usage();
222 fddd7e1e 2019-04-06 martijn OpenSSL_add_all_digests();
224 6840f1a1 2019-08-22 martijn if (pledge("tmppath stdio", NULL) == -1)
225 6840f1a1 2019-08-22 martijn osmtpd_err(1, "pledge");
227 6bcbc798 2021-05-16 martijn if ((hash_md = EVP_get_digestbyname(hashalg)) == NULL)
228 6bcbc798 2021-05-16 martijn osmtpd_errx(1, "Can't find hash: %s", hashalg);
230 06f6b49b 2019-04-06 martijn if (domain == NULL || selector == NULL || pkey == NULL)
231 48c4bdc1 2019-04-04 martijn usage();
233 6bcbc798 2021-05-16 martijn if (EVP_PKEY_id(pkey) != keyid)
234 6bcbc798 2021-05-16 martijn osmtpd_errx(1, "Key is not of type %s", cryptalg);
236 6840f1a1 2019-08-22 martijn osmtpd_register_filter_dataline(dkim_dataline);
237 6840f1a1 2019-08-22 martijn osmtpd_local_message(dkim_message_new, dkim_message_free);
238 6840f1a1 2019-08-22 martijn osmtpd_run();
240 48c4bdc1 2019-04-04 martijn return 0;
244 5fdffb49 2022-01-27 martijn dkim_adddomain(char *d)
246 5fdffb49 2022-01-27 martijn domain = reallocarray(domain, ndomains + 1, sizeof(*domain));
247 5fdffb49 2022-01-27 martijn if (domain == NULL)
248 d581ea1c 2025-01-29 kirill osmtpd_err(1, "%s: reallocarray", __func__);
249 5fdffb49 2022-01-27 martijn domain[ndomains++] = d;
253 6840f1a1 2019-08-22 martijn dkim_dataline(struct osmtpd_ctx *ctx, const char *line)
255 6840f1a1 2019-08-22 martijn struct dkim_message *message = ctx->local_message;
256 6840f1a1 2019-08-22 martijn char *linedup;
257 48c4bdc1 2019-04-04 martijn size_t linelen;
259 48c4bdc1 2019-04-04 martijn linelen = strlen(line);
260 6840f1a1 2019-08-22 martijn if (fprintf(message->origf, "%s\n", line) < (int) linelen)
261 d581ea1c 2025-01-29 kirill osmtpd_errx(1, "Couldn't write to tempfile");
263 7ecf4491 2019-05-01 martijn if (line[0] == '.' && line[1] =='\0') {
264 6840f1a1 2019-08-22 martijn dkim_sign(ctx);
265 6840f1a1 2019-08-22 martijn } else if (linelen != 0 && message->parsing_headers) {
266 f5286ea3 2019-04-08 martijn if (line[0] == '.')
268 6840f1a1 2019-08-22 martijn if ((linedup = strdup(line)) == NULL)
269 d581ea1c 2025-01-29 kirill osmtpd_err(1, "%s: strdup", __func__);
270 6840f1a1 2019-08-22 martijn dkim_parse_header(message, linedup, 0);
271 6840f1a1 2019-08-22 martijn free(linedup);
272 6840f1a1 2019-08-22 martijn } else if (linelen == 0 && message->parsing_headers) {
273 6840f1a1 2019-08-22 martijn if (addheaders > 0 && !dkim_signature_printf(message, "; "))
275 6840f1a1 2019-08-22 martijn message->parsing_headers = 0;
276 f5286ea3 2019-04-08 martijn } else {
277 f5286ea3 2019-04-08 martijn if (line[0] == '.')
279 6840f1a1 2019-08-22 martijn if ((linedup = strdup(line)) == NULL)
280 d581ea1c 2025-01-29 kirill osmtpd_err(1, "%s: strdup", __func__);
281 6840f1a1 2019-08-22 martijn dkim_parse_body(message, linedup);
282 6840f1a1 2019-08-22 martijn free(linedup);
287 6840f1a1 2019-08-22 martijn dkim_message_new(struct osmtpd_ctx *ctx)
289 6840f1a1 2019-08-22 martijn struct dkim_message *message;
291 41815bcc 2021-05-14 martijn if ((message = calloc(1, sizeof(*message))) == NULL) {
292 d581ea1c 2025-01-29 kirill osmtpd_err(1, "%s: calloc", __func__);
293 41815bcc 2021-05-14 martijn return NULL;
296 6840f1a1 2019-08-22 martijn if ((message->origf = tmpfile()) == NULL) {
297 d581ea1c 2025-01-29 kirill osmtpd_warn(NULL, "Failed to open tempfile");
298 41815bcc 2021-05-14 martijn goto fail;
300 6840f1a1 2019-08-22 martijn message->parsing_headers = 1;
302 6840f1a1 2019-08-22 martijn message->body_whitelines = 0;
303 6840f1a1 2019-08-22 martijn message->headers = calloc(1, sizeof(*(message->headers)));
304 d581ea1c 2025-01-29 kirill if (message->headers == NULL)
305 d581ea1c 2025-01-29 kirill osmtpd_err(1, "%s: calloc", __func__);
306 6840f1a1 2019-08-22 martijn message->lastheader = 0;
307 6840f1a1 2019-08-22 martijn message->signature.signature = NULL;
308 6840f1a1 2019-08-22 martijn message->signature.size = 0;
309 6840f1a1 2019-08-22 martijn message->signature.len = 0;
311 6840f1a1 2019-08-22 martijn if (!dkim_signature_printf(message,
312 40cd76f4 2020-08-30 martijn "DKIM-Signature: v=%s; a=%s-%s; c=%s/%s; s=%s; ", "1",
313 fa10b9e8 2019-04-06 martijn cryptalg, hashalg,
314 06f6b49b 2019-04-06 martijn canonheader == CANON_SIMPLE ? "simple" : "relaxed",
315 40cd76f4 2020-08-30 martijn canonbody == CANON_SIMPLE ? "simple" : "relaxed", selector))
316 41815bcc 2021-05-14 martijn goto fail;
317 6840f1a1 2019-08-22 martijn if (addheaders > 0 && !dkim_signature_printf(message, "z="))
318 41815bcc 2021-05-14 martijn goto fail;
320 d581ea1c 2025-01-29 kirill if ((message->dctx = EVP_MD_CTX_new()) == NULL)
321 d581ea1c 2025-01-29 kirill osmtpd_errx(1, "EVP_MD_CTX_new");
322 d581ea1c 2025-01-29 kirill if (EVP_DigestInit_ex(message->dctx, hash_md, NULL) <= 0)
323 d581ea1c 2025-01-29 kirill osmtpd_errx(1, "EVP_DigestInit_ex");
325 6840f1a1 2019-08-22 martijn return message;
327 500ea6d4 2022-01-27 martijn dkim_message_free(ctx, message);
328 41815bcc 2021-05-14 martijn return NULL;
332 6840f1a1 2019-08-22 martijn dkim_message_free(struct osmtpd_ctx *ctx, void *data)
334 6840f1a1 2019-08-22 martijn struct dkim_message *message = data;
335 48c4bdc1 2019-04-04 martijn size_t i;
337 6840f1a1 2019-08-22 martijn fclose(message->origf);
338 6bcbc798 2021-05-16 martijn EVP_MD_CTX_free(message->dctx);
339 6840f1a1 2019-08-22 martijn free(message->signature.signature);
340 500ea6d4 2022-01-27 martijn for (i = 0; message->headers != NULL &&
341 500ea6d4 2022-01-27 martijn message->headers[i] != NULL; i++)
342 6840f1a1 2019-08-22 martijn free(message->headers[i]);
343 6840f1a1 2019-08-22 martijn free(message->headers);
344 6840f1a1 2019-08-22 martijn free(message);
348 48c4bdc1 2019-04-04 martijn dkim_headers_set(char *headers)
350 48c4bdc1 2019-04-04 martijn size_t i;
351 48c4bdc1 2019-04-04 martijn int has_from = 0;
353 48c4bdc1 2019-04-04 martijn nsign_headers = 1;
355 48c4bdc1 2019-04-04 martijn for (i = 0; headers[i] != '\0'; i++) {
356 48c4bdc1 2019-04-04 martijn /* RFC 5322 field-name */
357 48c4bdc1 2019-04-04 martijn if (!(headers[i] >= 33 && headers[i] <= 126))
358 6840f1a1 2019-08-22 martijn osmtpd_errx(1, "-h: invalid character");
359 48c4bdc1 2019-04-04 martijn if (headers[i] == ':') {
360 48c4bdc1 2019-04-04 martijn /* Test for empty headers */
361 48c4bdc1 2019-04-04 martijn if (i == 0 || headers[i - 1] == ':')
362 6840f1a1 2019-08-22 martijn osmtpd_errx(1, "-h: header can't be empty");
363 48c4bdc1 2019-04-04 martijn nsign_headers++;
365 48c4bdc1 2019-04-04 martijn headers[i] = tolower(headers[i]);
367 48c4bdc1 2019-04-04 martijn if (headers[i - 1] == ':')
368 6840f1a1 2019-08-22 martijn osmtpd_errx(1, "-h: header can't be empty");
370 6840f1a1 2019-08-22 martijn if ((sign_headers = reallocarray(NULL, nsign_headers + 1,
371 6840f1a1 2019-08-22 martijn sizeof(*sign_headers))) == NULL)
372 d581ea1c 2025-01-29 kirill osmtpd_errx(1, "%s: reallocarray", __func__);
374 48c4bdc1 2019-04-04 martijn for (i = 0; i < nsign_headers; i++) {
375 48c4bdc1 2019-04-04 martijn sign_headers[i] = headers;
376 48c4bdc1 2019-04-04 martijn if (i != nsign_headers - 1) {
377 48c4bdc1 2019-04-04 martijn headers = strchr(headers, ':');
378 48c4bdc1 2019-04-04 martijn headers++[0] = '\0';
380 48c4bdc1 2019-04-04 martijn if (strcasecmp(sign_headers[i], "from") == 0)
381 48c4bdc1 2019-04-04 martijn has_from = 1;
383 48c4bdc1 2019-04-04 martijn if (!has_from)
384 6840f1a1 2019-08-22 martijn osmtpd_errx(1, "From header must be included");
388 6840f1a1 2019-08-22 martijn dkim_parse_header(struct dkim_message *message, char *line, int force)
390 48c4bdc1 2019-04-04 martijn size_t i;
391 48c4bdc1 2019-04-04 martijn size_t r, w;
392 48c4bdc1 2019-04-04 martijn size_t linelen;
393 48c4bdc1 2019-04-04 martijn size_t lastheader;
394 06f6b49b 2019-04-06 martijn size_t hlen;
395 b6e37a5e 2019-04-08 martijn int fieldname = 0;
396 48c4bdc1 2019-04-04 martijn char **mtmp;
397 48c4bdc1 2019-04-04 martijn char *htmp;
398 63ac36ce 2019-04-08 martijn char *tmp;
400 c826412d 2019-05-02 martijn if (addheaders == 2 && !force &&
401 6840f1a1 2019-08-22 martijn !dkim_signature_printheader(message, line))
404 6840f1a1 2019-08-22 martijn if ((line[0] == ' ' || line[0] == '\t') && !message->lastheader)
406 48c4bdc1 2019-04-04 martijn if ((line[0] != ' ' && line[0] != '\t')) {
407 6840f1a1 2019-08-22 martijn message->lastheader = 0;
408 48c4bdc1 2019-04-04 martijn for (i = 0; i < nsign_headers; i++) {
409 06f6b49b 2019-04-06 martijn hlen = strlen(sign_headers[i]);
410 06f6b49b 2019-04-06 martijn if (strncasecmp(line, sign_headers[i], hlen) == 0) {
411 06f6b49b 2019-04-06 martijn while (line[hlen] == ' ' || line[hlen] == '\t')
413 06f6b49b 2019-04-06 martijn if (line[hlen] != ':')
414 06f6b49b 2019-04-06 martijn continue;
418 06f6b49b 2019-04-06 martijn if (i == nsign_headers && !force)
422 c826412d 2019-05-02 martijn if (addheaders == 1 && !force &&
423 6840f1a1 2019-08-22 martijn !dkim_signature_printheader(message, line))
426 48c4bdc1 2019-04-04 martijn if (canonheader == CANON_RELAXED) {
427 6840f1a1 2019-08-22 martijn if (!message->lastheader)
428 b6e37a5e 2019-04-08 martijn fieldname = 1;
429 48c4bdc1 2019-04-04 martijn for (r = w = 0; line[r] != '\0'; r++) {
430 5d06ccad 2019-04-08 martijn if (line[r] == ':' && fieldname) {
431 cd6f9b03 2019-10-23 martijn if (w > 0 && line[w - 1] == ' ')
432 48c4bdc1 2019-04-04 martijn line[w - 1] = ':';
434 48c4bdc1 2019-04-04 martijn line[w++] = ':';
435 48c4bdc1 2019-04-04 martijn fieldname = 0;
436 48c4bdc1 2019-04-04 martijn while (line[r + 1] == ' ' ||
437 48c4bdc1 2019-04-04 martijn line[r + 1] == '\t')
439 48c4bdc1 2019-04-04 martijn continue;
441 06f6b49b 2019-04-06 martijn if (line[r] == ' ' || line[r] == '\t' ||
442 06f6b49b 2019-04-06 martijn line[r] == '\r' || line[r] == '\n') {
443 cd6f9b03 2019-10-23 martijn if (r != 0 && w != 0 && line[w - 1] == ' ')
444 48c4bdc1 2019-04-04 martijn continue;
446 48c4bdc1 2019-04-04 martijn line[w++] = ' ';
447 48c4bdc1 2019-04-04 martijn } else if (fieldname) {
448 48c4bdc1 2019-04-04 martijn line[w++] = tolower(line[r]);
449 48c4bdc1 2019-04-04 martijn continue;
451 48c4bdc1 2019-04-04 martijn line[w++] = line[r];
453 cd6f9b03 2019-10-23 martijn linelen = (w != 0 && line[w - 1] == ' ') ? w - 1 : w;
454 48c4bdc1 2019-04-04 martijn line[linelen] = '\0';
456 48c4bdc1 2019-04-04 martijn linelen = strlen(line);
458 6840f1a1 2019-08-22 martijn for (lastheader = 0; message->headers[lastheader] != NULL; lastheader++)
459 48c4bdc1 2019-04-04 martijn continue;
460 6840f1a1 2019-08-22 martijn if (!message->lastheader) {
461 6840f1a1 2019-08-22 martijn mtmp = recallocarray(message->headers, lastheader + 1,
462 a53d74c4 2019-04-08 martijn lastheader + 2, sizeof(*mtmp));
463 d581ea1c 2025-01-29 kirill if (mtmp == NULL)
464 d581ea1c 2025-01-29 kirill osmtpd_err(1, "%s: reallocarray", __func__);
465 6840f1a1 2019-08-22 martijn message->headers = mtmp;
467 d581ea1c 2025-01-29 kirill if ((message->headers[lastheader] = strdup(line)) == NULL)
468 d581ea1c 2025-01-29 kirill osmtpd_err(1, "%s: strdup", __func__);
469 6840f1a1 2019-08-22 martijn message->headers[lastheader + 1 ] = NULL;
470 6840f1a1 2019-08-22 martijn message->lastheader = 1;
471 48c4bdc1 2019-04-04 martijn } else {
472 48c4bdc1 2019-04-04 martijn lastheader--;
473 6840f1a1 2019-08-22 martijn linelen += strlen(message->headers[lastheader]);
474 48c4bdc1 2019-04-04 martijn if (canonheader == CANON_SIMPLE)
475 48c4bdc1 2019-04-04 martijn linelen += 2;
476 48c4bdc1 2019-04-04 martijn linelen++;
477 6840f1a1 2019-08-22 martijn htmp = reallocarray(message->headers[lastheader], linelen,
478 48c4bdc1 2019-04-04 martijn sizeof(*htmp));
479 d581ea1c 2025-01-29 kirill if (htmp == NULL)
480 d581ea1c 2025-01-29 kirill osmtpd_err(1, "%s: reallocarray", __func__);
481 6840f1a1 2019-08-22 martijn message->headers[lastheader] = htmp;
482 48c4bdc1 2019-04-04 martijn if (canonheader == CANON_SIMPLE) {
483 48c4bdc1 2019-04-04 martijn if (strlcat(htmp, "\r\n", linelen) >= linelen)
484 d581ea1c 2025-01-29 kirill osmtpd_warnx(NULL, "Missized header");
485 63ac36ce 2019-04-08 martijn } else if (canonheader == CANON_RELAXED &&
486 6840f1a1 2019-08-22 martijn (tmp = strchr(message->headers[lastheader], ':')) != NULL &&
487 63ac36ce 2019-04-08 martijn tmp[1] == '\0')
490 48c4bdc1 2019-04-04 martijn if (strlcat(htmp, line, linelen) >= linelen)
491 d581ea1c 2025-01-29 kirill osmtpd_warnx(NULL, "Missized header");
496 6840f1a1 2019-08-22 martijn dkim_parse_body(struct dkim_message *message, char *line)
498 48c4bdc1 2019-04-04 martijn size_t r, w;
499 48c4bdc1 2019-04-04 martijn size_t linelen;
501 1308710c 2019-04-09 martijn if (canonbody == CANON_RELAXED) {
502 1308710c 2019-04-09 martijn for (r = w = 0; line[r] != '\0'; r++) {
503 1308710c 2019-04-09 martijn if (line[r] == ' ' || line[r] == '\t') {
504 1308710c 2019-04-09 martijn if (r != 0 && line[w - 1] == ' ')
505 1308710c 2019-04-09 martijn continue;
507 1308710c 2019-04-09 martijn line[w++] = ' ';
509 1308710c 2019-04-09 martijn line[w++] = line[r];
511 cd6f9b03 2019-10-23 martijn linelen = (w != 0 && line[w - 1] == ' ') ? w - 1 : w;
512 1308710c 2019-04-09 martijn line[linelen] = '\0';
514 1308710c 2019-04-09 martijn linelen = strlen(line);
516 48c4bdc1 2019-04-04 martijn if (line[0] == '\0') {
517 6840f1a1 2019-08-22 martijn message->body_whitelines++;
521 6840f1a1 2019-08-22 martijn while (message->body_whitelines--) {
522 d581ea1c 2025-01-29 kirill if (EVP_DigestUpdate(message->dctx, "\r\n", 2) == 0)
523 d581ea1c 2025-01-29 kirill osmtpd_errx(1, "EVP_DigestUpdate");
525 6840f1a1 2019-08-22 martijn message->body_whitelines = 0;
526 6840f1a1 2019-08-22 martijn message->has_body = 1;
528 6bcbc798 2021-05-16 martijn if (EVP_DigestUpdate(message->dctx, line, linelen) == 0 ||
529 d581ea1c 2025-01-29 kirill EVP_DigestUpdate(message->dctx, "\r\n", 2) == 0)
530 d581ea1c 2025-01-29 kirill osmtpd_errx(1, "EVP_DigestUpdate");
534 6840f1a1 2019-08-22 martijn dkim_sign(struct osmtpd_ctx *ctx)
536 6840f1a1 2019-08-22 martijn struct dkim_message *message = ctx->local_message;
537 365862b1 2019-05-02 martijn /* Use largest hash size here */
538 8e76d341 2021-06-02 martijn unsigned char bdigest[EVP_MAX_MD_SIZE];
539 8e76d341 2021-06-02 martijn unsigned char digest[(((sizeof(bdigest) + 2) / 3) * 4) + 1];
540 8e76d341 2021-06-02 martijn unsigned char *b;
541 40cd76f4 2020-08-30 martijn const char *sdomain = domain[0], *tsdomain;
542 e974922c 2019-05-02 martijn time_t now;
543 6840f1a1 2019-08-22 martijn ssize_t i;
544 6bcbc798 2021-05-16 martijn size_t linelen = 0;
545 365862b1 2019-05-02 martijn char *tmp, *tmp2;
546 8e76d341 2021-06-02 martijn unsigned int digestsz;
548 e974922c 2019-05-02 martijn if (addtime || addexpire)
549 e974922c 2019-05-02 martijn now = time(NULL);
550 a70fd4b2 2021-05-11 martijn if (addtime && !dkim_signature_printf(message, "t=%lld; ",
551 a70fd4b2 2021-05-11 martijn (long long)now))
552 2c88ced1 2021-05-16 martijn goto fail;
553 6840f1a1 2019-08-22 martijn if (addexpire != 0 && !dkim_signature_printf(message, "x=%lld; ",
554 e974922c 2019-05-02 martijn now + addexpire < now ? INT64_MAX : now + addexpire))
555 2c88ced1 2021-05-16 martijn goto fail;
557 6840f1a1 2019-08-22 martijn if (canonbody == CANON_SIMPLE && !message->has_body) {
558 d581ea1c 2025-01-29 kirill if (EVP_DigestUpdate(message->dctx, "\r\n", 2) <= 0)
559 d581ea1c 2025-01-29 kirill osmtpd_errx(1, "EVP_DigestUpdate");
561 d581ea1c 2025-01-29 kirill if (EVP_DigestFinal_ex(message->dctx, bdigest, &digestsz) == 0)
562 d581ea1c 2025-01-29 kirill osmtpd_errx(1, "EVP_DigestFinal_ex");
563 6bcbc798 2021-05-16 martijn EVP_EncodeBlock(digest, bdigest, digestsz);
564 6bcbc798 2021-05-16 martijn if (!dkim_signature_printf(message, "bh=%s; h=", digest))
565 2c88ced1 2021-05-16 martijn goto fail;
566 365862b1 2019-05-02 martijn /* Reverse order for ease of use of RFC6367 section 5.4.2 */
567 6840f1a1 2019-08-22 martijn for (i = 0; message->headers[i] != NULL; i++)
568 365862b1 2019-05-02 martijn continue;
569 6bcbc798 2021-05-16 martijn EVP_MD_CTX_reset(message->dctx);
570 6bcbc798 2021-05-16 martijn if (!sephash) {
571 6bcbc798 2021-05-16 martijn if (EVP_DigestSignInit(message->dctx, NULL, hash_md, NULL,
572 d581ea1c 2025-01-29 kirill pkey) != 1)
573 d581ea1c 2025-01-29 kirill osmtpd_errx(1, "EVP_DigestSignInit");
574 6bcbc798 2021-05-16 martijn } else {
575 d581ea1c 2025-01-29 kirill if (EVP_DigestInit_ex(message->dctx, hash_md, NULL) != 1)
576 d581ea1c 2025-01-29 kirill osmtpd_errx(1, "EVP_DigestInit_ex");
578 365862b1 2019-05-02 martijn for (i--; i >= 0; i--) {
579 6bcbc798 2021-05-16 martijn if (!sephash) {
580 6bcbc798 2021-05-16 martijn if (EVP_DigestSignUpdate(message->dctx,
581 6bcbc798 2021-05-16 martijn message->headers[i],
582 6bcbc798 2021-05-16 martijn strlen(message->headers[i])) != 1 ||
583 6bcbc798 2021-05-16 martijn EVP_DigestSignUpdate(message->dctx, "\r\n",
585 d581ea1c 2025-01-29 kirill osmtpd_errx(1, "EVP_DigestSignUpdate");
586 6bcbc798 2021-05-16 martijn } else {
587 6bcbc798 2021-05-16 martijn if (EVP_DigestUpdate(message->dctx, message->headers[i],
588 6bcbc798 2021-05-16 martijn strlen(message->headers[i])) != 1 ||
589 d581ea1c 2025-01-29 kirill EVP_DigestUpdate(message->dctx, "\r\n", 2) <= 0)
590 d581ea1c 2025-01-29 kirill osmtpd_errx(1, "EVP_DigestSignUpdate");
592 40cd76f4 2020-08-30 martijn if ((tsdomain = dkim_domain_select(message, message->headers[i])) != NULL)
593 40cd76f4 2020-08-30 martijn sdomain = tsdomain;
594 365862b1 2019-05-02 martijn /* We're done with the cached header after hashing */
595 6840f1a1 2019-08-22 martijn for (tmp = message->headers[i]; tmp[0] != ':'; tmp++) {
596 365862b1 2019-05-02 martijn if (tmp[0] == ' ' || tmp[0] == '\t')
598 365862b1 2019-05-02 martijn tmp[0] = tolower(tmp[0]);
600 365862b1 2019-05-02 martijn tmp[0] = '\0';
601 6840f1a1 2019-08-22 martijn if (!dkim_signature_printf(message, "%s%s",
602 6840f1a1 2019-08-22 martijn message->headers[i + 1] == NULL ? "" : ":",
603 6840f1a1 2019-08-22 martijn message->headers[i]))
604 2c88ced1 2021-05-16 martijn goto fail;
606 40cd76f4 2020-08-30 martijn dkim_signature_printf(message, "; d=%s; b=", sdomain);
607 6840f1a1 2019-08-22 martijn if (!dkim_signature_normalize(message))
608 2c88ced1 2021-05-16 martijn goto fail;
609 d581ea1c 2025-01-29 kirill if ((tmp = strdup(message->signature.signature)) == NULL)
610 d581ea1c 2025-01-29 kirill osmtpd_err(1, "%s: strdup", __func__);
611 6840f1a1 2019-08-22 martijn dkim_parse_header(message, tmp, 1);
612 6bcbc798 2021-05-16 martijn if (!sephash) {
613 6bcbc798 2021-05-16 martijn if (EVP_DigestSignUpdate(message->dctx, tmp,
614 d581ea1c 2025-01-29 kirill strlen(tmp)) != 1)
615 d581ea1c 2025-01-29 kirill osmtpd_errx(1, "EVP_DigestSignUpdate");
616 6bcbc798 2021-05-16 martijn } else {
617 d581ea1c 2025-01-29 kirill if (EVP_DigestUpdate(message->dctx, tmp, strlen(tmp)) != 1)
618 d581ea1c 2025-01-29 kirill osmtpd_errx(1, "EVP_DigestUpdate");
620 365862b1 2019-05-02 martijn free(tmp);
621 6bcbc798 2021-05-16 martijn if (!sephash) {
622 d581ea1c 2025-01-29 kirill if (EVP_DigestSignFinal(message->dctx, NULL, &linelen) != 1)
623 d581ea1c 2025-01-29 kirill osmtpd_errx(1, "EVP_DigestSignFinal");
624 33a7c297 2022-12-16 martijn #ifdef HAVE_ED25519
625 6bcbc798 2021-05-16 martijn } else {
626 6bcbc798 2021-05-16 martijn if (EVP_DigestFinal_ex(message->dctx, bdigest,
627 d581ea1c 2025-01-29 kirill &digestsz) != 1)
628 d581ea1c 2025-01-29 kirill osmtpd_errx(1, "EVP_DigestFinal_ex");
629 6bcbc798 2021-05-16 martijn EVP_MD_CTX_reset(message->dctx);
630 6bcbc798 2021-05-16 martijn if (EVP_DigestSignInit(message->dctx, NULL, NULL, NULL,
631 d581ea1c 2025-01-29 kirill pkey) != 1)
632 d581ea1c 2025-01-29 kirill osmtpd_errx(1, "EVP_DigestSignInit");
633 6bcbc798 2021-05-16 martijn if (EVP_DigestSign(message->dctx, NULL, &linelen, bdigest,
634 d581ea1c 2025-01-29 kirill digestsz) != 1)
635 d581ea1c 2025-01-29 kirill osmtpd_errx(1, "EVP_DigestSign");
638 d581ea1c 2025-01-29 kirill if ((tmp = malloc(linelen)) == NULL)
639 d581ea1c 2025-01-29 kirill osmtpd_err(1, "%s: malloc", __func__);
640 6bcbc798 2021-05-16 martijn if (!sephash) {
641 d581ea1c 2025-01-29 kirill if (EVP_DigestSignFinal(message->dctx, tmp, &linelen) != 1)
642 d581ea1c 2025-01-29 kirill osmtpd_errx(1, "EVP_DigestSignFinal");
643 33a7c297 2022-12-16 martijn #ifdef HAVE_ED25519
644 6bcbc798 2021-05-16 martijn } else {
645 6bcbc798 2021-05-16 martijn if (EVP_DigestSign(message->dctx, tmp, &linelen, bdigest,
646 d581ea1c 2025-01-29 kirill digestsz) != 1)
647 d581ea1c 2025-01-29 kirill osmtpd_errx(1, "EVP_DigestSign");
650 d581ea1c 2025-01-29 kirill if ((b = malloc((((linelen + 2) / 3) * 4) + 1)) == NULL)
651 d581ea1c 2025-01-29 kirill osmtpd_err(1, "%s: malloc", __func__);
652 365862b1 2019-05-02 martijn EVP_EncodeBlock(b, tmp, linelen);
653 365862b1 2019-05-02 martijn free(tmp);
654 6840f1a1 2019-08-22 martijn dkim_signature_printf(message, "%s\r\n", b);
655 365862b1 2019-05-02 martijn free(b);
656 6840f1a1 2019-08-22 martijn dkim_signature_normalize(message);
657 6840f1a1 2019-08-22 martijn tmp = message->signature.signature;
658 365862b1 2019-05-02 martijn while ((tmp2 = strchr(tmp, '\r')) != NULL) {
659 365862b1 2019-05-02 martijn tmp2[0] = '\0';
660 6840f1a1 2019-08-22 martijn osmtpd_filter_dataline(ctx, "%s", tmp);
661 365862b1 2019-05-02 martijn tmp = tmp2 + 2;
663 365862b1 2019-05-02 martijn tmp = NULL;
664 365862b1 2019-05-02 martijn linelen = 0;
665 6840f1a1 2019-08-22 martijn rewind(message->origf);
666 6840f1a1 2019-08-22 martijn while ((i = getline(&tmp, &linelen, message->origf)) != -1) {
667 365862b1 2019-05-02 martijn tmp[i - 1] = '\0';
668 6840f1a1 2019-08-22 martijn osmtpd_filter_dataline(ctx, "%s", tmp);
670 be6d950d 2021-03-21 martijn free(tmp);
673 2c88ced1 2021-05-16 martijn osmtpd_filter_dataline(ctx, ".");
677 6840f1a1 2019-08-22 martijn dkim_signature_normalize(struct dkim_message *message)
679 06f6b49b 2019-04-06 martijn size_t i;
680 06f6b49b 2019-04-06 martijn size_t linelen;
681 06f6b49b 2019-04-06 martijn size_t checkpoint;
682 06f6b49b 2019-04-06 martijn size_t skip;
683 6840f1a1 2019-08-22 martijn size_t *headerlen = &(message->signature.len);
684 06f6b49b 2019-04-06 martijn int headername = 1;
685 06f6b49b 2019-04-06 martijn char tag = '\0';
686 6840f1a1 2019-08-22 martijn char *sig = message->signature.signature;
688 06f6b49b 2019-04-06 martijn for (linelen = i = 0; sig[i] != '\0'; i++) {
689 ffa37923 2019-04-09 martijn if (sig[i] == '\r' && sig[i + 1] == '\n') {
691 06f6b49b 2019-04-06 martijn checkpoint = 0;
692 06f6b49b 2019-04-06 martijn linelen = 0;
693 06f6b49b 2019-04-06 martijn continue;
695 06f6b49b 2019-04-06 martijn if (sig[i] == '\t')
696 06f6b49b 2019-04-06 martijn linelen = (linelen + 8) & ~7;
698 06f6b49b 2019-04-06 martijn linelen++;
699 06f6b49b 2019-04-06 martijn if (headername) {
700 06f6b49b 2019-04-06 martijn if (sig[i] == ':') {
701 06f6b49b 2019-04-06 martijn headername = 0;
702 06f6b49b 2019-04-06 martijn checkpoint = i;
704 06f6b49b 2019-04-06 martijn continue;
706 ffa37923 2019-04-09 martijn if (linelen > DKIM_SIGNATURE_LINELEN && checkpoint != 0) {
707 06f6b49b 2019-04-06 martijn for (skip = checkpoint + 1;
708 06f6b49b 2019-04-06 martijn sig[skip] == ' ' || sig[skip] == '\t';
710 06f6b49b 2019-04-06 martijn continue;
711 06f6b49b 2019-04-06 martijn skip -= checkpoint + 1;
712 6840f1a1 2019-08-22 martijn if (!dkim_signature_need(message,
713 226e5da8 2019-04-08 martijn skip > 3 ? 0 : 3 - skip + 1))
714 06f6b49b 2019-04-06 martijn return 0;
715 6840f1a1 2019-08-22 martijn sig = message->signature.signature;
717 06f6b49b 2019-04-06 martijn memmove(sig + checkpoint + 3,
718 06f6b49b 2019-04-06 martijn sig + checkpoint + skip,
719 540f552a 2019-04-06 martijn *headerlen - skip - checkpoint + 1);
720 06f6b49b 2019-04-06 martijn sig[checkpoint + 1] = '\r';
721 06f6b49b 2019-04-06 martijn sig[checkpoint + 2] = '\n';
722 06f6b49b 2019-04-06 martijn sig[checkpoint + 3] = '\t';
723 06f6b49b 2019-04-06 martijn linelen = 8;
724 06f6b49b 2019-04-06 martijn *headerlen = *headerlen + 3 - skip;
725 06f6b49b 2019-04-06 martijn i = checkpoint + 3;
726 06f6b49b 2019-04-06 martijn checkpoint = 0;
728 06f6b49b 2019-04-06 martijn if (sig[i] == ';') {
729 06f6b49b 2019-04-06 martijn checkpoint = i;
730 06f6b49b 2019-04-06 martijn tag = '\0';
731 06f6b49b 2019-04-06 martijn continue;
733 06f6b49b 2019-04-06 martijn switch (tag) {
734 06f6b49b 2019-04-06 martijn case 'B':
735 06f6b49b 2019-04-06 martijn case 'b':
736 c826412d 2019-05-02 martijn case 'z':
737 06f6b49b 2019-04-06 martijn checkpoint = i;
739 06f6b49b 2019-04-06 martijn case 'h':
740 06f6b49b 2019-04-06 martijn if (sig[i] == ':')
741 06f6b49b 2019-04-06 martijn checkpoint = i;
744 06f6b49b 2019-04-06 martijn if (tag == '\0' && sig[i] != ' ' && sig[i] != '\t') {
745 06f6b49b 2019-04-06 martijn if ((tag = sig[i]) == 'b' && sig[i + 1] == 'h' &&
746 06f6b49b 2019-04-06 martijn sig[i + 2] == '=') {
747 06f6b49b 2019-04-06 martijn tag = 'B';
748 06f6b49b 2019-04-06 martijn linelen += 2;
751 06f6b49b 2019-04-06 martijn tag = sig[i];
754 06f6b49b 2019-04-06 martijn return 1;
758 c08ad6cc 2025-02-08 martijn dkim_signature_printheader(struct dkim_message *message, const char *line)
760 c826412d 2019-05-02 martijn size_t i, j, len;
762 970842fd 2025-02-08 martijn char *fmtheader;
763 c826412d 2019-05-02 martijn int first;
765 c08ad6cc 2025-02-08 martijn len = strlen(line);
766 970842fd 2025-02-08 martijn if ((fmtheader = reallocarray(NULL, 3, len + 3)) == NULL)
767 970842fd 2025-02-08 martijn osmtpd_err(1, "malloc");
769 6840f1a1 2019-08-22 martijn first = message->signature.signature[message->signature.len - 1] == '=';
770 c08ad6cc 2025-02-08 martijn for (j = i = 0; line[i] != '\0'; i++, j++) {
771 c08ad6cc 2025-02-08 martijn if (i == 0 && line[i] != ' ' && line[i] != '\t' && !first)
772 c826412d 2019-05-02 martijn fmtheader[j++] = '|';
773 c08ad6cc 2025-02-08 martijn if ((line[i] >= 0x21 && line[i] <= 0x3A) ||
774 c08ad6cc 2025-02-08 martijn (line[i] == 0x3C) ||
775 c08ad6cc 2025-02-08 martijn (line[i] >= 0x3E && line[i] <= 0x7B) ||
776 c08ad6cc 2025-02-08 martijn (line[i] >= 0x7D && line[i] <= 0x7E))
777 c08ad6cc 2025-02-08 martijn fmtheader[j] = line[i];
779 c826412d 2019-05-02 martijn fmtheader[j++] = '=';
780 c08ad6cc 2025-02-08 martijn (void) sprintf(fmtheader + j, "%02hhX", line[i]);
784 c826412d 2019-05-02 martijn (void) sprintf(fmtheader + j, "=%02hhX=%02hhX", (unsigned char) '\r',
785 c826412d 2019-05-02 martijn (unsigned char) '\n');
787 970842fd 2025-02-08 martijn r = dkim_signature_printf(message, "%s", fmtheader);
788 970842fd 2025-02-08 martijn free(fmtheader);
789 970842fd 2025-02-08 martijn return r;
793 6840f1a1 2019-08-22 martijn dkim_signature_printf(struct dkim_message *message, char *fmt, ...)
795 6840f1a1 2019-08-22 martijn struct dkim_signature *sig = &(message->signature);
796 06f6b49b 2019-04-06 martijn va_list ap;
797 06f6b49b 2019-04-06 martijn size_t len;
799 06f6b49b 2019-04-06 martijn va_start(ap, fmt);
800 06f6b49b 2019-04-06 martijn if ((len = vsnprintf(sig->signature + sig->len, sig->size - sig->len,
801 06f6b49b 2019-04-06 martijn fmt, ap)) >= sig->size - sig->len) {
802 06f6b49b 2019-04-06 martijn va_end(ap);
803 6840f1a1 2019-08-22 martijn if (!dkim_signature_need(message, len + 1))
804 06f6b49b 2019-04-06 martijn return 0;
805 06f6b49b 2019-04-06 martijn va_start(ap, fmt);
806 6840f1a1 2019-08-22 martijn if ((len = vsnprintf(sig->signature + sig->len,
807 6840f1a1 2019-08-22 martijn sig->size - sig->len, fmt, ap)) >= sig->size - sig->len)
808 6840f1a1 2019-08-22 martijn osmtpd_errx(1, "Miscalculated header size");
810 06f6b49b 2019-04-06 martijn sig->len += len;
811 06f6b49b 2019-04-06 martijn va_end(ap);
812 06f6b49b 2019-04-06 martijn return 1;
815 40cd76f4 2020-08-30 martijn const char *
816 40cd76f4 2020-08-30 martijn dkim_domain_select(struct dkim_message *message, char *from)
818 40cd76f4 2020-08-30 martijn char *mdomain0, *mdomain;
819 40cd76f4 2020-08-30 martijn size_t i;
821 d581ea1c 2025-01-29 kirill if ((mdomain = mdomain0 = osmtpd_mheader_from_domain(from)) == NULL)
822 40cd76f4 2020-08-30 martijn return NULL;
824 40cd76f4 2020-08-30 martijn while (mdomain != NULL && mdomain[0] != '\0') {
825 40cd76f4 2020-08-30 martijn for (i = 0; i < ndomains; i++) {
826 40cd76f4 2020-08-30 martijn if (strcasecmp(mdomain, domain[i]) == 0) {
827 40cd76f4 2020-08-30 martijn free(mdomain0);
828 40cd76f4 2020-08-30 martijn return domain[i];
831 40cd76f4 2020-08-30 martijn if ((mdomain = strchr(mdomain, '.')) != NULL)
832 40cd76f4 2020-08-30 martijn mdomain++;
834 40cd76f4 2020-08-30 martijn free(mdomain0);
835 40cd76f4 2020-08-30 martijn return NULL;
839 6840f1a1 2019-08-22 martijn dkim_signature_need(struct dkim_message *message, size_t len)
841 6840f1a1 2019-08-22 martijn struct dkim_signature *sig = &(message->signature);
842 06f6b49b 2019-04-06 martijn char *tmp;
844 a27b5ff7 2019-04-08 martijn if (sig->len + len < sig->size)
845 06f6b49b 2019-04-06 martijn return 1;
846 503597cc 2019-04-08 martijn sig->size = (((len + sig->len) / 512) + 1) * 512;
847 d581ea1c 2025-01-29 kirill if ((tmp = realloc(sig->signature, sig->size)) == NULL)
848 d581ea1c 2025-01-29 kirill osmtpd_err(1, "%s: malloc", __func__);
849 06f6b49b 2019-04-06 martijn sig->signature = tmp;
850 06f6b49b 2019-04-06 martijn return 1;
853 48c4bdc1 2019-04-04 martijn __dead void
854 48c4bdc1 2019-04-04 martijn usage(void)
856 fe371fc9 2019-09-05 martijn fprintf(stderr, "usage: filter-dkimsign [-tz] [-a signalg] "
857 fe371fc9 2019-09-05 martijn "[-c canonicalization] \n [-h headerfields]"
858 5fdffb49 2022-01-27 martijn "[-x seconds] -D file -d domain -k keyfile -s selector\n");
859 48c4bdc1 2019-04-04 martijn exit(1);
