diff options
author | Werner Koch <[email protected]> | 2016-07-06 12:03:50 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2016-07-06 13:35:19 +0000 |
commit | a479804c86bc24bfab101f39464db3ecfbaedf6d (patch) | |
tree | 271ce0ff610431ecb0092d9cc017d27d37bd18d6 /g10/test-stubs.c | |
parent | gpg: New option --no-keyring. (diff) | |
download | gnupg-a479804c86bc24bfab101f39464db3ecfbaedf6d.tar.gz gnupg-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 <[email protected]>
Diffstat (limited to 'g10/test-stubs.c')
-rw-r--r-- | g10/test-stubs.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/g10/test-stubs.c b/g10/test-stubs.c index f4d952665..6f50759d5 100644 --- a/g10/test-stubs.c +++ b/g10/test-stubs.c @@ -228,6 +228,15 @@ keyserver_import_ldap (const char *name) return -1; } +gpg_error_t +read_key_from_file (ctrl_t ctrl, const char *fname, kbnode_t *r_keyblock) +{ + (void)ctrl; + (void)fname; + (void)r_keyblock; + return -1; +} + /* Stub: * No encryption here but mainproc links to these functions. */ |