Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add print fingerprint via -F feature #29

Closed
wants to merge 1 commit into from
Closed

Add print fingerprint via -F feature #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 43 additions & 3 deletions signify.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ usage(const char *error)
"\t%1$s -G [-n] [-c comment] -p pubkey -s seckey\n"
"\t%1$s -S [-enz] [-x sigfile] -s seckey -m message\n"
#endif
"\t%1$s -V [-eqz] [-p pubkey] [-t keytype] [-x sigfile] -m message\n",
"\t%1$s -V [-eqz] [-p pubkey] [-t keytype] [-x sigfile] -m message\n"
"\t%1$s -F [-p pubkey] [-s seckey ] [-x sigfile]\n",
getprogname());
exit(1);
}
Expand Down Expand Up @@ -547,6 +548,35 @@ verifysimple(const char *pubkeyfile, const char *msgfile, const char *sigfile,
free(msg);
}

static int
fingerprint(const char *seckeyfile, const char *pubkeyfile, const char *sigfile)
{
struct sig sig;
struct pubkey pubkey;
struct enckey enckey;
uint8_t *fp;

if (seckeyfile) {
readb64file(seckeyfile, &enckey, sizeof(enckey), NULL);
fp = enckey.keynum;
} else if (pubkeyfile) {
readb64file(pubkeyfile, &pubkey, sizeof(pubkey), NULL);
fp = pubkey.keynum;
} else if (sigfile) {
readb64file(sigfile, &sig, sizeof(sig), NULL);
fp = sig.keynum;
} else
return 1;

int i;
for (i = 0; i < KEYNUMLEN; i++)
{
fprintf(stdout, "%02x", fp[i]);
}
fprintf(stdout, "\n");
return 0;
}

static uint8_t *
verifyembedded(const char *pubkeyfile, const char *sigfile,
int quiet, unsigned long long *msglenp, const char *keytype)
Expand Down Expand Up @@ -769,13 +799,14 @@ main(int argc, char **argv)
CHECK,
GENERATE,
SIGN,
VERIFY
VERIFY,
FINGERPRINT
} verb = NONE;

if (pledge("stdio rpath wpath cpath tty", NULL) == -1)
err(1, "pledge");

while ((ch = getopt(argc, argv, "CGSVzc:em:np:qs:t:x:")) != -1) {
while ((ch = getopt(argc, argv, "CGSVFzc:em:np:qs:t:x:")) != -1) {
switch (ch) {
#ifndef VERIFYONLY
case 'C':
Expand All @@ -802,6 +833,11 @@ main(int argc, char **argv)
usage(NULL);
verb = VERIFY;
break;
case 'F':
if (verb)
usage(NULL);
verb = FINGERPRINT;
break;
case 'c':
comment = optarg;
break;
Expand Down Expand Up @@ -909,6 +945,10 @@ main(int argc, char **argv)
quiet, keytype);
}
break;
case FINGERPRINT:
if (!!seckeyfile + !!pubkeyfile + !!sigfile != 1)
usage("Need one secret/public key or signature");
return fingerprint(seckeyfile, pubkeyfile, sigfile);
default:
if (pledge("stdio", NULL) == -1)
err(1, "pledge");
Expand Down