diff options
| author | Werner Koch <wk@gnupg.org> | 2016-07-06 14:03:50 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2016-07-06 15:35:19 +0200 |
| commit | a479804c86bc24bfab101f39464db3ecfbaedf6d (patch) | |
| tree | 271ce0ff610431ecb0092d9cc017d27d37bd18d6 /g10/main.h | |
| parent | gpg: New option --no-keyring. (diff) | |
| download | gnupg2-a479804c86bc24bfab101f39464db3ecfbaedf6d.tar.xz gnupg2-a479804c86bc24bfab101f39464db3ecfbaedf6d.zip | |
gpg: New options --recipient-file and --hidden-recipient-file.
* g10/gpg.c (oRecipientFile, oHiddenRecipientFile): New.
(opts): Add options --recipient-file and --hidden-recipient-file.
(main): Implement them. Also remove duplicate code from similar
options.
* g10/keydb.h (PK_LIST_FROM_FILE): New.
(PK_LIST_SHIFT): Bump up.
* g10/pkclist.c (expand_group): Take care of PK_LIST_FROM_FILE.
(find_and_check_key): Add and implement arg FROM_FILE.
(build_pk_list): Pass new value for new arg.
* g10/getkey.c (get_pubkey_fromfile): New.
* g10/gpgv.c (read_key_from_file): New stub.
* g10/test-stubs.c (read_key_from_file): New stub.
* g10/server.c (cmd_recipient): Add flag --file.
* g10/import.c (read_key_from_file): New.
* tests/openpgp/defs.scm (key-file1): New.
(key-file2): New.
* tests/openpgp/setup.scm: Add their private keys and import the
key-file1.
* tests/openpgp/encrypt.scm: Add new test.
--
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'g10/main.h')
| -rw-r--r-- | g10/main.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/g10/main.h b/g10/main.h index 3ee276202..ec20b28df 100644 --- a/g10/main.h +++ b/g10/main.h @@ -350,6 +350,8 @@ typedef gpg_error_t (*import_screener_t)(kbnode_t keyblock, void *arg); int parse_import_options(char *str,unsigned int *options,int noisy); gpg_error_t parse_and_set_import_filter (const char *string); +gpg_error_t read_key_from_file (ctrl_t ctrl, const char *fname, + kbnode_t *r_keyblock); void import_keys (ctrl_t ctrl, char **fnames, int nnames, import_stats_t stats_hd, unsigned int options); int import_keys_stream (ctrl_t ctrl, iobuf_t inp, import_stats_t stats_hd, |