aboutsummaryrefslogtreecommitdiffstats
path: root/g10/main.h
diff options
context:
space:
mode:
Diffstat (limited to 'g10/main.h')
-rw-r--r--g10/main.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/g10/main.h b/g10/main.h
index 3b44b16c6..35b84618a 100644
--- a/g10/main.h
+++ b/g10/main.h
@@ -370,8 +370,10 @@ gpg_error_t parse_and_set_import_filter (const char *string);
import_filter_t save_and_clear_import_filter (void);
void restore_import_filter (import_filter_t filt);
-gpg_error_t read_key_from_file (ctrl_t ctrl, const char *fname,
- kbnode_t *r_keyblock);
+gpg_error_t read_key_from_file_or_buffer (ctrl_t ctrl, const char *fname,
+ const void *buffer, size_t buflen,
+ kbnode_t *r_keyblock);
+gpg_error_t import_included_key_block (ctrl_t ctrl, kbnode_t keyblock);
void import_keys (ctrl_t ctrl, char **fnames, int nnames,
import_stats_t stats_hd, unsigned int options,
int origin, const char *url);