mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
gpg: Auto-migrate existing secring.gpg.
* g10/migrate.c: New. * g10/import.c (import_old_secring): New. (import_one): Add arg silent. (transfer_secret_keys): Add arg batch. (import_secret_one): Add args batch and for_migration. * g10/gpg.c (main): Call migration function.
This commit is contained in:
parent
09a2d4ec74
commit
4f0625889b
7 changed files with 274 additions and 62 deletions
|
@ -290,6 +290,7 @@ int import_keys_stream (ctrl_t ctrl, iobuf_t inp, void *stats_hd,
|
|||
int import_keys_es_stream (ctrl_t ctrl, estream_t fp, void *stats_handle,
|
||||
unsigned char **fpr, size_t *fpr_len,
|
||||
unsigned int options);
|
||||
gpg_error_t import_old_secring (ctrl_t ctrl, const char *fname);
|
||||
void *import_new_stats_handle (void);
|
||||
void import_release_stats_handle (void *p);
|
||||
void import_print_stats (void *hd);
|
||||
|
@ -379,4 +380,8 @@ int card_store_subkey (KBNODE node, int use);
|
|||
|
||||
#define S2K_DECODE_COUNT(_val) ((16ul + ((_val) & 15)) << (((_val) >> 4) + 6))
|
||||
|
||||
/*-- migrate.c --*/
|
||||
void migrate_secring (ctrl_t ctrl);
|
||||
|
||||
|
||||
#endif /*G10_MAIN_H*/
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue