Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This work was sponsored by WIO (wiowireless.com)
find_library(json NAMES json-c json)
ADD_EXECUTABLE(ucert ucert.c usign-exec.c)
find_library(json NAMES json-c json)
ADD_EXECUTABLE(ucert ucert.c usign-exec.c)
+IF(UCERT_FULL)
+ADD_DEFINITIONS(-DUCERT_FULL)
TARGET_LINK_LIBRARIES(ucert ubox blobmsg_json ${json})
TARGET_LINK_LIBRARIES(ucert ubox blobmsg_json ${json})
+ELSE()
+ADD_DEFINITIONS(-DUCERT_STRIP_MESSAGES)
+TARGET_LINK_LIBRARIES(ucert ubox)
+ENDIF()
+
INSTALL(TARGETS ucert RUNTIME DESTINATION bin)
INSTALL(TARGETS ucert RUNTIME DESTINATION bin)
} cmd = CMD_NONE;
static bool quiet;
} cmd = CMD_NONE;
static bool quiet;
+#ifndef UCERT_STRIP_MESSAGES
+#define DPRINTF(format, ...) if (!quiet) fprintf(stderr, "%s(%d): " format, __func__, __LINE__, ## __VA_ARGS__)
+#else
+#define DPRINTF(format, ...)
+#endif
/* append signature to certfile */
static int cert_append(const char *certfile, const char *sigfile) {
FILE *fs;
/* append signature to certfile */
static int cert_append(const char *certfile, const char *sigfile) {
FILE *fs;
blob_buf_free(&sigbuf);
return ret;
}
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],
/* verify the signature of a single chain element */
static int cert_verify_blob(struct blob_attr *cert[CERT_ATTR_MAX],
blob_len(cobj->cert[CERT_ATTR_PAYLOAD]));
if (!containertb[CERT_CT_ATTR_PAYLOAD]) {
ret = 1;
blob_len(cobj->cert[CERT_ATTR_PAYLOAD]));
if (!containertb[CERT_CT_ATTR_PAYLOAD]) {
ret = 1;
- if (!quiet)
- fprintf(stderr, "no ucert in signed payload\n");
+ DPRINTF("no ucert in signed payload\n");
goto clean_and_return;
}
blobmsg_parse(cert_payload_policy,
goto clean_and_return;
}
blobmsg_parse(cert_payload_policy,
!payloadtb[CERT_PL_ATTR_EXPIRETIME] ||
!payloadtb[CERT_PL_ATTR_PUBKEY]) {
ret = 1;
!payloadtb[CERT_PL_ATTR_EXPIRETIME] ||
!payloadtb[CERT_PL_ATTR_PUBKEY]) {
ret = 1;
- if (!quiet)
- 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]);
goto clean_and_return;
}
certtype = blobmsg_get_u32(payloadtb[CERT_PL_ATTR_CERTTYPE]);
if (certtype != CERTTYPE_AUTH) {
ret = 2;
if (certtype != CERTTYPE_AUTH) {
ret = 2;
- if (!quiet)
- fprintf(stderr, "wrong certificate type\n");
+ DPRINTF("wrong certificate type\n");
goto clean_and_return;
}
if (tv.tv_sec < validfrom ||
tv.tv_sec >= expiresat) {
ret = 3;
goto clean_and_return;
}
if (tv.tv_sec < validfrom ||
tv.tv_sec >= expiresat) {
ret = 3;
- if (!quiet)
- fprintf(stderr, "certificate expired\n");
+ DPRINTF("certificate expired\n");
false);
if (usign_f_pubkey(chainedfp, chainedpubkey)) {
false);
if (usign_f_pubkey(chainedfp, chainedpubkey)) {
- if (!quiet)
- fprintf(stderr, "cannot get fingerprint for chained key\n");
+ DPRINTF("cannot get fingerprint for chained key\n");
ret = 2;
goto clean_and_return;
}
if (pubkeydir && _usign_key_is_revoked(chainedfp, pubkeydir)) {
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);
+ DPRINTF("key %s has been revoked!\n", chainedfp);
ret = 4;
goto clean_and_return;
}
ret = 4;
goto clean_and_return;
}
pubkeydir, extsigfile, quiet);
unlink(extsigfile);
} else {
pubkeydir, extsigfile, quiet);
unlink(extsigfile);
} else {
- if (!quiet)
- fprintf(stderr, "stray trailing signature without anything to verify!\n");
+ DPRINTF("stray trailing signature without anything to verify!\n");
- if (checkmsg == -1 && !quiet)
- fprintf(stderr, "missing signature to verify message!\n");
+ if (checkmsg == -1)
+ DPRINTF("missing signature to verify message!\n");
clean_and_return:
if (chainedpubkey[0])
clean_and_return:
if (chainedpubkey[0])
/* dump single chain element to console */
static void cert_dump_blob(struct blob_attr *cert[CERT_ATTR_MAX]) {
int i;
/* dump single chain element to console */
static void cert_dump_blob(struct blob_attr *cert[CERT_ATTR_MAX]) {
int i;
unsigned int count = 0;
if (cert_load(certfile, &certchain)) {
unsigned int count = 0;
if (cert_load(certfile, &certchain)) {
- if (!quiet)
- fprintf(stderr, "cannot parse cert\n");
+ DPRINTF("cannot parse cert\n");
/* process revoker certificate */
static int cert_process_revoker(const char *certfile, const char *pubkeydir) {
/* process revoker certificate */
static int cert_process_revoker(const char *certfile, const char *pubkeydir) {
int ret;
if (cert_load(certfile, &certchain)) {
int ret;
if (cert_load(certfile, &certchain)) {
- if (!quiet)
- fprintf(stderr, "cannot parse cert\n");
+ DPRINTF("cannot parse cert\n");
blob_data(cobj->cert[CERT_ATTR_PAYLOAD]),
blob_len(cobj->cert[CERT_ATTR_PAYLOAD]));
if (!containertb[CERT_CT_ATTR_PAYLOAD]) {
blob_data(cobj->cert[CERT_ATTR_PAYLOAD]),
blob_len(cobj->cert[CERT_ATTR_PAYLOAD]));
if (!containertb[CERT_CT_ATTR_PAYLOAD]) {
- if (!quiet)
- fprintf(stderr, "no ucert in signed payload\n");
+ DPRINTF("no ucert in signed payload\n");
if (!payloadtb[CERT_PL_ATTR_CERTTYPE] ||
!payloadtb[CERT_PL_ATTR_VALIDFROMTIME] ||
!payloadtb[CERT_PL_ATTR_KEY_FINGERPRINT]) {
if (!payloadtb[CERT_PL_ATTR_CERTTYPE] ||
!payloadtb[CERT_PL_ATTR_VALIDFROMTIME] ||
!payloadtb[CERT_PL_ATTR_KEY_FINGERPRINT]) {
- if (!quiet)
- fprintf(stderr, "missing mandatory ucert attributes\n");
+ DPRINTF("missing mandatory ucert attributes\n");
fingerprint = blobmsg_get_string(payloadtb[CERT_PL_ATTR_KEY_FINGERPRINT]);
if (certtype != CERTTYPE_REVOKE) {
fingerprint = blobmsg_get_string(payloadtb[CERT_PL_ATTR_KEY_FINGERPRINT]);
if (certtype != CERTTYPE_REVOKE) {
- if (!quiet)
- fprintf(stderr, "wrong certificate type\n");
+ DPRINTF("wrong certificate type\n");
/* check if entry in pubkeydir exists */
if (stat(rfname, &st) == 0) {
if (_usign_key_is_revoked(fingerprint, pubkeydir)) {
/* 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);
+ DPRINTF("existing revoker deadlink for key %s\n", fingerprint);
- if (!quiet)
- fprintf(stdout, "created revoker deadlink for key %s\n", fingerprint);
+ DPRINTF("created revoker deadlink for key %s\n", fingerprint);
static LIST_HEAD(certchain);
if (cert_load(certfile, &certchain)) {
static LIST_HEAD(certchain);
if (cert_load(certfile, &certchain)) {
- if (!quiet)
- fprintf(stderr, "cannot parse cert\n");
+ DPRINTF("cannot parse cert\n");
/* output help */
static int usage(const char *cmd)
{
/* output help */
static int usage(const char *cmd)
{
+#ifndef UCERT_STRIP_MESSAGES
fprintf(stderr,
"Usage: %s <command> <options>\n"
"Commands:\n"
fprintf(stderr,
"Usage: %s <command> <options>\n"
"Commands:\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"
" -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 and -P)\n"
" -V: verify (needs -c and -p|-P, may have -m)\n"
"Options:\n"
" -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"
" -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"
" -s <file>: secret key file (issue only)\n"
" -s <file>: secret key file (issue only)\n"
- " -x <file>: signature file\n"
+ " -x <file>: signature file (append only)\n"
+#endif /* UCERT_FULL */
+#endif /* UCERT_STRIP_MESSAGES */
int main(int argc, char *argv[]) {
int ch;
const char *msgfile = NULL;
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;
const char *pubkeyfile = NULL;
const char *pubkeydir = NULL;
const char *certfile = NULL;
+#ifdef UCERT_FULL
+ const char *sigfile = NULL;
const char *seckeyfile = NULL;
const char *seckeyfile = NULL;
- 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) {
case 'A':
if (cmd != CMD_NONE)
return usage(argv[0]);
case 'A':
if (cmd != CMD_NONE)
return usage(argv[0]);
return usage(argv[0]);
cmd = CMD_ISSUE;
break;
return usage(argv[0]);
cmd = CMD_ISSUE;
break;
case 'R':
if (cmd != CMD_NONE)
return usage(argv[0]);
case 'R':
if (cmd != CMD_NONE)
return usage(argv[0]);
return usage(argv[0]);
quiet = true;
break;
return usage(argv[0]);
quiet = true;
break;
case 's':
if (seckeyfile || cmd != CMD_ISSUE || cmd == CMD_NONE)
return usage(argv[0]);
case 's':
if (seckeyfile || cmd != CMD_ISSUE || cmd == CMD_NONE)
return usage(argv[0]);
return usage(argv[0]);
sigfile = optarg;
break;
return usage(argv[0]);
sigfile = optarg;
break;
default:
return usage(argv[0]);
}
}
switch (cmd) {
default:
return usage(argv[0]);
}
}
switch (cmd) {
case CMD_APPEND:
if (certfile && sigfile)
return cert_append(certfile, sigfile);
case CMD_APPEND:
if (certfile && sigfile)
return cert_append(certfile, sigfile);
return cert_issue(certfile, pubkeyfile, seckeyfile);
else
return usage(argv[0]);
return cert_issue(certfile, pubkeyfile, seckeyfile);
else
return usage(argv[0]);
case CMD_REVOKE:
if (certfile && pubkeydir)
return cert_process_revoker(certfile, pubkeydir);
case CMD_REVOKE:
if (certfile && pubkeydir)
return cert_process_revoker(certfile, pubkeydir);
return cert_verify(certfile, pubkeyfile, pubkeydir, msgfile);
else
return usage(argv[0]);
return cert_verify(certfile, pubkeyfile, pubkeydir, msgfile);
else
return usage(argv[0]);
/*
* call usign -S ...
* return WEXITSTATUS or -1 if fork or execv fails
/*
* call usign -S ...
* return WEXITSTATUS or -1 if fork or execv fails
+#else
+int usign_s(const char *msgfile, const char *seckeyfile, const char *sigfile, bool quiet) {
+ return -1;
+};
+#endif
/*
* call usign -F ... and set fingerprint returned
/*
* call usign -F ... and set fingerprint returned