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

Don't accept both -p and -P

Browse source
This commit is contained in:
Frank Denis 2015-06-09 14:09:02 +02:00
parent 9d96b1c12a
commit 65d4a25172
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/minisign.c
View file

@ -531,7 +531,7 @@ default_trusted_comment(const char *message_file)
int int
main(int argc, char **argv) main(int argc, char **argv)
{ {
const char *pk_file = SIG_DEFAULT_PKFILE; const char *pk_file = NULL;
const char *sk_file = SIG_DEFAULT_SKFILE; const char *sk_file = SIG_DEFAULT_SKFILE;
const char *sig_file = NULL; const char *sig_file = NULL;
const char *message_file = NULL; const char *message_file = NULL;
@ -600,6 +600,9 @@ main(int argc, char **argv)
if (comment == NULL || *comment == 0) { if (comment == NULL || *comment == 0) {
comment = SECRETKEY_DEFAULT_COMMENT; comment = SECRETKEY_DEFAULT_COMMENT;
} }
if (pk_file == NULL) {
pk_file = SIG_DEFAULT_PKFILE;
}
return generate(pk_file, sk_file, comment) != 0; return generate(pk_file, sk_file, comment) != 0;
case ACTION_SIGN: case ACTION_SIGN:
if (message_file == NULL) { if (message_file == NULL) {
@ -624,6 +627,11 @@ main(int argc, char **argv)
if (sig_file == NULL || *sig_file == 0) { if (sig_file == NULL || *sig_file == 0) {
sig_file = append_sig_suffix(message_file); sig_file = append_sig_suffix(message_file);
} }
if (pk_file == NULL && pubkey_s == NULL) {
pk_file = SIG_DEFAULT_PKFILE;
} else if (pk_file != NULL && pubkey_s == NULL) {
usage();
}
return verify(pubkey_load(pk_file, pubkey_s), message_file, return verify(pubkey_load(pk_file, pubkey_s), message_file,
sig_file, quiet) != 0; sig_file, quiet) != 0;
default: default: