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

Factorize

Browse source
This commit is contained in:
Frank Denis 2017-03-11 11:11:12 +01:00
parent 81c9d95930
commit ab55b98c34
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/minisign.c
View file

@ -276,6 +276,9 @@ pubkey_load_file(const char *pk_file)
static PubkeyStruct *
pubkey_load(const char *pk_file, const char *pubkey_s)
{
if (pk_file != NULL && pubkey_s != NULL) {
exit_msg("A public key cannot be provided both inline and as a file");
}
if (pubkey_s != NULL) {
return pubkey_load_string(pubkey_s);
} else if (pk_file != NULL) {
@ -813,9 +816,6 @@ main(int argc, char **argv)
if (sig_file == NULL || *sig_file == 0) {
sig_file = append_sig_suffix(message_file);
}
if (pk_file != NULL && pubkey_s != NULL) {
usage();
}
if (comment == NULL || *comment == 0) {
comment = DEFAULT_COMMENT;
}
@ -837,8 +837,6 @@ main(int argc, char **argv)
}
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,
sig_file, quiet, output) != 0;