diff options
| author | Werner Koch <[email protected]> | 2016-09-28 11:39:09 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-09-28 11:47:34 +0000 |
| commit | c9237bf2ba2c49588576dcece756ebf5fe89aada (patch) | |
| tree | e0d1300b99b4a94c2e61909c4d8d2160e853ec82 /g10/main.h | |
| parent | gpg: Make sure that internal key import is done with a binary stream. (diff) | |
| download | gnupg-c9237bf2ba2c49588576dcece756ebf5fe89aada.tar.gz gnupg-c9237bf2ba2c49588576dcece756ebf5fe89aada.zip | |
gpg: Make import filter data object more flexible.
* g10/main.h (import_filter_t): New.
* g10/import.c (struct import_filter_s): Declare struct.
(import_keep_uid, import_drop_sig): Replace by ...
(import_filter): new. Adjust all users.
(cleanup_import_globals): Move code to ...
(release_import_filter): new.
(save_and_clear_import_filter): New.
(restore_import_filter): New.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g10/main.h')
| -rw-r--r-- | g10/main.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/g10/main.h b/g10/main.h index b1563d26d..c2c92d03d 100644 --- a/g10/main.h +++ b/g10/main.h @@ -348,10 +348,16 @@ gcry_mpi_t encode_md_value (PKT_public_key *pk, /*-- import.c --*/ struct import_stats_s; typedef struct import_stats_s *import_stats_t; +struct import_filter_s; +typedef struct import_filter_s *import_filter_t; 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); +import_filter_t save_and_clear_import_filter (void); +void restore_import_filter (import_filter_t filt); + 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, |