Annotation of src/usr.bin/signify/signify.c, Revision 1.124
1.124 ! tedu 1: /* $OpenBSD: signify.c,v 1.123 2016/10/05 14:48:58 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)))
1.116 tedu 192: err(1, "realloc");
1.49 tedu 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.123 tedu 330: nr = snprintf(commentbuf, sizeof(commentbuf), "%s secret key", comment);
331: if (nr == -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.123 tedu 339: nr = snprintf(commentbuf, sizeof(commentbuf), "%s public key", comment);
340: if (nr == -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.124 ! tedu 354: char *extname;
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.124 ! tedu 362: extname = strrchr(seckeyfile, '.');
! 363: if (extname && strcmp(extname, ".sec") == 0) {
1.119 tedu 364: const char *keyname;
365: /* basename may or may not modify input */
366: if (!(keyname = strrchr(seckeyfile, '/')))
367: keyname = seckeyfile;
1.120 tedu 368: else
369: keyname++;
1.123 tedu 370: nr = snprintf(sigcomment, sizeof(sigcomment),
371: VERIFYWITH "%.*s.pub", (int)strlen(keyname) - 4, keyname);
372: if (nr == -1 || nr >= sizeof(sigcomment))
1.110 tedu 373: errx(1, "comment too long");
374: } else {
1.123 tedu 375: nr = snprintf(sigcomment, sizeof(sigcomment),
376: "signature from %s", comment);
377: if (nr == -1 || nr >= sizeof(sigcomment))
1.110 tedu 378: errx(1, "comment too long");
379: }
380:
381: if (memcmp(enckey.kdfalg, KDFALG, 2) != 0)
1.1 tedu 382: errx(1, "unsupported KDF");
1.110 tedu 383: rounds = ntohl(enckey.kdfrounds);
384: kdf(enckey.salt, sizeof(enckey.salt), rounds, strcmp(msgfile, "-") != 0,
1.70 tedu 385: 0, xorkey, sizeof(xorkey));
1.110 tedu 386: for (i = 0; i < sizeof(enckey.seckey); i++)
387: enckey.seckey[i] ^= xorkey[i];
1.41 tedu 388: explicit_bzero(xorkey, sizeof(xorkey));
1.1 tedu 389: SHA512Init(&ctx);
1.110 tedu 390: SHA512Update(&ctx, enckey.seckey, sizeof(enckey.seckey));
1.1 tedu 391: SHA512Final(digest, &ctx);
1.110 tedu 392: if (memcmp(enckey.checksum, digest, sizeof(enckey.checksum)) != 0)
1.105 tedu 393: errx(1, "incorrect passphrase");
1.41 tedu 394: explicit_bzero(digest, sizeof(digest));
1.1 tedu 395:
1.110 tedu 396: signmsg(enckey.seckey, msg, msglen, sig.sig);
397: memcpy(sig.keynum, enckey.keynum, KEYNUMLEN);
398: explicit_bzero(&enckey, sizeof(enckey));
1.109 tedu 399:
400: memcpy(sig.pkalg, PKALG, 2);
401:
402: sighdr = createheader(sigcomment, &sig, sizeof(sig));
403: return sighdr;
404: }
405:
406: static void
407: sign(const char *seckeyfile, const char *msgfile, const char *sigfile,
408: int embedded)
409: {
410: uint8_t *msg;
411: char *sighdr;
1.110 tedu 412: int fd;
1.109 tedu 413: unsigned long long msglen;
414:
415: msg = readmsg(msgfile, &msglen);
416:
1.110 tedu 417: sighdr = createsig(seckeyfile, msgfile, msg, msglen);
1.109 tedu 418:
419: fd = xopen(sigfile, O_CREAT|O_TRUNC|O_NOFOLLOW|O_WRONLY, 0666);
420: writeall(fd, sighdr, strlen(sighdr), sigfile);
421: free(sighdr);
1.16 tedu 422: if (embedded)
1.109 tedu 423: writeall(fd, msg, msglen, sigfile);
424: close(fd);
1.1 tedu 425:
426: free(msg);
427: }
1.14 tedu 428: #endif
1.1 tedu 429:
430: static void
1.62 tedu 431: verifymsg(struct pubkey *pubkey, uint8_t *msg, unsigned long long msglen,
432: struct sig *sig, int quiet)
1.13 tedu 433: {
434: uint8_t *sigbuf, *dummybuf;
435: unsigned long long siglen, dummylen;
436:
1.94 tedu 437: if (memcmp(pubkey->keynum, sig->keynum, KEYNUMLEN) != 0)
1.62 tedu 438: errx(1, "verification failed: checked against wrong key");
439:
1.13 tedu 440: siglen = SIGBYTES + msglen;
441: sigbuf = xmalloc(siglen);
442: dummybuf = xmalloc(siglen);
1.62 tedu 443: memcpy(sigbuf, sig->sig, SIGBYTES);
1.13 tedu 444: memcpy(sigbuf + SIGBYTES, msg, msglen);
445: if (crypto_sign_ed25519_open(dummybuf, &dummylen, sigbuf, siglen,
1.62 tedu 446: pubkey->pubkey) == -1)
1.13 tedu 447: errx(1, "signature verification failed");
1.42 tedu 448: if (!quiet)
449: printf("Signature Verified\n");
1.13 tedu 450: free(sigbuf);
451: free(dummybuf);
452: }
453:
1.107 espie 454: static void
455: check_keytype(const char *pubkeyfile, const char *keytype)
456: {
1.122 tedu 457: const char *p;
458: size_t typelen;
459:
460: if (!(p = strrchr(pubkeyfile, '-')))
461: goto bad;
462: p++;
463: typelen = strlen(keytype);
464: if (strncmp(p, keytype, typelen) != 0)
465: goto bad;
466: if (strcmp(p + typelen, ".pub") != 0)
467: goto bad;
468: return;
469:
470: bad:
471: errx(1, "incorrect keytype: %s is not %s", pubkeyfile, keytype);
1.107 espie 472: }
473:
1.64 tedu 474: static void
475: readpubkey(const char *pubkeyfile, struct pubkey *pubkey,
1.107 espie 476: const char *sigcomment, const char *keytype)
1.64 tedu 477: {
1.119 tedu 478: const char *safepath = "/etc/signify";
479: char keypath[1024];
1.64 tedu 480:
481: if (!pubkeyfile) {
1.90 tedu 482: pubkeyfile = strstr(sigcomment, VERIFYWITH);
1.119 tedu 483: if (pubkeyfile && strchr(pubkeyfile, '/') == NULL) {
1.64 tedu 484: pubkeyfile += strlen(VERIFYWITH);
1.107 espie 485: if (keytype)
486: check_keytype(pubkeyfile, keytype);
1.119 tedu 487: if (snprintf(keypath, sizeof(keypath), "%s/%s",
488: safepath, pubkeyfile) >= sizeof(keypath))
489: errx(1, "name too long %s", pubkeyfile);
1.121 tedu 490: pubkeyfile = keypath;
1.64 tedu 491: } else
1.66 tedu 492: usage("must specify pubkey");
1.64 tedu 493: }
1.121 tedu 494: readb64file(pubkeyfile, pubkey, sizeof(*pubkey), NULL);
1.64 tedu 495: }
1.13 tedu 496:
497: static void
1.63 tedu 498: verifysimple(const char *pubkeyfile, const char *msgfile, const char *sigfile,
1.107 espie 499: int quiet, const char *keytype)
1.1 tedu 500: {
1.64 tedu 501: char sigcomment[COMMENTMAXLEN];
1.1 tedu 502: struct sig sig;
503: struct pubkey pubkey;
1.63 tedu 504: unsigned long long msglen;
1.1 tedu 505: uint8_t *msg;
1.16 tedu 506:
1.63 tedu 507: msg = readmsg(msgfile, &msglen);
1.1 tedu 508:
1.64 tedu 509: readb64file(sigfile, &sig, sizeof(sig), sigcomment);
1.107 espie 510: readpubkey(pubkeyfile, &pubkey, sigcomment, keytype);
1.63 tedu 511:
512: verifymsg(&pubkey, msg, msglen, &sig, quiet);
513:
514: free(msg);
515: }
516:
517: static uint8_t *
518: verifyembedded(const char *pubkeyfile, const char *sigfile,
1.107 espie 519: int quiet, unsigned long long *msglenp, const char *keytype)
1.63 tedu 520: {
1.64 tedu 521: char sigcomment[COMMENTMAXLEN];
1.63 tedu 522: struct sig sig;
523: struct pubkey pubkey;
524: unsigned long long msglen, siglen;
525: uint8_t *msg;
526:
527: msg = readmsg(sigfile, &msglen);
528:
1.64 tedu 529: siglen = parseb64file(sigfile, msg, &sig, sizeof(sig), sigcomment);
1.107 espie 530: readpubkey(pubkeyfile, &pubkey, sigcomment, keytype);
1.64 tedu 531:
1.63 tedu 532: msglen -= siglen;
533: memmove(msg, msg + siglen, msglen);
534: msg[msglen] = 0;
1.13 tedu 535:
1.62 tedu 536: verifymsg(&pubkey, msg, msglen, &sig, quiet);
1.63 tedu 537:
538: *msglenp = msglen;
539: return msg;
540: }
541:
542: static void
543: verify(const char *pubkeyfile, const char *msgfile, const char *sigfile,
1.107 espie 544: int embedded, int quiet, const char *keytype)
1.63 tedu 545: {
546: unsigned long long msglen;
547: uint8_t *msg;
548: int fd;
549:
1.16 tedu 550: if (embedded) {
1.107 espie 551: msg = verifyembedded(pubkeyfile, sigfile, quiet, &msglen,
552: keytype);
1.30 tedu 553: fd = xopen(msgfile, O_CREAT|O_TRUNC|O_NOFOLLOW|O_WRONLY, 0666);
1.16 tedu 554: writeall(fd, msg, msglen, msgfile);
1.68 espie 555: free(msg);
1.16 tedu 556: close(fd);
1.63 tedu 557: } else {
1.107 espie 558: verifysimple(pubkeyfile, msgfile, sigfile, quiet, keytype);
1.16 tedu 559: }
1.1 tedu 560: }
561:
1.42 tedu 562: #ifndef VERIFYONLY
1.83 tedu 563: #define HASHBUFSIZE 224
1.42 tedu 564: struct checksum {
1.98 tedu 565: char file[PATH_MAX];
1.83 tedu 566: char hash[HASHBUFSIZE];
1.81 tedu 567: char algo[32];
1.42 tedu 568: };
569:
1.118 deraadt 570: static void *
1.85 espie 571: ecalloc(size_t s1, size_t s2, void *data)
572: {
1.87 tedu 573: void *p;
574:
1.89 tedu 575: if (!(p = calloc(s1, s2)))
1.85 espie 576: err(1, "calloc");
577: return p;
578: }
579:
580: static void
581: efree(void *p, void *data)
582: {
583: free(p);
584: }
585:
1.42 tedu 586: static void
1.85 espie 587: recodehash(char *hash, size_t len)
1.80 tedu 588: {
1.83 tedu 589: uint8_t data[HASHBUFSIZE / 2];
1.80 tedu 590: int i, rv;
591:
1.85 espie 592: if (strlen(hash) == len)
1.80 tedu 593: return;
594: if ((rv = b64_pton(hash, data, sizeof(data))) == -1)
595: errx(1, "invalid base64 encoding");
596: for (i = 0; i < rv; i++)
1.83 tedu 597: snprintf(hash + i * 2, HASHBUFSIZE - i * 2, "%2.2x", data[i]);
1.80 tedu 598: }
599:
1.85 espie 600: static int
601: verifychecksum(struct checksum *c, int quiet)
602: {
603: char buf[HASHBUFSIZE];
1.87 tedu 604:
1.85 espie 605: if (strcmp(c->algo, "SHA256") == 0) {
606: recodehash(c->hash, SHA256_DIGEST_STRING_LENGTH-1);
607: if (!SHA256File(c->file, buf))
608: return 0;
609: } else if (strcmp(c->algo, "SHA512") == 0) {
610: recodehash(c->hash, SHA512_DIGEST_STRING_LENGTH-1);
611: if (!SHA512File(c->file, buf))
612: return 0;
613: } else {
614: errx(1, "can't handle algorithm %s", c->algo);
615: }
1.105 tedu 616: if (strcmp(c->hash, buf) != 0)
1.85 espie 617: return 0;
618: if (!quiet)
619: printf("%s: OK\n", c->file);
620: return 1;
621: }
622:
1.80 tedu 623: static void
1.45 tedu 624: verifychecksums(char *msg, int argc, char **argv, int quiet)
1.42 tedu 625: {
1.87 tedu 626: struct ohash_info info = { 0, NULL, ecalloc, efree, NULL };
1.85 espie 627: struct ohash myh;
628: struct checksum c;
1.88 tedu 629: char *e, *line, *endline;
1.85 espie 630: int hasfailed = 0;
1.87 tedu 631: int i, rv;
1.85 espie 632: unsigned int slot;
633:
1.88 tedu 634: ohash_init(&myh, 6, &info);
1.85 espie 635: if (argc) {
636: for (i = 0; i < argc; i++) {
637: slot = ohash_qlookup(&myh, argv[i]);
638: e = ohash_find(&myh, slot);
639: if (e == NULL)
640: ohash_insert(&myh, slot, argv[i]);
641: }
642: }
1.42 tedu 643:
1.45 tedu 644: line = msg;
1.42 tedu 645: while (line && *line) {
646: if ((endline = strchr(line, '\n')))
1.78 tedu 647: *endline++ = '\0';
1.99 tedu 648: #if PATH_MAX < 1024 || HASHBUFSIZE < 224
649: #error sizes are wrong
650: #endif
1.100 tedu 651: rv = sscanf(line, "%31s (%1023[^)]) = "3s",
1.85 espie 652: c.algo, c.file, c.hash);
1.100 tedu 653: if (rv != 3)
1.42 tedu 654: errx(1, "unable to parse checksum line %s", line);
655: line = endline;
1.85 espie 656: if (argc) {
657: slot = ohash_qlookup(&myh, c.file);
658: e = ohash_find(&myh, slot);
659: if (e != NULL) {
1.87 tedu 660: if (verifychecksum(&c, quiet) != 0)
1.85 espie 661: ohash_remove(&myh, slot);
662: }
1.42 tedu 663: } else {
1.87 tedu 664: if (verifychecksum(&c, quiet) == 0) {
1.88 tedu 665: slot = ohash_qlookup(&myh, c.file);
666: e = ohash_find(&myh, slot);
667: if (e == NULL) {
668: if (!(e = strdup(c.file)))
669: err(1, "strdup");
670: ohash_insert(&myh, slot, e);
671: }
1.42 tedu 672: }
673: }
1.85 espie 674: }
1.42 tedu 675:
1.88 tedu 676: for (e = ohash_first(&myh, &slot); e != NULL; e = ohash_next(&myh, &slot)) {
677: fprintf(stderr, "%s: FAIL\n", e);
678: hasfailed = 1;
679: if (argc == 0)
680: free(e);
1.42 tedu 681: }
1.88 tedu 682: ohash_delete(&myh);
1.43 tedu 683: if (hasfailed)
1.42 tedu 684: exit(1);
685: }
686:
687: static void
688: check(const char *pubkeyfile, const char *sigfile, int quiet, int argc,
689: char **argv)
690: {
1.63 tedu 691: unsigned long long msglen;
1.42 tedu 692: uint8_t *msg;
693:
1.107 espie 694: msg = verifyembedded(pubkeyfile, sigfile, quiet, &msglen, NULL);
1.45 tedu 695: verifychecksums((char *)msg, argc, argv, quiet);
1.42 tedu 696:
1.63 tedu 697: free(msg);
1.42 tedu 698: }
1.111 espie 699:
700: void *
1.118 deraadt 701: verifyzdata(uint8_t *zdata, unsigned long long zdatalen,
1.111 espie 702: const char *filename, const char *pubkeyfile, const char *keytype)
703: {
704: struct sig sig;
705: char sigcomment[COMMENTMAXLEN];
706: unsigned long long siglen;
707: struct pubkey pubkey;
708:
709: if (zdatalen < sizeof(sig))
710: errx(1, "signature too short in %s", filename);
1.118 deraadt 711: siglen = parseb64file(filename, zdata, &sig, sizeof(sig),
1.111 espie 712: sigcomment);
713: readpubkey(pubkeyfile, &pubkey, sigcomment, keytype);
714: zdata += siglen;
715: zdatalen -= siglen;
716: verifymsg(&pubkey, zdata, zdatalen, &sig, 1);
717: return zdata;
718: }
1.42 tedu 719: #endif
720:
1.1 tedu 721: int
722: main(int argc, char **argv)
723: {
1.16 tedu 724: const char *pubkeyfile = NULL, *seckeyfile = NULL, *msgfile = NULL,
1.1 tedu 725: *sigfile = NULL;
1.98 tedu 726: char sigfilebuf[PATH_MAX];
1.27 tedu 727: const char *comment = "signify";
1.107 espie 728: char *keytype = NULL;
1.1 tedu 729: int ch, rounds;
1.16 tedu 730: int embedded = 0;
1.42 tedu 731: int quiet = 0;
1.111 espie 732: int gzip = 0;
1.6 tedu 733: enum {
734: NONE,
1.42 tedu 735: CHECK,
1.6 tedu 736: GENERATE,
737: SIGN,
738: VERIFY
739: } verb = NONE;
740:
1.102 deraadt 741: if (pledge("stdio rpath wpath cpath tty", NULL) == -1)
742: err(1, "pledge");
1.1 tedu 743:
744: rounds = 42;
745:
1.111 espie 746: while ((ch = getopt(argc, argv, "CGSVzc:em:np:qs:t:x:")) != -1) {
1.1 tedu 747: switch (ch) {
1.14 tedu 748: #ifndef VERIFYONLY
1.42 tedu 749: case 'C':
750: if (verb)
751: usage(NULL);
752: verb = CHECK;
753: break;
1.6 tedu 754: case 'G':
755: if (verb)
1.31 tedu 756: usage(NULL);
1.6 tedu 757: verb = GENERATE;
758: break;
759: case 'S':
760: if (verb)
1.31 tedu 761: usage(NULL);
1.6 tedu 762: verb = SIGN;
763: break;
1.111 espie 764: case 'z':
765: gzip = 1;
766: break;
1.14 tedu 767: #endif
1.6 tedu 768: case 'V':
769: if (verb)
1.31 tedu 770: usage(NULL);
1.6 tedu 771: verb = VERIFY;
772: break;
1.27 tedu 773: case 'c':
774: comment = optarg;
775: break;
1.16 tedu 776: case 'e':
777: embedded = 1;
778: break;
1.31 tedu 779: case 'm':
780: msgfile = optarg;
781: break;
1.6 tedu 782: case 'n':
1.1 tedu 783: rounds = 0;
784: break;
1.6 tedu 785: case 'p':
1.1 tedu 786: pubkeyfile = optarg;
787: break;
1.42 tedu 788: case 'q':
789: quiet = 1;
790: break;
1.6 tedu 791: case 's':
1.1 tedu 792: seckeyfile = optarg;
793: break;
1.107 espie 794: case 't':
795: keytype = optarg;
796: break;
1.31 tedu 797: case 'x':
798: sigfile = optarg;
799: break;
1.1 tedu 800: default:
1.31 tedu 801: usage(NULL);
1.1 tedu 802: break;
803: }
804: }
1.2 tedu 805: argc -= optind;
1.9 espie 806: argv += optind;
1.113 tedu 807:
808: if (embedded && gzip)
809: errx(1, "can't combine -e and -z options");
1.104 bluhm 810:
811: if (setvbuf(stdout, NULL, _IOLBF, 0) != 0)
812: err(1, "setvbuf");
1.101 tedu 813:
1.114 tedu 814: #ifndef VERIFYONLY
815: if (verb == CHECK) {
1.102 deraadt 816: if (pledge("stdio rpath", NULL) == -1)
817: err(1, "pledge");
1.86 tedu 818: if (!sigfile)
819: usage("must specify sigfile");
1.42 tedu 820: check(pubkeyfile, sigfile, quiet, argc, argv);
821: return 0;
822: }
823: #endif
824:
1.31 tedu 825: if (argc != 0)
826: usage(NULL);
827:
1.36 tedu 828: if (!sigfile && msgfile) {
1.91 tedu 829: int nr;
1.36 tedu 830: if (strcmp(msgfile, "-") == 0)
1.66 tedu 831: usage("must specify sigfile with - message");
1.123 tedu 832: nr = snprintf(sigfilebuf, sizeof(sigfilebuf),
833: "%s.sig", msgfile);
834: if (nr == -1 || nr >= sizeof(sigfilebuf))
1.36 tedu 835: errx(1, "path too long");
836: sigfile = sigfilebuf;
837: }
1.1 tedu 838:
1.36 tedu 839: switch (verb) {
1.14 tedu 840: #ifndef VERIFYONLY
1.36 tedu 841: case GENERATE:
1.114 tedu 842: /* no pledge */
1.31 tedu 843: if (!pubkeyfile || !seckeyfile)
1.66 tedu 844: usage("must specify pubkey and seckey");
1.27 tedu 845: generate(pubkeyfile, seckeyfile, rounds, comment);
1.36 tedu 846: break;
847: case SIGN:
1.114 tedu 848: /* no pledge */
1.115 tedu 849: if (gzip) {
1.117 espie 850: if (!msgfile || !seckeyfile || !sigfile)
851: usage("must specify message sigfile seckey");
1.111 espie 852: zsign(seckeyfile, msgfile, sigfile);
1.115 tedu 853: } else {
1.111 espie 854: if (!msgfile || !seckeyfile)
855: usage("must specify message and seckey");
856: sign(seckeyfile, msgfile, sigfile, embedded);
857: }
1.36 tedu 858: break;
1.14 tedu 859: #endif
1.36 tedu 860: case VERIFY:
1.115 tedu 861: if ((embedded || gzip) &&
862: (msgfile && strcmp(msgfile, "-") != 0)) {
863: /* will need to create output file */
1.114 tedu 864: if (pledge("stdio rpath wpath cpath", NULL) == -1)
865: err(1, "pledge");
866: } else {
867: if (pledge("stdio rpath", NULL) == -1)
868: err(1, "pledge");
869: }
1.115 tedu 870: if (gzip) {
1.111 espie 871: zverify(pubkeyfile, msgfile, sigfile, keytype);
1.115 tedu 872: } else {
1.111 espie 873: if (!msgfile)
874: usage("must specify message");
1.118 deraadt 875: verify(pubkeyfile, msgfile, sigfile, embedded,
1.111 espie 876: quiet, keytype);
877: }
1.36 tedu 878: break;
879: default:
1.114 tedu 880: if (pledge("stdio", NULL) == -1)
881: err(1, "pledge");
1.36 tedu 882: usage(NULL);
883: break;
1.1 tedu 884: }
1.9 espie 885:
1.1 tedu 886: return 0;
887: }
![[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