Annotation of src/usr.bin/signify/signify.c, Revision 1.115
1.115 ! tedu 1: /* $OpenBSD: signify.c,v 1.114 2016/09/02 21:18:50 tedu Exp $ */
1.1 tedu 2: /*
3: * Copyright (c) 2013 Ted Unangst <tedu@openbsd.org>
4: *
5: * Permission to use, copy, modify, and distribute this software for any
6: * purpose with or without fee is hereby granted, provided that the above
7: * copyright notice and this permission notice appear in all copies.
8: *
9: * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10: * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11: * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12: * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13: * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14: * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15: * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16: */
17: #include <sys/stat.h>
18:
19: #include <netinet/in.h>
20: #include <resolv.h>
21:
1.98 tedu 22: #include <limits.h>
1.1 tedu 23: #include <stdint.h>
24: #include <fcntl.h>
25: #include <string.h>
26: #include <stdio.h>
1.34 tedu 27: #include <stdlib.h>
1.96 tedu 28: #include <stddef.h>
29: #include <ohash.h>
1.1 tedu 30: #include <err.h>
31: #include <unistd.h>
32: #include <readpassphrase.h>
33: #include <util.h>
34: #include <sha2.h>
35:
36: #include "crypto_api.h"
1.111 espie 37: #include "signify.h"
1.1 tedu 38:
39: #define SIGBYTES crypto_sign_ed25519_BYTES
40: #define SECRETBYTES crypto_sign_ed25519_SECRETKEYBYTES
41: #define PUBLICBYTES crypto_sign_ed25519_PUBLICKEYBYTES
42:
43: #define PKALG "Ed"
44: #define KDFALG "BK"
1.94 tedu 45: #define KEYNUMLEN 8
1.13 tedu 46:
1.18 tedu 47: #define COMMENTHDR "untrusted comment: "
48: #define COMMENTHDRLEN 19
49: #define COMMENTMAXLEN 1024
1.51 tedu 50: #define VERIFYWITH "verify with "
1.1 tedu 51:
52: struct enckey {
53: uint8_t pkalg[2];
54: uint8_t kdfalg[2];
55: uint32_t kdfrounds;
56: uint8_t salt[16];
57: uint8_t checksum[8];
1.94 tedu 58: uint8_t keynum[KEYNUMLEN];
1.1 tedu 59: uint8_t seckey[SECRETBYTES];
60: };
61:
62: struct pubkey {
63: uint8_t pkalg[2];
1.94 tedu 64: uint8_t keynum[KEYNUMLEN];
1.1 tedu 65: uint8_t pubkey[PUBLICBYTES];
66: };
67:
68: struct sig {
69: uint8_t pkalg[2];
1.94 tedu 70: uint8_t keynum[KEYNUMLEN];
1.1 tedu 71: uint8_t sig[SIGBYTES];
72: };
73:
1.103 tedu 74: static void __dead
1.31 tedu 75: usage(const char *error)
1.1 tedu 76: {
1.31 tedu 77: if (error)
78: fprintf(stderr, "%s\n", error);
1.9 espie 79: fprintf(stderr, "usage:"
1.15 espie 80: #ifndef VERIFYONLY
1.47 naddy 81: "\t%1$s -C [-q] -p pubkey -x sigfile [file ...]\n"
1.31 tedu 82: "\t%1$s -G [-n] [-c comment] -p pubkey -s seckey\n"
1.111 espie 83: "\t%1$s -S [-ez] [-x sigfile] -s seckey -m message\n"
1.15 espie 84: #endif
1.112 espie 85: "\t%1$s -V [-eqz] [-p pubkey] [-t keytype] [-x sigfile] -m message\n",
1.106 tedu 86: getprogname());
1.1 tedu 87: exit(1);
88: }
89:
1.111 espie 90: int
1.61 deraadt 91: xopen(const char *fname, int oflags, mode_t mode)
1.1 tedu 92: {
1.53 tedu 93: struct stat sb;
1.1 tedu 94: int fd;
95:
1.31 tedu 96: if (strcmp(fname, "-") == 0) {
1.61 deraadt 97: if ((oflags & O_WRONLY))
1.31 tedu 98: fd = dup(STDOUT_FILENO);
99: else
100: fd = dup(STDIN_FILENO);
101: if (fd == -1)
102: err(1, "dup failed");
103: } else {
1.61 deraadt 104: fd = open(fname, oflags, mode);
1.31 tedu 105: if (fd == -1)
106: err(1, "can't open %s for %s", fname,
1.61 deraadt 107: (oflags & O_WRONLY) ? "writing" : "reading");
1.31 tedu 108: }
1.53 tedu 109: if (fstat(fd, &sb) == -1 || S_ISDIR(sb.st_mode))
1.66 tedu 110: errx(1, "not a valid file: %s", fname);
1.1 tedu 111: return fd;
112: }
113:
1.111 espie 114: void *
1.1 tedu 115: xmalloc(size_t len)
116: {
117: void *p;
118:
1.89 tedu 119: if (!(p = malloc(len)))
1.1 tedu 120: err(1, "malloc %zu", len);
121: return p;
122: }
123:
1.16 tedu 124: static size_t
1.46 tedu 125: parseb64file(const char *filename, char *b64, void *buf, size_t buflen,
1.18 tedu 126: char *comment)
1.16 tedu 127: {
128: char *commentend, *b64end;
129:
130: commentend = strchr(b64, '\n');
131: if (!commentend || commentend - b64 <= COMMENTHDRLEN ||
1.65 tedu 132: memcmp(b64, COMMENTHDR, COMMENTHDRLEN) != 0)
1.16 tedu 133: errx(1, "invalid comment in %s; must start with '%s'",
134: filename, COMMENTHDR);
1.75 tedu 135: *commentend = '\0';
1.40 deraadt 136: if (comment) {
137: if (strlcpy(comment, b64 + COMMENTHDRLEN,
138: COMMENTMAXLEN) >= COMMENTMAXLEN)
1.71 tedu 139: errx(1, "comment too long");
1.40 deraadt 140: }
1.89 tedu 141: if (!(b64end = strchr(commentend + 1, '\n')))
1.82 tedu 142: errx(1, "missing new line after base64 in %s", filename);
1.75 tedu 143: *b64end = '\0';
1.77 tedu 144: if (b64_pton(commentend + 1, buf, buflen) != buflen)
1.82 tedu 145: errx(1, "invalid base64 encoding in %s", filename);
1.65 tedu 146: if (memcmp(buf, PKALG, 2) != 0)
1.16 tedu 147: errx(1, "unsupported file %s", filename);
148: return b64end - b64 + 1;
149: }
150:
1.1 tedu 151: static void
1.46 tedu 152: readb64file(const char *filename, void *buf, size_t buflen, char *comment)
1.1 tedu 153: {
154: char b64[2048];
1.10 tedu 155: int rv, fd;
1.1 tedu 156:
157: fd = xopen(filename, O_RDONLY | O_NOFOLLOW, 0);
1.89 tedu 158: if ((rv = read(fd, b64, sizeof(b64) - 1)) == -1)
1.7 espie 159: err(1, "read from %s", filename);
1.75 tedu 160: b64[rv] = '\0';
1.46 tedu 161: parseb64file(filename, b64, buf, buflen, comment);
1.41 tedu 162: explicit_bzero(b64, sizeof(b64));
1.1 tedu 163: close(fd);
164: }
165:
1.35 tedu 166: static uint8_t *
1.1 tedu 167: readmsg(const char *filename, unsigned long long *msglenp)
168: {
1.49 tedu 169: unsigned long long msglen = 0;
170: uint8_t *msg = NULL;
1.1 tedu 171: struct stat sb;
1.49 tedu 172: ssize_t x, space;
1.1 tedu 173: int fd;
1.73 tedu 174: const unsigned long long maxmsgsize = 1UL << 30;
1.1 tedu 175:
176: fd = xopen(filename, O_RDONLY | O_NOFOLLOW, 0);
1.49 tedu 177: if (fstat(fd, &sb) == 0 && S_ISREG(sb.st_mode)) {
1.73 tedu 178: if (sb.st_size > maxmsgsize)
1.49 tedu 179: errx(1, "msg too large in %s", filename);
180: space = sb.st_size + 1;
181: } else {
1.97 tedu 182: space = 64 * 1024 - 1;
1.49 tedu 183: }
184:
1.67 tedu 185: msg = xmalloc(space + 1);
1.49 tedu 186: while (1) {
187: if (space == 0) {
1.73 tedu 188: if (msglen * 2 > maxmsgsize)
1.67 tedu 189: errx(1, "msg too large in %s", filename);
190: space = msglen;
1.49 tedu 191: if (!(msg = realloc(msg, msglen + space + 1)))
192: errx(1, "realloc");
193: }
194: if ((x = read(fd, msg + msglen, space)) == -1)
195: err(1, "read from %s", filename);
196: if (x == 0)
197: break;
198: space -= x;
199: msglen += x;
200: }
201:
1.75 tedu 202: msg[msglen] = '\0';
1.1 tedu 203: close(fd);
204:
205: *msglenp = msglen;
206: return msg;
207: }
208:
1.111 espie 209: void
1.46 tedu 210: writeall(int fd, const void *buf, size_t buflen, const char *filename)
1.1 tedu 211: {
1.11 tedu 212: ssize_t x;
1.38 espie 213:
1.46 tedu 214: while (buflen != 0) {
1.89 tedu 215: if ((x = write(fd, buf, buflen)) == -1)
1.38 espie 216: err(1, "write to %s", filename);
1.46 tedu 217: buflen -= x;
1.61 deraadt 218: buf = (char *)buf + x;
1.7 espie 219: }
1.1 tedu 220: }
221:
1.17 deraadt 222: #ifndef VERIFYONLY
1.109 tedu 223: static char *
224: createheader(const char *comment, const void *buf, size_t buflen)
225: {
226: char *header;
227: char b64[1024];
228:
229: if (b64_ntop(buf, buflen, b64, sizeof(b64)) == -1)
230: errx(1, "base64 encode failed");
231: if (asprintf(&header, "%s%s\n%s\n", COMMENTHDR, comment, b64) == -1)
232: err(1, "asprintf failed");
233: explicit_bzero(b64, sizeof(b64));
234: return header;
235: }
236:
1.1 tedu 237: static void
1.109 tedu 238: writekeyfile(const char *filename, const char *comment, const void *buf,
239: size_t buflen, int oflags, mode_t mode)
1.1 tedu 240: {
1.109 tedu 241: char *header;
242: int fd;
1.1 tedu 243:
1.61 deraadt 244: fd = xopen(filename, O_CREAT|oflags|O_NOFOLLOW|O_WRONLY, mode);
1.109 tedu 245: header = createheader(comment, buf, buflen);
1.7 espie 246: writeall(fd, header, strlen(header), filename);
1.109 tedu 247: explicit_bzero(header, strlen(header));
248: free(header);
1.1 tedu 249: close(fd);
250: }
251:
252: static void
1.70 tedu 253: kdf(uint8_t *salt, size_t saltlen, int rounds, int allowstdin, int confirm,
1.50 tedu 254: uint8_t *key, size_t keylen)
1.1 tedu 255: {
256: char pass[1024];
1.48 tedu 257: int rppflags = RPP_ECHO_OFF;
1.1 tedu 258:
259: if (rounds == 0) {
260: memset(key, 0, keylen);
261: return;
262: }
263:
1.50 tedu 264: if (allowstdin && !isatty(STDIN_FILENO))
1.48 tedu 265: rppflags |= RPP_STDIN;
266: if (!readpassphrase("passphrase: ", pass, sizeof(pass), rppflags))
1.39 tedu 267: errx(1, "unable to read passphrase");
1.37 tedu 268: if (strlen(pass) == 0)
269: errx(1, "please provide a password");
1.70 tedu 270: if (confirm && !(rppflags & RPP_STDIN)) {
271: char pass2[1024];
272: if (!readpassphrase("confirm passphrase: ", pass2,
273: sizeof(pass2), rppflags))
274: errx(1, "unable to read passphrase");
275: if (strcmp(pass, pass2) != 0)
276: errx(1, "passwords don't match");
277: explicit_bzero(pass2, sizeof(pass2));
278: }
1.1 tedu 279: if (bcrypt_pbkdf(pass, strlen(pass), salt, saltlen, key,
280: keylen, rounds) == -1)
281: errx(1, "bcrypt pbkdf");
1.41 tedu 282: explicit_bzero(pass, sizeof(pass));
1.1 tedu 283: }
284:
285: static void
286: signmsg(uint8_t *seckey, uint8_t *msg, unsigned long long msglen,
287: uint8_t *sig)
288: {
289: unsigned long long siglen;
290: uint8_t *sigbuf;
291:
292: sigbuf = xmalloc(msglen + SIGBYTES);
293: crypto_sign_ed25519(sigbuf, &siglen, msg, msglen, seckey);
294: memcpy(sig, sigbuf, SIGBYTES);
295: free(sigbuf);
296: }
297:
298: static void
1.27 tedu 299: generate(const char *pubkeyfile, const char *seckeyfile, int rounds,
300: const char *comment)
1.1 tedu 301: {
302: uint8_t digest[SHA512_DIGEST_LENGTH];
303: struct pubkey pubkey;
304: struct enckey enckey;
305: uint8_t xorkey[sizeof(enckey.seckey)];
1.94 tedu 306: uint8_t keynum[KEYNUMLEN];
1.27 tedu 307: char commentbuf[COMMENTMAXLEN];
1.1 tedu 308: SHA2_CTX ctx;
1.91 tedu 309: int i, nr;
1.1 tedu 310:
311: crypto_sign_ed25519_keypair(pubkey.pubkey, enckey.seckey);
1.94 tedu 312: arc4random_buf(keynum, sizeof(keynum));
1.1 tedu 313:
314: SHA512Init(&ctx);
315: SHA512Update(&ctx, enckey.seckey, sizeof(enckey.seckey));
316: SHA512Final(digest, &ctx);
317:
318: memcpy(enckey.pkalg, PKALG, 2);
319: memcpy(enckey.kdfalg, KDFALG, 2);
320: enckey.kdfrounds = htonl(rounds);
1.94 tedu 321: memcpy(enckey.keynum, keynum, KEYNUMLEN);
1.1 tedu 322: arc4random_buf(enckey.salt, sizeof(enckey.salt));
1.70 tedu 323: kdf(enckey.salt, sizeof(enckey.salt), rounds, 1, 1, xorkey, sizeof(xorkey));
1.1 tedu 324: memcpy(enckey.checksum, digest, sizeof(enckey.checksum));
325: for (i = 0; i < sizeof(enckey.seckey); i++)
326: enckey.seckey[i] ^= xorkey[i];
1.41 tedu 327: explicit_bzero(digest, sizeof(digest));
328: explicit_bzero(xorkey, sizeof(xorkey));
1.1 tedu 329:
1.91 tedu 330: if ((nr = snprintf(commentbuf, sizeof(commentbuf), "%s secret key",
331: comment)) == -1 || nr >= sizeof(commentbuf))
1.71 tedu 332: errx(1, "comment too long");
1.109 tedu 333: writekeyfile(seckeyfile, commentbuf, &enckey,
334: sizeof(enckey), O_EXCL, 0600);
1.41 tedu 335: explicit_bzero(&enckey, sizeof(enckey));
1.1 tedu 336:
337: memcpy(pubkey.pkalg, PKALG, 2);
1.94 tedu 338: memcpy(pubkey.keynum, keynum, KEYNUMLEN);
1.91 tedu 339: if ((nr = snprintf(commentbuf, sizeof(commentbuf), "%s public key",
340: comment)) == -1 || nr >= sizeof(commentbuf))
1.71 tedu 341: errx(1, "comment too long");
1.109 tedu 342: writekeyfile(pubkeyfile, commentbuf, &pubkey,
343: sizeof(pubkey), O_EXCL, 0666);
1.1 tedu 344: }
345:
1.111 espie 346: uint8_t *
1.110 tedu 347: createsig(const char *seckeyfile, const char *msgfile, uint8_t *msg,
348: unsigned long long msglen)
1.1 tedu 349: {
1.110 tedu 350: struct enckey enckey;
351: uint8_t xorkey[sizeof(enckey.seckey)];
1.1 tedu 352: struct sig sig;
1.109 tedu 353: char *sighdr;
1.110 tedu 354: char *secname;
1.1 tedu 355: uint8_t digest[SHA512_DIGEST_LENGTH];
1.110 tedu 356: int i, nr, rounds;
1.1 tedu 357: SHA2_CTX ctx;
1.110 tedu 358: char comment[COMMENTMAXLEN], sigcomment[COMMENTMAXLEN];
359:
360: readb64file(seckeyfile, &enckey, sizeof(enckey), comment);
1.1 tedu 361:
1.110 tedu 362: secname = strstr(seckeyfile, ".sec");
363: if (secname && strlen(secname) == 4) {
364: if ((nr = snprintf(sigcomment, sizeof(sigcomment), VERIFYWITH "%.*s.pub",
365: (int)strlen(seckeyfile) - 4, seckeyfile)) == -1 || nr >= sizeof(sigcomment))
366: errx(1, "comment too long");
367: } else {
368: if ((nr = snprintf(sigcomment, sizeof(sigcomment), "signature from %s",
369: comment)) == -1 || nr >= sizeof(sigcomment))
370: errx(1, "comment too long");
371: }
372:
373: if (memcmp(enckey.kdfalg, KDFALG, 2) != 0)
1.1 tedu 374: errx(1, "unsupported KDF");
1.110 tedu 375: rounds = ntohl(enckey.kdfrounds);
376: kdf(enckey.salt, sizeof(enckey.salt), rounds, strcmp(msgfile, "-") != 0,
1.70 tedu 377: 0, xorkey, sizeof(xorkey));
1.110 tedu 378: for (i = 0; i < sizeof(enckey.seckey); i++)
379: enckey.seckey[i] ^= xorkey[i];
1.41 tedu 380: explicit_bzero(xorkey, sizeof(xorkey));
1.1 tedu 381: SHA512Init(&ctx);
1.110 tedu 382: SHA512Update(&ctx, enckey.seckey, sizeof(enckey.seckey));
1.1 tedu 383: SHA512Final(digest, &ctx);
1.110 tedu 384: if (memcmp(enckey.checksum, digest, sizeof(enckey.checksum)) != 0)
1.105 tedu 385: errx(1, "incorrect passphrase");
1.41 tedu 386: explicit_bzero(digest, sizeof(digest));
1.1 tedu 387:
1.110 tedu 388: signmsg(enckey.seckey, msg, msglen, sig.sig);
389: memcpy(sig.keynum, enckey.keynum, KEYNUMLEN);
390: explicit_bzero(&enckey, sizeof(enckey));
1.109 tedu 391:
392: memcpy(sig.pkalg, PKALG, 2);
393:
394: sighdr = createheader(sigcomment, &sig, sizeof(sig));
395: return sighdr;
396: }
397:
398: static void
399: sign(const char *seckeyfile, const char *msgfile, const char *sigfile,
400: int embedded)
401: {
402: uint8_t *msg;
403: char *sighdr;
1.110 tedu 404: int fd;
1.109 tedu 405: unsigned long long msglen;
406:
407: msg = readmsg(msgfile, &msglen);
408:
1.110 tedu 409: sighdr = createsig(seckeyfile, msgfile, msg, msglen);
1.109 tedu 410:
411: fd = xopen(sigfile, O_CREAT|O_TRUNC|O_NOFOLLOW|O_WRONLY, 0666);
412: writeall(fd, sighdr, strlen(sighdr), sigfile);
413: free(sighdr);
1.16 tedu 414: if (embedded)
1.109 tedu 415: writeall(fd, msg, msglen, sigfile);
416: close(fd);
1.1 tedu 417:
418: free(msg);
419: }
1.14 tedu 420: #endif
1.1 tedu 421:
422: static void
1.62 tedu 423: verifymsg(struct pubkey *pubkey, uint8_t *msg, unsigned long long msglen,
424: struct sig *sig, int quiet)
1.13 tedu 425: {
426: uint8_t *sigbuf, *dummybuf;
427: unsigned long long siglen, dummylen;
428:
1.94 tedu 429: if (memcmp(pubkey->keynum, sig->keynum, KEYNUMLEN) != 0)
1.62 tedu 430: errx(1, "verification failed: checked against wrong key");
431:
1.13 tedu 432: siglen = SIGBYTES + msglen;
433: sigbuf = xmalloc(siglen);
434: dummybuf = xmalloc(siglen);
1.62 tedu 435: memcpy(sigbuf, sig->sig, SIGBYTES);
1.13 tedu 436: memcpy(sigbuf + SIGBYTES, msg, msglen);
437: if (crypto_sign_ed25519_open(dummybuf, &dummylen, sigbuf, siglen,
1.62 tedu 438: pubkey->pubkey) == -1)
1.13 tedu 439: errx(1, "signature verification failed");
1.42 tedu 440: if (!quiet)
441: printf("Signature Verified\n");
1.13 tedu 442: free(sigbuf);
443: free(dummybuf);
444: }
445:
1.107 espie 446: #ifndef VERIFYONLY
447: static void
448: check_keytype(const char *pubkeyfile, const char *keytype)
449: {
1.108 tedu 450: size_t len;
1.107 espie 451: char *cmp;
1.108 tedu 452: int slen;
453:
454: len = strlen(pubkeyfile);
455: slen = asprintf(&cmp, "-%s.pub", keytype);
1.107 espie 456: if (slen < 0)
457: errx(1, "asprintf error");
458: if (len < slen)
459: errx(1, "too short");
460:
461: if (strcmp(pubkeyfile + len - slen, cmp) != 0)
462: errx(1, "wrong keytype");
463: free(cmp);
464: }
465: #endif
466:
1.64 tedu 467: static void
468: readpubkey(const char *pubkeyfile, struct pubkey *pubkey,
1.107 espie 469: const char *sigcomment, const char *keytype)
1.64 tedu 470: {
1.76 tedu 471: const char *safepath = "/etc/signify/";
1.64 tedu 472:
473: if (!pubkeyfile) {
1.90 tedu 474: pubkeyfile = strstr(sigcomment, VERIFYWITH);
475: if (pubkeyfile) {
1.64 tedu 476: pubkeyfile += strlen(VERIFYWITH);
1.76 tedu 477: if (strncmp(pubkeyfile, safepath, strlen(safepath)) != 0 ||
1.64 tedu 478: strstr(pubkeyfile, "/../") != NULL)
479: errx(1, "untrusted path %s", pubkeyfile);
1.107 espie 480: #ifndef VERIFYONLY
481: if (keytype)
482: check_keytype(pubkeyfile, keytype);
483: #endif
1.64 tedu 484: } else
1.66 tedu 485: usage("must specify pubkey");
1.64 tedu 486: }
487: readb64file(pubkeyfile, pubkey, sizeof(*pubkey), NULL);
488: }
1.13 tedu 489:
490: static void
1.63 tedu 491: verifysimple(const char *pubkeyfile, const char *msgfile, const char *sigfile,
1.107 espie 492: int quiet, const char *keytype)
1.1 tedu 493: {
1.64 tedu 494: char sigcomment[COMMENTMAXLEN];
1.1 tedu 495: struct sig sig;
496: struct pubkey pubkey;
1.63 tedu 497: unsigned long long msglen;
1.1 tedu 498: uint8_t *msg;
1.16 tedu 499:
1.63 tedu 500: msg = readmsg(msgfile, &msglen);
1.1 tedu 501:
1.64 tedu 502: readb64file(sigfile, &sig, sizeof(sig), sigcomment);
1.107 espie 503: readpubkey(pubkeyfile, &pubkey, sigcomment, keytype);
1.63 tedu 504:
505: verifymsg(&pubkey, msg, msglen, &sig, quiet);
506:
507: free(msg);
508: }
509:
510: static uint8_t *
511: verifyembedded(const char *pubkeyfile, const char *sigfile,
1.107 espie 512: int quiet, unsigned long long *msglenp, const char *keytype)
1.63 tedu 513: {
1.64 tedu 514: char sigcomment[COMMENTMAXLEN];
1.63 tedu 515: struct sig sig;
516: struct pubkey pubkey;
517: unsigned long long msglen, siglen;
518: uint8_t *msg;
519:
520: msg = readmsg(sigfile, &msglen);
521:
1.64 tedu 522: siglen = parseb64file(sigfile, msg, &sig, sizeof(sig), sigcomment);
1.107 espie 523: readpubkey(pubkeyfile, &pubkey, sigcomment, keytype);
1.64 tedu 524:
1.63 tedu 525: msglen -= siglen;
526: memmove(msg, msg + siglen, msglen);
527: msg[msglen] = 0;
1.13 tedu 528:
1.62 tedu 529: verifymsg(&pubkey, msg, msglen, &sig, quiet);
1.63 tedu 530:
531: *msglenp = msglen;
532: return msg;
533: }
534:
535: static void
536: verify(const char *pubkeyfile, const char *msgfile, const char *sigfile,
1.107 espie 537: int embedded, int quiet, const char *keytype)
1.63 tedu 538: {
539: unsigned long long msglen;
540: uint8_t *msg;
541: int fd;
542:
1.16 tedu 543: if (embedded) {
1.107 espie 544: msg = verifyembedded(pubkeyfile, sigfile, quiet, &msglen,
545: keytype);
1.30 tedu 546: fd = xopen(msgfile, O_CREAT|O_TRUNC|O_NOFOLLOW|O_WRONLY, 0666);
1.16 tedu 547: writeall(fd, msg, msglen, msgfile);
1.68 espie 548: free(msg);
1.16 tedu 549: close(fd);
1.63 tedu 550: } else {
1.107 espie 551: verifysimple(pubkeyfile, msgfile, sigfile, quiet, keytype);
1.16 tedu 552: }
1.1 tedu 553: }
554:
1.42 tedu 555: #ifndef VERIFYONLY
1.83 tedu 556: #define HASHBUFSIZE 224
1.42 tedu 557: struct checksum {
1.98 tedu 558: char file[PATH_MAX];
1.83 tedu 559: char hash[HASHBUFSIZE];
1.81 tedu 560: char algo[32];
1.42 tedu 561: };
562:
1.85 espie 563: static void *
564: ecalloc(size_t s1, size_t s2, void *data)
565: {
1.87 tedu 566: void *p;
567:
1.89 tedu 568: if (!(p = calloc(s1, s2)))
1.85 espie 569: err(1, "calloc");
570: return p;
571: }
572:
573: static void
574: efree(void *p, void *data)
575: {
576: free(p);
577: }
578:
1.42 tedu 579: static void
1.85 espie 580: recodehash(char *hash, size_t len)
1.80 tedu 581: {
1.83 tedu 582: uint8_t data[HASHBUFSIZE / 2];
1.80 tedu 583: int i, rv;
584:
1.85 espie 585: if (strlen(hash) == len)
1.80 tedu 586: return;
587: if ((rv = b64_pton(hash, data, sizeof(data))) == -1)
588: errx(1, "invalid base64 encoding");
589: for (i = 0; i < rv; i++)
1.83 tedu 590: snprintf(hash + i * 2, HASHBUFSIZE - i * 2, "%2.2x", data[i]);
1.80 tedu 591: }
592:
1.85 espie 593: static int
594: verifychecksum(struct checksum *c, int quiet)
595: {
596: char buf[HASHBUFSIZE];
1.87 tedu 597:
1.85 espie 598: if (strcmp(c->algo, "SHA256") == 0) {
599: recodehash(c->hash, SHA256_DIGEST_STRING_LENGTH-1);
600: if (!SHA256File(c->file, buf))
601: return 0;
602: } else if (strcmp(c->algo, "SHA512") == 0) {
603: recodehash(c->hash, SHA512_DIGEST_STRING_LENGTH-1);
604: if (!SHA512File(c->file, buf))
605: return 0;
606: } else {
607: errx(1, "can't handle algorithm %s", c->algo);
608: }
1.105 tedu 609: if (strcmp(c->hash, buf) != 0)
1.85 espie 610: return 0;
611: if (!quiet)
612: printf("%s: OK\n", c->file);
613: return 1;
614: }
615:
1.80 tedu 616: static void
1.45 tedu 617: verifychecksums(char *msg, int argc, char **argv, int quiet)
1.42 tedu 618: {
1.87 tedu 619: struct ohash_info info = { 0, NULL, ecalloc, efree, NULL };
1.85 espie 620: struct ohash myh;
621: struct checksum c;
1.88 tedu 622: char *e, *line, *endline;
1.85 espie 623: int hasfailed = 0;
1.87 tedu 624: int i, rv;
1.85 espie 625: unsigned int slot;
626:
1.88 tedu 627: ohash_init(&myh, 6, &info);
1.85 espie 628: if (argc) {
629: for (i = 0; i < argc; i++) {
630: slot = ohash_qlookup(&myh, argv[i]);
631: e = ohash_find(&myh, slot);
632: if (e == NULL)
633: ohash_insert(&myh, slot, argv[i]);
634: }
635: }
1.42 tedu 636:
1.45 tedu 637: line = msg;
1.42 tedu 638: while (line && *line) {
639: if ((endline = strchr(line, '\n')))
1.78 tedu 640: *endline++ = '\0';
1.99 tedu 641: #if PATH_MAX < 1024 || HASHBUFSIZE < 224
642: #error sizes are wrong
643: #endif
1.100 tedu 644: rv = sscanf(line, "%31s (%1023[^)]) = "3s",
1.85 espie 645: c.algo, c.file, c.hash);
1.100 tedu 646: if (rv != 3)
1.42 tedu 647: errx(1, "unable to parse checksum line %s", line);
648: line = endline;
1.85 espie 649: if (argc) {
650: slot = ohash_qlookup(&myh, c.file);
651: e = ohash_find(&myh, slot);
652: if (e != NULL) {
1.87 tedu 653: if (verifychecksum(&c, quiet) != 0)
1.85 espie 654: ohash_remove(&myh, slot);
655: }
1.42 tedu 656: } else {
1.87 tedu 657: if (verifychecksum(&c, quiet) == 0) {
1.88 tedu 658: slot = ohash_qlookup(&myh, c.file);
659: e = ohash_find(&myh, slot);
660: if (e == NULL) {
661: if (!(e = strdup(c.file)))
662: err(1, "strdup");
663: ohash_insert(&myh, slot, e);
664: }
1.42 tedu 665: }
666: }
1.85 espie 667: }
1.42 tedu 668:
1.88 tedu 669: for (e = ohash_first(&myh, &slot); e != NULL; e = ohash_next(&myh, &slot)) {
670: fprintf(stderr, "%s: FAIL\n", e);
671: hasfailed = 1;
672: if (argc == 0)
673: free(e);
1.42 tedu 674: }
1.88 tedu 675: ohash_delete(&myh);
1.43 tedu 676: if (hasfailed)
1.42 tedu 677: exit(1);
678: }
679:
680: static void
681: check(const char *pubkeyfile, const char *sigfile, int quiet, int argc,
682: char **argv)
683: {
1.63 tedu 684: unsigned long long msglen;
1.42 tedu 685: uint8_t *msg;
686:
1.107 espie 687: msg = verifyembedded(pubkeyfile, sigfile, quiet, &msglen, NULL);
1.45 tedu 688: verifychecksums((char *)msg, argc, argv, quiet);
1.42 tedu 689:
1.63 tedu 690: free(msg);
1.42 tedu 691: }
1.111 espie 692:
693: void *
694: verifyzdata(uint8_t *zdata, unsigned long long zdatalen,
695: const char *filename, const char *pubkeyfile, const char *keytype)
696: {
697: struct sig sig;
698: char sigcomment[COMMENTMAXLEN];
699: unsigned long long siglen;
700: struct pubkey pubkey;
701:
702: if (zdatalen < sizeof(sig))
703: errx(1, "signature too short in %s", filename);
704: siglen = parseb64file(filename, zdata, &sig, sizeof(sig),
705: sigcomment);
706: readpubkey(pubkeyfile, &pubkey, sigcomment, keytype);
707: zdata += siglen;
708: zdatalen -= siglen;
709: verifymsg(&pubkey, zdata, zdatalen, &sig, 1);
710: return zdata;
711: }
1.42 tedu 712: #endif
713:
1.1 tedu 714: int
715: main(int argc, char **argv)
716: {
1.16 tedu 717: const char *pubkeyfile = NULL, *seckeyfile = NULL, *msgfile = NULL,
1.1 tedu 718: *sigfile = NULL;
1.98 tedu 719: char sigfilebuf[PATH_MAX];
1.27 tedu 720: const char *comment = "signify";
1.107 espie 721: char *keytype = NULL;
1.1 tedu 722: int ch, rounds;
1.16 tedu 723: int embedded = 0;
1.42 tedu 724: int quiet = 0;
1.111 espie 725: int gzip = 0;
1.6 tedu 726: enum {
727: NONE,
1.42 tedu 728: CHECK,
1.6 tedu 729: GENERATE,
730: SIGN,
731: VERIFY
732: } verb = NONE;
733:
1.102 deraadt 734: if (pledge("stdio rpath wpath cpath tty", NULL) == -1)
735: err(1, "pledge");
1.1 tedu 736:
737: rounds = 42;
738:
1.111 espie 739: while ((ch = getopt(argc, argv, "CGSVzc:em:np:qs:t:x:")) != -1) {
1.1 tedu 740: switch (ch) {
1.14 tedu 741: #ifndef VERIFYONLY
1.42 tedu 742: case 'C':
743: if (verb)
744: usage(NULL);
745: verb = CHECK;
746: break;
1.6 tedu 747: case 'G':
748: if (verb)
1.31 tedu 749: usage(NULL);
1.6 tedu 750: verb = GENERATE;
751: break;
752: case 'S':
753: if (verb)
1.31 tedu 754: usage(NULL);
1.6 tedu 755: verb = SIGN;
756: break;
1.111 espie 757: case 'z':
758: gzip = 1;
759: break;
1.14 tedu 760: #endif
1.6 tedu 761: case 'V':
762: if (verb)
1.31 tedu 763: usage(NULL);
1.6 tedu 764: verb = VERIFY;
765: break;
1.27 tedu 766: case 'c':
767: comment = optarg;
768: break;
1.16 tedu 769: case 'e':
770: embedded = 1;
771: break;
1.31 tedu 772: case 'm':
773: msgfile = optarg;
774: break;
1.6 tedu 775: case 'n':
1.1 tedu 776: rounds = 0;
777: break;
1.6 tedu 778: case 'p':
1.1 tedu 779: pubkeyfile = optarg;
780: break;
1.42 tedu 781: case 'q':
782: quiet = 1;
783: break;
1.6 tedu 784: case 's':
1.1 tedu 785: seckeyfile = optarg;
786: break;
1.107 espie 787: case 't':
788: keytype = optarg;
789: break;
1.31 tedu 790: case 'x':
791: sigfile = optarg;
792: break;
1.1 tedu 793: default:
1.31 tedu 794: usage(NULL);
1.1 tedu 795: break;
796: }
797: }
1.2 tedu 798: argc -= optind;
1.9 espie 799: argv += optind;
1.113 tedu 800:
801: if (embedded && gzip)
802: errx(1, "can't combine -e and -z options");
1.104 bluhm 803:
804: if (setvbuf(stdout, NULL, _IOLBF, 0) != 0)
805: err(1, "setvbuf");
1.101 tedu 806:
1.114 tedu 807: #ifndef VERIFYONLY
808: if (verb == CHECK) {
1.102 deraadt 809: if (pledge("stdio rpath", NULL) == -1)
810: err(1, "pledge");
1.86 tedu 811: if (!sigfile)
812: usage("must specify sigfile");
1.42 tedu 813: check(pubkeyfile, sigfile, quiet, argc, argv);
814: return 0;
815: }
816: #endif
817:
1.31 tedu 818: if (argc != 0)
819: usage(NULL);
820:
1.36 tedu 821: if (!sigfile && msgfile) {
1.91 tedu 822: int nr;
1.36 tedu 823: if (strcmp(msgfile, "-") == 0)
1.66 tedu 824: usage("must specify sigfile with - message");
1.91 tedu 825: if ((nr = snprintf(sigfilebuf, sizeof(sigfilebuf), "%s.sig",
826: msgfile)) == -1 || nr >= sizeof(sigfilebuf))
1.36 tedu 827: errx(1, "path too long");
828: sigfile = sigfilebuf;
829: }
1.1 tedu 830:
1.36 tedu 831: switch (verb) {
1.14 tedu 832: #ifndef VERIFYONLY
1.36 tedu 833: case GENERATE:
1.114 tedu 834: /* no pledge */
1.31 tedu 835: if (!pubkeyfile || !seckeyfile)
1.66 tedu 836: usage("must specify pubkey and seckey");
1.27 tedu 837: generate(pubkeyfile, seckeyfile, rounds, comment);
1.36 tedu 838: break;
839: case SIGN:
1.114 tedu 840: /* no pledge */
1.115 ! tedu 841: if (gzip) {
1.111 espie 842: zsign(seckeyfile, msgfile, sigfile);
1.115 ! tedu 843: } else {
1.111 espie 844: if (!msgfile || !seckeyfile)
845: usage("must specify message and seckey");
846: sign(seckeyfile, msgfile, sigfile, embedded);
847: }
1.36 tedu 848: break;
1.14 tedu 849: #endif
1.36 tedu 850: case VERIFY:
1.115 ! tedu 851: if ((embedded || gzip) &&
! 852: (msgfile && strcmp(msgfile, "-") != 0)) {
! 853: /* will need to create output file */
1.114 tedu 854: if (pledge("stdio rpath wpath cpath", NULL) == -1)
855: err(1, "pledge");
856: } else {
857: if (pledge("stdio rpath", NULL) == -1)
858: err(1, "pledge");
859: }
1.115 ! tedu 860: if (gzip) {
1.111 espie 861: zverify(pubkeyfile, msgfile, sigfile, keytype);
1.115 ! tedu 862: } else {
1.111 espie 863: if (!msgfile)
864: usage("must specify message");
865: verify(pubkeyfile, msgfile, sigfile, embedded,
866: quiet, keytype);
867: }
1.36 tedu 868: break;
869: default:
1.114 tedu 870: if (pledge("stdio", NULL) == -1)
871: err(1, "pledge");
1.36 tedu 872: usage(NULL);
873: break;
1.1 tedu 874: }
1.9 espie 875:
1.1 tedu 876: return 0;
877: }
![[BACK]](/icons/back.gif){kind=icon}
Return to signify.c CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / signify