From 0f5b105d96780a29cc58893285e6c38482e0cc2d Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 12 Jul 2016 13:59:10 +0200 Subject: gpg: Move a function from import.c to export.c. * g10/import.c (write_keyblock_to_output): Move to ... * g10/export.c (write_keyblock_to_output): here. Add arg WITH_ARMOR. Also make sure never to export ring trust packets. --- g10/main.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'g10/main.h') diff --git a/g10/main.h b/g10/main.h index ec20b28df..92a26a7ed 100644 --- a/g10/main.h +++ b/g10/main.h @@ -396,9 +396,12 @@ gpg_error_t export_pubkey_buffer (ctrl_t ctrl, const char *keyspec, gpg_error_t receive_seckey_from_agent (ctrl_t ctrl, gcry_cipher_hd_t cipherhd, int cleartext, - char **cache_nonce_addr, const char *hexgrip, + char **cache_nonce_addr, + const char *hexgrip, PKT_public_key *pk); +gpg_error_t write_keyblock_to_output (kbnode_t keyblock, int with_armor); + gpg_error_t export_ssh_key (ctrl_t ctrl, const char *userid); /*-- dearmor.c --*/ -- cgit v1.2.3