security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

wks: Allow reading of --install-key arguments from stdin.

Browse source 
* tools/wks-util.c (install_key_from_spec_file): New.
(wks_cmd_install_key): Call it.
* tools/gpg-wks-client.c (main): Allow --install-key w/o arguments.
* tools/gpg-wks-server.c (main): Ditto.

Signed-off-by: Werner Koch <wk@gnupg.org>
(cherry picked from commit ba46a359b9)
This commit is contained in:
Werner Koch 2018-12-04 15:27:19 +01:00
parent bf29d7c822
commit b6fd60dfa1
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
4 changed files with 81 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tools/gpg-wks-server.c
View file

@ -381,9 +381,12 @@ main (int argc, char **argv)
break;
case aInstallKey:
if (argc != 2)
wrong_args ("--install-key FILE USER-ID");
err = wks_cmd_install_key (*argv, argv[1]);
if (!argc)
err = wks_cmd_install_key (NULL, NULL);
else if (argc == 2)
err = wks_cmd_install_key (*argv, argv[1]);
else
wrong_args ("--install-key [FILE|FINGERPRINT USER-ID]");
break;
case aRemoveKey: