diff options
| author | NIIBE Yutaka <[email protected]> | 2015-12-18 01:02:38 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2015-12-18 01:02:38 +0000 |
| commit | b30c15bf7c5336c4abb1f9dcd974cd77ba6c61a7 (patch) | |
| tree | 5aba18cd194bd2b2436113eff817b3cd8e4ff5a1 /g10/main.h | |
| parent | g10: factor out a function for secret key retrieval. (diff) | |
| download | gnupg-b30c15bf7c5336c4abb1f9dcd974cd77ba6c61a7.tar.gz gnupg-b30c15bf7c5336c4abb1f9dcd974cd77ba6c61a7.zip | |
g10: Fix a regression for generating card key with backup.
* g10/main.h (receive_seckey_from_agent): Declare.
* g10/keygen.c (card_write_key_to_backup_file): New.
(card_store_key_with_backup): New.
(do_generate_keypair): Create a key on host for encryption key when
backup is requested. Then, call card_store_key_with_backup.
--
GnuPG-bug-id: 2169
Diffstat (limited to 'g10/main.h')
| -rw-r--r-- | g10/main.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/g10/main.h b/g10/main.h index e4c6e8fdd..60bbd24fe 100644 --- a/g10/main.h +++ b/g10/main.h @@ -363,6 +363,10 @@ gpg_error_t export_pubkey_buffer (ctrl_t ctrl, const char *keyspec, kbnode_t *r_keyblock, void **r_data, size_t *r_datalen); +gpg_error_t receive_seckey_from_agent (ctrl_t ctrl, gcry_cipher_hd_t cipherhd, + char **cache_nonce_addr, const char *hexgrip, + PKT_public_key *pk); + /*-- dearmor.c --*/ int dearmor_file( const char *fname ); int enarmor_file( const char *fname ); |