diff options
| author | Werner Koch <wk@gnupg.org> | 2014-06-05 11:19:59 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2014-06-05 11:19:59 +0200 |
| commit | 4f0625889b768eabdec52696bf15059a9e8d9c02 (patch) | |
| tree | f523eab5acb0666c12c067ba27a159e21f434aa7 /doc/gpg.texi | |
| parent | gpgsm: Fix commit be07ed65. (diff) | |
| download | gnupg2-4f0625889b768eabdec52696bf15059a9e8d9c02.tar.xz gnupg2-4f0625889b768eabdec52696bf15059a9e8d9c02.zip | |
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.
Diffstat (limited to 'doc/gpg.texi')
| -rw-r--r-- | doc/gpg.texi | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/doc/gpg.texi b/doc/gpg.texi index 71a3107d8..c8fae3a1b 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -3042,18 +3042,33 @@ files; They all live in in the current home directory (@pxref{option @table @file - @item ~/.gnupg/secring.gpg - The secret keyring. You should backup this file. - - @item ~/.gnupg/secring.gpg.lock - The lock file for the secret keyring. - @item ~/.gnupg/pubring.gpg The public keyring. You should backup this file. @item ~/.gnupg/pubring.gpg.lock The lock file for the public keyring. +@ifset gpgtwoone + @item ~/.gnupg/pubring.kbx + The public keyring using a different format. This file is sharred + with @command{gpgsm}. You should backup this file. + + @item ~/.gnupg/pubring.kbx.lock + The lock file for @file{pubring.kbx}. +@end ifset + + @item ~/.gnupg/secring.gpg +@ifclear gpgtwoone + The secret keyring. You should backup this file. +@end ifclear +@ifset gpgtwoone + A secret keyring as used by GnuPG versions before 2.1. It is not + used by GnuPG 2.1 and later. + + @item ~/.gnupg/.gpg-v21-migrated + File indicating that a migration to GnuPG 2.1 has taken place. +@end ifset + @item ~/.gnupg/trustdb.gpg The trust database. There is no need to backup this file; it is better to backup the ownertrust values (@pxref{option --export-ownertrust}). @@ -3064,6 +3079,9 @@ files; They all live in in the current home directory (@pxref{option @item ~/.gnupg/random_seed A file used to preserve the state of the internal random pool. + @item ~/.gnupg/secring.gpg.lock + The lock file for the secret keyring. + @item /usr[/local]/share/gnupg/options.skel The skeleton options file. |