diff options
| author | NIIBE Yutaka <[email protected]> | 2015-12-24 00:54:23 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2015-12-24 00:54:23 +0000 |
| commit | 40959add1ba0efc1f4aa87fa075fa42423eff73c (patch) | |
| tree | 1ef038237399cd9f1b7dbab6146ad8dbc4e3d8f5 /g10/main.h | |
| parent | agent: Support --force option for IMPORT_KEY. (diff) | |
| download | gnupg-40959add1ba0efc1f4aa87fa075fa42423eff73c.tar.gz gnupg-40959add1ba0efc1f4aa87fa075fa42423eff73c.zip | |
g10: fix regression of bkuptocard subcommand in --edit-key.
* g10/keyedit.c (keyedit_menu): Call transfer_secret_keys.
* g10/import.c (transfer_secret_keys): Make it global function.
Allow stats==NULL.
--
GnuPG-bug-id: 2169
Diffstat (limited to '')
| -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 c3a211407..06f2577ec 100644 --- a/g10/main.h +++ b/g10/main.h @@ -337,6 +337,8 @@ gpg_error_t import_old_secring (ctrl_t ctrl, const char *fname); import_stats_t import_new_stats_handle (void); void import_release_stats_handle (import_stats_t hd); void import_print_stats (import_stats_t hd); +gpg_error_t transfer_secret_keys (ctrl_t ctrl, struct import_stats_s *stats, + kbnode_t sec_keyblock, int batch); int collapse_uids( KBNODE *keyblock ); |