diff options
| author | Werner Koch <[email protected]> | 2005-02-15 11:02:32 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2005-02-15 11:02:32 +0000 |
| commit | bb71180d07b0ce8a2293acf61541cf631f285012 (patch) | |
| tree | 895410ed291b16654608a02c407b93db7adba325 /doc/gpg.sgml | |
| parent | * curl-shim.c (curl_easy_perform): Fix compile warning. (diff) | |
| download | gnupg-bb71180d07b0ce8a2293acf61541cf631f285012.tar.gz gnupg-bb71180d07b0ce8a2293acf61541cf631f285012.zip | |
* gpg.sgml: Add bkuptocard command for --edit-key.
* passphrase.c (agent_get_passphrase): Don't call free_public_key
if PK is NULL.
(passphrase_clear_cache): Ditto. Removed debug output.
(passphrase_to_dek): Ditto.
Diffstat (limited to 'doc/gpg.sgml')
| -rw-r--r-- | doc/gpg.sgml | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/doc/gpg.sgml b/doc/gpg.sgml index 686fa888b..03a7eb841 100644 --- a/doc/gpg.sgml +++ b/doc/gpg.sgml @@ -1,6 +1,6 @@ <!-- gpg.sgml - the man page for GnuPG Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, - 2004 Free Software Foundation, Inc. + 2004, 2005 Free Software Foundation, Inc. This file is part of GnuPG. @@ -427,6 +427,18 @@ to store the key. Note that it is not possible to get that key back from the card - if the card gets broken your secret key will be lost unless you have a backup somewhere.</para></listitem></varlistentry> <varlistentry> + <term>bkuptocard &ParmFile;</term> + <listitem><para> +Restore the given file to a card. This command +may be used to restore a backup key (as generated during card +initialization) to a new card. In almost all cases this will be the +encryption key. You should use this command only +with the corresponding public key and make sure that the file +given as argument is indeed the backup to restore. You should +then select 2 to restore as encryption key. +You will first be asked to enter the passphrase of the backup key and +then for the Admin PIN of the card.</para></listitem></varlistentry> + <varlistentry> <term>delkey</term> <listitem><para> Remove a subkey.</para></listitem></varlistentry> |