mirrors/minisign
1
0
Fork 0
mirror of https://github.com/jedisct1/minisign.git synced 2025-04-05 20:07:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

Action to identify keys used in various file types

Browse source
This commit is contained in:
User 2022-03-16 00:00:50 -05:00
parent 4b2df2ee07
commit cea718b451
2 changed files with 42 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/minisign.c
View file

@ -18,9 +18,9 @@
#include "minisign.h" #include "minisign.h"
#ifndef VERIFY_ONLY #ifndef VERIFY_ONLY
static const char *getopt_options = "GSVRHhc:flm:oP:p:qQs:t:vx:"; static const char *getopt_options = "GSVkRHhc:flm:oP:p:qQs:t:vx:";
#else #else
static const char *getopt_options = "VhHm:oP:p:qQvx:"; static const char *getopt_options = "VkhHm:oP:p:qQvx:";
#endif #endif
static void usage(void) __attribute__((noreturn)); static void usage(void) __attribute__((noreturn));
@ -48,6 +48,7 @@ usage(void)
"-S sign files\n" "-S sign files\n"
#endif #endif
"-V verify that a signature is valid for a given file\n" "-V verify that a signature is valid for a given file\n"
"-k print the key_id of the other key file, signature, or signed file parameters\n"
"-l sign using the legacy format\n" "-l sign using the legacy format\n"
"-m <file> file to sign/verify\n" "-m <file> file to sign/verify\n"
"-o combined with -V, output the file content after verification\n" "-o combined with -V, output the file content after verification\n"
@ -783,10 +784,12 @@ main(int argc, char **argv)
unsigned char opt_seen[16] = { 0 }; unsigned char opt_seen[16] = { 0 };
int opt_flag; int opt_flag;
int quiet = 0; int quiet = 0;
int count = 0;
int output = 0; int output = 0;
int force = 0; int force = 0;
int allow_legacy = 1; int allow_legacy = 1;
int sign_legacy = 0; int sign_legacy = 0;
int sk_file_flag = 0;
Action action = ACTION_NONE; Action action = ACTION_NONE;
while ((opt_flag = getopt(argc, argv, getopt_options)) != -1) { while ((opt_flag = getopt(argc, argv, getopt_options)) != -1) {
@ -817,6 +820,12 @@ main(int argc, char **argv)
} }
action = ACTION_VERIFY; action = ACTION_VERIFY;
break; break;
case 'k':
if (action != ACTION_NONE && action != ACTION_IDENTIFY) {
usage();
}
action = ACTION_IDENTIFY;
break;
#ifndef VERIFY_ONLY #ifndef VERIFY_ONLY
case 'c': case 'c':
comment = optarg; comment = optarg;
@ -855,6 +864,7 @@ main(int argc, char **argv)
case 's': case 's':
free(sk_file); free(sk_file);
sk_file = xstrdup(optarg); sk_file = xstrdup(optarg);
sk_file_flag = 1;
break; break;
case 't': case 't':
trusted_comment = optarg; trusted_comment = optarg;
@ -924,6 +934,35 @@ main(int argc, char **argv)
} }
return verify(pubkey_load(pk_file, pubkey_s), message_file, sig_file, quiet, output, return verify(pubkey_load(pk_file, pubkey_s), message_file, sig_file, quiet, output,
allow_legacy); allow_legacy);
case ACTION_IDENTIFY:
if (pk_file != NULL || pubkey_s != NULL) {
PubkeyStruct *pubkey_struct = pubkey_load(pk_file, pubkey_s);
fprintf(stdout, "%" PRIX64 "\n", le64_load(pubkey_struct->keynum_pk.keynum));
count++;
}
#ifndef VERIFY_ONLY
if (sk_file_flag) {
SeckeyStruct *seckey_struct = seckey_load(sk_file);
fprintf(stdout, "%" PRIX64 "\n", le64_load(seckey_struct->keynum_sk.keynum));
count++;
}
#endif
if (message_file != NULL) {
sig_file = append_sig_suffix(message_file);
}
if (sig_file != NULL) {
char trusted_comment[TRUSTEDCOMMENTMAXBYTES];
unsigned char global_sig[crypto_sign_BYTES];
int hashed;
SigStruct *sig_struct = sig_load(sig_file, global_sig, &hashed, trusted_comment, sizeof trusted_comment);
fprintf(stdout, "%" PRIX64 "\n", le64_load(sig_struct->keynum));
count++;
}
if (count == 0) {
usage();
}
return 0;
default: default:
usage(); usage();
} }

1
src/minisign.h
View file

@ -58,6 +58,7 @@ typedef enum Action_ {
ACTION_GENERATE, ACTION_GENERATE,
ACTION_SIGN, ACTION_SIGN,
ACTION_VERIFY, ACTION_VERIFY,
ACTION_IDENTIFY,
ACTION_RECREATE_PK ACTION_RECREATE_PK
} Action; } Action;