static bool quiet;
+/*
+ * ucert structure
+ * | BLOB |
+ * | SIGNATURE | PAYLOAD |
+ * | |[ BLOBMSG CONTAINER ]|
+ * | |[[T,i,v,e,f,pubkey ]]|
+ */
enum cert_attr {
CERT_ATTR_SIGNATURE,
CERT_ATTR_PAYLOAD,
[CERT_PL_ATTR_KEY_FINGERPRINT] = { .name = "fingerprint", .type = BLOBMSG_TYPE_STRING },
};
+/* list to store certificate chain at runtime */
struct cert_object {
struct list_head list;
- struct blob_attr **cert;
+ struct blob_attr *cert[CERT_ATTR_MAX];
};
+/* write buffer to file */
static int write_file(const char *filename, void *buf, size_t len, bool append) {
FILE *f;
size_t outlen;
return (outlen == len);
}
+/* load certfile into list */
static int cert_load(const char *certfile, struct list_head *chain) {
FILE *f;
struct blob_attr *certtb[CERT_ATTR_MAX];
+ struct blob_attr *bufpt;
struct cert_object *cobj;
char filebuf[CERT_BUF_LEN];
- int ret = 0;
- int len;
+ int ret = 0, pret = 0;
+ int len, pos = 0;
f = fopen(certfile, "r");
if (!f)
if (ret)
return 1;
- /* TODO: read more than one blob from file */
- ret = blob_parse(filebuf, certtb, cert_policy, CERT_ATTR_MAX);
- cobj = calloc(1, sizeof(*cobj));
- cobj->cert = &certtb;
- list_add_tail(&cobj->list, chain);
+ bufpt = (struct blob_attr *)filebuf;
+ do {
+ pret = blob_parse(bufpt, certtb, cert_policy, CERT_ATTR_MAX);
+ if (pret <= 0)
+ /* no attributes found */
+ break;
+
+ if (pos + blob_pad_len(bufpt) > len)
+ /* blob exceeds filebuffer */
+ break;
+ else
+ pos += blob_pad_len(bufpt);
+
+ cobj = calloc(1, sizeof(*cobj));
+ memcpy(cobj->cert, &certtb, sizeof(certtb));
+ list_add_tail(&cobj->list, chain);
+ ret += pret;
+ bufpt = blob_next(bufpt);
+ /* repeat parsing while there is still enough remaining data in buffer */
+ } while(len > pos + sizeof(struct blob_attr));
return (ret <= 0);
}
-static int cert_append(const char *certfile, const char *pubkeyfile, const char *sigfile) {
- fprintf(stderr, "not implemented\n");
- return 1;
+/* append signature to certfile */
+static int cert_append(const char *certfile, const char *sigfile) {
+ FILE *fs;
+ char filebuf[CERT_BUF_LEN];
+ struct blob_buf sigbuf;
+ int len;
+ int ret;
+
+ fs = fopen(sigfile, "r");
+ if (!fs)
+ return 1;
+
+ len = fread(&filebuf, 1, CERT_BUF_LEN - 1, fs);
+ ret = ferror(fs) || !feof(fs) || (len < 64);
+ fclose(fs);
+ if (ret)
+ return 1;
+
+ blob_buf_init(&sigbuf, 0);
+ blob_put(&sigbuf, CERT_ATTR_SIGNATURE, filebuf, len);
+ ret = write_file(certfile, sigbuf.head, blob_raw_len(sigbuf.head), true);
+ blob_buf_free(&sigbuf);
+ return ret;
}
+/* verify the signature of a single chain element */
static int cert_verify_blob(struct blob_attr *cert[CERT_ATTR_MAX],
const char *pubkeyfile, const char *pubkeydir) {
int i;
return ret;
}
+/* verify cert chain (and message) */
static int chain_verify(const char *msgfile, const char *pubkeyfile,
const char *pubkeydir, struct list_head *chain) {
struct cert_object *cobj;
struct blob_attr *payloadtb[CERT_PL_ATTR_MAX];
char tmpdir[] = "/tmp/ucert-XXXXXX";
char chainedpubkey[256] = {0};
+ char chainedfp[17] = {0};
char extsigfile[256] = {0};
int ret = 1;
int checkmsg = 0;
checkmsg = -1;
list_for_each_entry(cobj, chain, list) {
- ret = cert_verify_blob(cobj->cert, chainedpubkey[0]?chainedpubkey:pubkeyfile, pubkeydir);
- if (ret)
- goto clean_and_return;
-
+ /* blob has payload, verify that using signature */
if (cobj->cert[CERT_ATTR_PAYLOAD]) {
struct timeval tv;
uint64_t validfrom;
uint64_t expiresat;
uint32_t certtype;
+ ret = cert_verify_blob(cobj->cert, chainedpubkey[0]?chainedpubkey:pubkeyfile, pubkeydir);
+ if (ret)
+ goto clean_and_return;
+
blobmsg_parse(cert_cont_policy,
ARRAY_SIZE(cert_cont_policy),
containertb,
blobmsg_data(payloadtb[CERT_PL_ATTR_PUBKEY]),
blobmsg_data_len(payloadtb[CERT_PL_ATTR_PUBKEY]),
false);
+
+ if (usign_f_pubkey(chainedfp, chainedpubkey)) {
+ if (!quiet)
+ fprintf(stderr, "cannot get fingerprint for chained key\n");
+ ret = 2;
+ goto clean_and_return;
+ }
+ if (pubkeydir && _usign_key_is_revoked(chainedfp, pubkeydir)) {
+ if (!quiet)
+ fprintf(stderr, "key %s has been revoked!\n", chainedfp);
+ ret = 4;
+ goto clean_and_return;
+ }
} else {
+ /* blob doesn't have payload, verify message using signature */
if (msgfile) {
snprintf(extsigfile, sizeof(extsigfile) - 1, "%s/%s", tmpdir, "ext-sig");
write_file(extsigfile,
return ret | checkmsg;
}
+/* dump single chain element to console */
static void cert_dump_blob(struct blob_attr *cert[CERT_ATTR_MAX]) {
int i;
switch(cert_policy[i].type) {
case BLOB_ATTR_BINARY:
- fprintf(stdout, "signature:\n---\n%s\n---\n", (char *) blob_data(v));
+ fprintf(stdout, "signature:\n---\n%s---\n", (char *) blob_data(v));
break;
case BLOB_ATTR_NESTED:
fprintf(stdout, "payload:\n---\n%s\n---\n", blobmsg_format_json_indent(blob_data(v), false, 0));
}
}
+/* dump certfile to console */
static int cert_dump(const char *certfile) {
struct cert_object *cobj;
static LIST_HEAD(certchain);
+ unsigned int count = 0;
if (cert_load(certfile, &certchain)) {
fprintf(stderr, "cannot parse cert\n");
return 1;
}
- list_for_each_entry(cobj, &certchain, list)
+ list_for_each_entry(cobj, &certchain, list) {
+ fprintf(stderr, "=== CHAIN ELEMENT %02u ===\n", ++count);
cert_dump_blob(cobj->cert);
+ fprintf(stderr, "========================\n");
+ }
return 0;
}
+/* issue an auth certificate for pubkey */
static int cert_issue(const char *certfile, const char *pubkeyfile, const char *seckeyfile) {
struct blob_buf certbuf;
struct blob_buf payloadbuf;
if (siglen < 1)
return 1;
- sigb[siglen-1] = '\0';
+ sigb[siglen] = '\0';
fclose(sigf);
unlink(fname);
blob_put(&certbuf, CERT_ATTR_PAYLOAD, blob_data(payloadbuf.head), blob_len(payloadbuf.head));
snprintf(fname, sizeof(fname) - 1, "%s%s", certfile, revoker?".revoke":"");
write_file(fname, certbuf.head, blob_raw_len(certbuf.head), false);
+ blob_buf_free(&certbuf);
+ blob_buf_free(&payloadbuf);
+
revoker--;
}
return 0;
}
-static int cert_process_revoker(const char *certfile) {
- fprintf(stderr, "not implemented\n");
- return 1;
+/* process revoker certificate */
+static int cert_process_revoker(const char *certfile, const char *pubkeydir) {
+ static LIST_HEAD(certchain);
+ struct cert_object *cobj;
+ struct blob_attr *containertb[CERT_CT_ATTR_MAX];
+ struct blob_attr *payloadtb[CERT_PL_ATTR_MAX];
+ struct stat st;
+ struct timeval tv;
+ uint64_t validfrom;
+ uint32_t certtype;
+ char *fingerprint;
+ char rfname[512];
+
+ int ret;
+
+ if (cert_load(certfile, &certchain)) {
+ fprintf(stderr, "cannot parse cert\n");
+ return 1;
+ }
+
+ list_for_each_entry(cobj, &certchain, list) {
+ /* blob has payload, verify that using signature */
+ if (!cobj->cert[CERT_ATTR_PAYLOAD])
+ return 2;
+ ret = cert_verify_blob(cobj->cert, NULL, pubkeydir);
+ if (ret)
+ return ret;
+
+ blobmsg_parse(cert_cont_policy,
+ ARRAY_SIZE(cert_cont_policy),
+ containertb,
+ blob_data(cobj->cert[CERT_ATTR_PAYLOAD]),
+ blob_len(cobj->cert[CERT_ATTR_PAYLOAD]));
+ if (!containertb[CERT_CT_ATTR_PAYLOAD]) {
+ fprintf(stderr, "no ucert in signed payload\n");
+ return 2;
+ }
+
+ blobmsg_parse(cert_payload_policy,
+ ARRAY_SIZE(cert_payload_policy),
+ payloadtb,
+ blobmsg_data(containertb[CERT_CT_ATTR_PAYLOAD]),
+ blobmsg_data_len(containertb[CERT_CT_ATTR_PAYLOAD]));
+
+ if (!payloadtb[CERT_PL_ATTR_CERTTYPE] ||
+ !payloadtb[CERT_PL_ATTR_VALIDFROMTIME] ||
+ !payloadtb[CERT_PL_ATTR_KEY_FINGERPRINT]) {
+ fprintf(stderr, "missing mandatory ucert attributes\n");
+ return 2;
+ }
+
+ certtype = blobmsg_get_u32(payloadtb[CERT_PL_ATTR_CERTTYPE]);
+ validfrom = blobmsg_get_u64(payloadtb[CERT_PL_ATTR_VALIDFROMTIME]);
+ fingerprint = blobmsg_get_string(payloadtb[CERT_PL_ATTR_KEY_FINGERPRINT]);
+
+ if (certtype != CERTTYPE_REVOKE) {
+ fprintf(stderr, "wrong certificate type\n");
+ return 2;
+ }
+
+ gettimeofday(&tv, NULL);
+ if (tv.tv_sec < validfrom) {
+ return 3;
+ }
+
+ snprintf(rfname, sizeof(rfname)-1, "%s/%s", pubkeydir, fingerprint);
+ /* check if entry in pubkeydir exists */
+ if (stat(rfname, &st) == 0) {
+ if (_usign_key_is_revoked(fingerprint, pubkeydir)) {
+ if (!quiet)
+ fprintf(stdout, "existing revoker deadlink for key %s\n", fingerprint);
+ continue;
+ };
+
+ /* remove any other entry */
+ if (unlink(rfname))
+ return -1;
+ }
+
+ ret = symlink(".revoked.", rfname);
+ if (ret)
+ return ret;
+
+ if (!quiet)
+ fprintf(stdout, "created revoker deadlink for key %s\n", fingerprint);
+ };
+
+ return ret;
}
+/* load and verify certfile (and message) */
static int cert_verify(const char *certfile, const char *pubkeyfile, const char *pubkeydir, const char *msgfile) {
static LIST_HEAD(certchain);
return chain_verify(msgfile, pubkeyfile, pubkeydir, &certchain);
}
+/* output help */
static int usage(const char *cmd)
{
fprintf(stderr,
"Usage: %s <command> <options>\n"
"Commands:\n"
- " -A: append (needs -c and -p and/or -x)\n"
- " -D: dump\n"
+ " -A: append signature (needs -c and -x)\n"
+ " -D: dump (needs -c)\n"
" -I: issue cert and revoker (needs -c and -p and -s)\n"
- " -R: process revoker certificate (needs -c)\n"
- " -V: verify (needs -c and -p|-P)\n"
+ " -R: process revoker certificate (needs -c and -P)\n"
+ " -V: verify (needs -c and -p|-P, may have -m)\n"
"Options:\n"
" -c <file>: certificate file\n"
" -m <file>: message file (verify only)\n"
return 1;
}
+/* parse command line options and call functions */
int main(int argc, char *argv[]) {
int ch;
const char *msgfile = NULL;
case 'P':
pubkeydir = optarg;
break;
- case 's':
- seckeyfile = optarg;
- break;
case 'q':
quiet = true;
break;
+ case 's':
+ seckeyfile = optarg;
+ break;
case 'x':
sigfile = optarg;
break;
switch (cmd) {
case CMD_APPEND:
- if (certfile && (pubkeyfile || sigfile))
- return cert_append(certfile, pubkeyfile, sigfile);
+ if (certfile && sigfile)
+ return cert_append(certfile, sigfile);
else
return usage(argv[0]);
case CMD_DUMP:
else
return usage(argv[0]);
case CMD_REVOKE:
- if (certfile)
- return cert_process_revoker(certfile);
+ if (certfile && pubkeydir)
+ return cert_process_revoker(certfile, pubkeydir);
else
return usage(argv[0]);
case CMD_VERIFY:
projects / oweals / ucert.git / blobdiff