diff options
| author | Werner Koch <wk@gnupg.org> | 2010-10-01 22:33:53 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2010-10-01 22:33:53 +0200 |
| commit | bfbd80feb95fba36292cd9dab43016f17b1e6972 (patch) | |
| tree | 9afbfd29e8aeb78fa34a1a49d8b8071554d4f593 /g10/decrypt.c | |
| parent | * options.skel: Make the example for force-v3-sigs match reality (it (diff) | |
| download | gnupg2-bfbd80feb95fba36292cd9dab43016f17b1e6972.tar.xz gnupg2-bfbd80feb95fba36292cd9dab43016f17b1e6972.zip | |
Exporting secret keys via gpg-agent is now basically supported.
A couple of forward ported changes.
Doc updates.
Diffstat (limited to 'g10/decrypt.c')
| -rw-r--r-- | g10/decrypt.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/g10/decrypt.c b/g10/decrypt.c index 210e1feec..595b2879e 100644 --- a/g10/decrypt.c +++ b/g10/decrypt.c @@ -43,7 +43,7 @@ * rejects files which don't begin with an encrypted message. */ int -decrypt_message (const char *filename) +decrypt_message (ctrl_t ctrl, const char *filename) { IOBUF fp; armor_filter_context_t *afx = NULL; @@ -86,7 +86,7 @@ decrypt_message (const char *filename) no_out = 1; opt.outfile = "-"; } - rc = proc_encryption_packets ( NULL, fp ); + rc = proc_encryption_packets (ctrl, NULL, fp ); if (no_out) opt.outfile = NULL; @@ -100,7 +100,7 @@ decrypt_message (const char *filename) /* Same as decrypt_message but takes a file descriptor for input and output. */ gpg_error_t -decrypt_message_fd (int input_fd, int output_fd) +decrypt_message_fd (ctrl_t ctrl, int input_fd, int output_fd) { gpg_error_t err; IOBUF fp; @@ -158,7 +158,7 @@ decrypt_message_fd (int input_fd, int output_fd) } } - err = proc_encryption_packets ( NULL, fp ); + err = proc_encryption_packets (ctrl, NULL, fp ); iobuf_close (fp); fclose (opt.outfp); @@ -170,7 +170,7 @@ decrypt_message_fd (int input_fd, int output_fd) void -decrypt_messages (int nfiles, char *files[]) +decrypt_messages (ctrl_t ctrl, int nfiles, char *files[]) { IOBUF fp; armor_filter_context_t *afx = NULL; @@ -251,7 +251,7 @@ decrypt_messages (int nfiles, char *files[]) push_armor_filter ( afx, fp ); } } - rc = proc_packets(NULL, fp); + rc = proc_packets (ctrl,NULL, fp); iobuf_close(fp); if (rc) log_error("%s: decryption failed: %s\n", print_fname_stdin(filename), |