} cmd = CMD_NONE;
static bool quiet;
+#ifndef UCERT_STRIP_MESSAGES
+#define DPRINTF(format, ...) \
+ do { \
+ if (!quiet) \
+ fprintf(stderr, "%s(%d): " format, __func__, __LINE__, ## __VA_ARGS__); \
+ } while (0)
+#else
+#define DPRINTF(format, ...) do { } while (0)
+#endif
+/*
+ * 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[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 cert_object *cobj;
char filebuf[CERT_BUF_LEN];
int ret = 0, pret = 0;
- int len, pos = 0;
+ size_t len, pos = 0;
f = fopen(certfile, "r");
if (!f)
else
pos += blob_pad_len(bufpt);
+ if (!certtb[CERT_ATTR_SIGNATURE])
+ /* no signature -> drop */
+ break;
+
cobj = calloc(1, sizeof(*cobj));
- memcpy(cobj->cert, &certtb, sizeof(certtb));
+ cobj->cert[CERT_ATTR_SIGNATURE] = blob_memdup(certtb[CERT_ATTR_SIGNATURE]);
+ if (certtb[CERT_ATTR_PAYLOAD])
+ cobj->cert[CERT_ATTR_PAYLOAD] = blob_memdup(certtb[CERT_ATTR_PAYLOAD]);
+
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));
+ } while(len > pos + sizeof(struct blob_attr) && (bufpt = blob_next(bufpt)));
return (ret <= 0);
}
+#ifdef UCERT_FULL
+/* 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;
+ struct blob_buf sigbuf = {0};
int len;
int ret;
blob_buf_free(&sigbuf);
return ret;
}
+#endif
+/* 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;
+ struct timeval tv;
if (mkdtemp(tmpdir) == NULL)
return errno;
if (msgfile)
checkmsg = -1;
+ gettimeofday(&tv, NULL);
+
list_for_each_entry(cobj, chain, list) {
/* blob has payload, verify that using signature */
if (cobj->cert[CERT_ATTR_PAYLOAD]) {
- struct timeval tv;
- uint64_t validfrom;
- uint64_t expiresat;
+ time_t validfrom;
+ time_t expiresat;
uint32_t certtype;
ret = cert_verify_blob(cobj->cert, chainedpubkey[0]?chainedpubkey:pubkeyfile, pubkeydir);
blob_len(cobj->cert[CERT_ATTR_PAYLOAD]));
if (!containertb[CERT_CT_ATTR_PAYLOAD]) {
ret = 1;
- fprintf(stderr, "no ucert in signed payload\n");
+ DPRINTF("no ucert in signed payload\n");
goto clean_and_return;
}
blobmsg_parse(cert_payload_policy,
!payloadtb[CERT_PL_ATTR_EXPIRETIME] ||
!payloadtb[CERT_PL_ATTR_PUBKEY]) {
ret = 1;
- fprintf(stderr, "missing mandatory ucert attributes\n");
+ DPRINTF("missing mandatory ucert attributes\n");
goto clean_and_return;
}
certtype = blobmsg_get_u32(payloadtb[CERT_PL_ATTR_CERTTYPE]);
if (certtype != CERTTYPE_AUTH) {
ret = 2;
- fprintf(stderr, "wrong certificate type\n");
+ DPRINTF("wrong certificate type\n");
goto clean_and_return;
}
- gettimeofday(&tv, NULL);
if (tv.tv_sec < validfrom ||
tv.tv_sec >= expiresat) {
ret = 3;
- fprintf(stderr, "certificate expired\n");
+ DPRINTF("certificate expired\n");
goto clean_and_return;
}
blobmsg_data(payloadtb[CERT_PL_ATTR_PUBKEY]),
blobmsg_data_len(payloadtb[CERT_PL_ATTR_PUBKEY]),
false);
+
+ if (usign_f_pubkey(chainedfp, chainedpubkey)) {
+ DPRINTF("cannot get fingerprint for chained key\n");
+ ret = 2;
+ goto clean_and_return;
+ }
+ if (pubkeydir && _usign_key_is_revoked(chainedfp, pubkeydir)) {
+ DPRINTF("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) {
pubkeydir, extsigfile, quiet);
unlink(extsigfile);
} else {
- fprintf(stderr, "stray trailing signature without anything to verify!\n");
+ DPRINTF("stray trailing signature without anything to verify!\n");
ret = 1;
};
}
}
if (checkmsg == -1)
- fprintf(stderr, "missing signature to verify message!\n");
+ DPRINTF("missing signature to verify message!\n");
clean_and_return:
if (chainedpubkey[0])
return ret | checkmsg;
}
+#ifdef UCERT_FULL
+/* dump single chain element to console */
static void cert_dump_blob(struct blob_attr *cert[CERT_ATTR_MAX]) {
int i;
}
}
+/* 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");
+ DPRINTF("cannot parse cert\n");
return 1;
}
list_for_each_entry(cobj, &certchain, list) {
- fprintf(stderr, "=== CHAIN ELEMENT %02u ===\n", ++count);
+ fprintf(stdout, "=== 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;
+ struct blob_buf payloadbuf = {0};
+ struct blob_buf certbuf = {0};
struct timeval tv;
- struct stat st;
int pklen, siglen;
int revoker = 1;
void *c;
FILE *pkf, *sigf;
char pkb[512];
- char sigb[512];
+ char sigb[1024];
char fname[256], sfname[256];
char pkfp[17];
char tmpdir[] = "/tmp/ucert-XXXXXX";
- if (stat(certfile, &st) == 0) {
- fprintf(stderr, "certfile %s exists, won't overwrite.\n", certfile);
- return -1;
- }
-
pkf = fopen(pubkeyfile, "r");
if (!pkf)
return -1;
blob_put(&certbuf, CERT_ATTR_SIGNATURE, sigb, siglen);
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);
+ write_file(fname, certbuf.head, blob_raw_len(certbuf.head), true);
blob_buf_free(&certbuf);
blob_buf_free(&payloadbuf);
return 0;
}
+#endif
+/* 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 *payloadtb[CERT_PL_ATTR_MAX];
struct stat st;
struct timeval tv;
- uint64_t validfrom;
- uint32_t certtype;
+ time_t validfrom;
+ enum certtype_id certtype;
char *fingerprint;
char rfname[512];
int ret;
if (cert_load(certfile, &certchain)) {
- fprintf(stderr, "cannot parse cert\n");
+ DPRINTF("cannot parse cert\n");
return 1;
}
+ gettimeofday(&tv, NULL);
+
list_for_each_entry(cobj, &certchain, list) {
- /* blob has payload, verify that using signature */
if (!cobj->cert[CERT_ATTR_PAYLOAD])
return 2;
+
+ /* blob has payload, verify that using signature */
ret = cert_verify_blob(cobj->cert, NULL, pubkeydir);
if (ret)
return ret;
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");
+ DPRINTF("no ucert in signed payload\n");
return 2;
}
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;
- }
+ DPRINTF("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");
+ DPRINTF("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) {
- char tml[64] = {0};
- /* if it's an existing revoker deadlink we are happy */
- if (readlink(rfname, tml, sizeof(tml)) > 0 &&
- !strcmp(tml, ".revoked.")) {
- if (!quiet)
- fprintf(stdout, "existing revoker deadlink for key %s\n", fingerprint);
+ if (_usign_key_is_revoked(fingerprint, pubkeydir)) {
+ DPRINTF("existing revoker deadlink for key %s\n", fingerprint);
continue;
};
if (ret)
return ret;
- if (!quiet)
- fprintf(stdout, "created revoker deadlink for key %s\n", fingerprint);
+ DPRINTF("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);
if (cert_load(certfile, &certchain)) {
- fprintf(stderr, "cannot parse cert\n");
+ DPRINTF("cannot parse cert\n");
return 1;
}
return chain_verify(msgfile, pubkeyfile, pubkeydir, &certchain);
}
+/* output help */
static int usage(const char *cmd)
{
+#ifndef UCERT_STRIP_MESSAGES
fprintf(stderr,
"Usage: %s <command> <options>\n"
"Commands:\n"
+#ifdef UCERT_FULL
" -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"
+#endif /* UCERT_FULL */
" -R: process revoker certificate (needs -c and -P)\n"
" -V: verify (needs -c and -p|-P, may have -m)\n"
"Options:\n"
" -p <file>: public key file\n"
" -P <path>: public key directory (verify only)\n"
" -q: quiet (do not print verification result, use return code only)\n"
+#ifdef UCERT_FULL
" -s <file>: secret key file (issue only)\n"
- " -x <file>: signature file\n"
+ " -x <file>: signature file (append only)\n"
+#endif /* UCERT_FULL */
"\n",
cmd);
+#endif /* UCERT_STRIP_MESSAGES */
return 1;
}
+/* parse command line options and call functions */
int main(int argc, char *argv[]) {
int ch;
const char *msgfile = NULL;
- const char *sigfile = NULL;
const char *pubkeyfile = NULL;
const char *pubkeydir = NULL;
const char *certfile = NULL;
+#ifdef UCERT_FULL
+ const char *sigfile = NULL;
const char *seckeyfile = NULL;
+#endif
quiet = false;
- while ((ch = getopt(argc, argv, "ADIRVc:m:p:P:qs:x:")) != -1) {
+ while ((ch = getopt(argc, argv,
+ "RVc:m:p:P:q"
+#ifdef UCERT_FULL
+ "ADIs:x:"
+#endif
+ )) != -1) {
switch (ch) {
+#ifdef UCERT_FULL
case 'A':
+ if (cmd != CMD_NONE)
+ return usage(argv[0]);
cmd = CMD_APPEND;
break;
case 'D':
+ if (cmd != CMD_NONE)
+ return usage(argv[0]);
cmd = CMD_DUMP;
break;
case 'I':
+ if (cmd != CMD_NONE)
+ return usage(argv[0]);
cmd = CMD_ISSUE;
break;
+#endif
case 'R':
+ if (cmd != CMD_NONE)
+ return usage(argv[0]);
cmd = CMD_REVOKE;
break;
case 'V':
+ if (cmd != CMD_NONE)
+ return usage(argv[0]);
cmd = CMD_VERIFY;
break;
case 'c':
+ if (certfile || cmd == CMD_NONE)
+ return usage(argv[0]);
certfile = optarg;
break;
case 'm':
+ if (msgfile || cmd != CMD_VERIFY)
+ return usage(argv[0]);
msgfile = optarg;
break;
case 'p':
+ if (pubkeyfile || (cmd != CMD_VERIFY && cmd != CMD_ISSUE) || cmd == CMD_NONE)
+ return usage(argv[0]);
pubkeyfile = optarg;
break;
case 'P':
+ if (pubkeydir || (cmd != CMD_VERIFY && cmd != CMD_REVOKE) || cmd == CMD_NONE)
+ return usage(argv[0]);
pubkeydir = optarg;
break;
case 'q':
+ if (quiet)
+ return usage(argv[0]);
quiet = true;
break;
+#ifdef UCERT_FULL
case 's':
+ if (seckeyfile || cmd != CMD_ISSUE || cmd == CMD_NONE)
+ return usage(argv[0]);
seckeyfile = optarg;
break;
case 'x':
+ if (sigfile || cmd != CMD_APPEND || cmd == CMD_NONE)
+ return usage(argv[0]);
sigfile = optarg;
break;
+#endif
default:
return usage(argv[0]);
}
}
switch (cmd) {
+#ifdef UCERT_FULL
case CMD_APPEND:
if (certfile && sigfile)
return cert_append(certfile, sigfile);
return cert_issue(certfile, pubkeyfile, seckeyfile);
else
return usage(argv[0]);
+#endif
case CMD_REVOKE:
if (certfile && pubkeydir)
return cert_process_revoker(certfile, pubkeydir);
return cert_verify(certfile, pubkeyfile, pubkeydir, msgfile);
else
return usage(argv[0]);
- case CMD_NONE:
+ default:
return usage(argv[0]);
}
projects / project / ucert.git / blobdiff