GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2001-12-05 Marcus Brinkmann <marcus@g10code.de>

Browse Source 
* engine-gpgsm.c (gpgsm_set_fd): Accept one more argument OPT.
	(_gpgme_gpgsm_op_encrypt): Pass armor argument to gpgsm_set_fd for
	output descriptor.
	(_gpgme_gpgsm_op_sign): Likewise.
This commit is contained in:
Marcus Brinkmann 2001-12-05 20:37:37 +00:00
parent ba1e19e10b
commit 62d0374e72
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gpgme/ChangeLog
View File

@ -1,3 +1,10 @@
2001-12-05 Marcus Brinkmann <marcus@g10code.de>
* engine-gpgsm.c (gpgsm_set_fd): Accept one more argument OPT.
(_gpgme_gpgsm_op_encrypt): Pass armor argument to gpgsm_set_fd for
output descriptor.
(_gpgme_gpgsm_op_sign): Likewise.
2001-12-05 Marcus Brinkmann <marcus@g10code.de> 2001-12-05 Marcus Brinkmann <marcus@g10code.de>
* keylist.c (gpgme_op_keylist_next): Set pending to 0 if EOF * keylist.c (gpgme_op_keylist_next): Set pending to 0 if EOF

29
gpgme/engine-gpgsm.c
View File

@ -217,11 +217,15 @@ gpgsm_assuan_simple_command (ASSUAN_CONTEXT ctx, char *line)
#define COMMANDLINELEN 40 #define COMMANDLINELEN 40
static AssuanError static AssuanError
gpgsm_set_fd (ASSUAN_CONTEXT ctx, const char *which, int fd) gpgsm_set_fd (ASSUAN_CONTEXT ctx, const char *which, int fd, const char *opt)
{ {
char line[COMMANDLINELEN]; char line[COMMANDLINELEN];
snprintf (line, COMMANDLINELEN, "%s FD=%i", which, fd); if (opt)
snprintf (line, COMMANDLINELEN, "%s FD=%i %s", which, fd, opt);
else
snprintf (line, COMMANDLINELEN, "%s FD=%i", which, fd);
return gpgsm_assuan_simple_command (ctx, line); return gpgsm_assuan_simple_command (ctx, line);
} }
@ -238,11 +242,11 @@ _gpgme_gpgsm_op_decrypt (GpgsmObject gpgsm, GpgmeData ciph, GpgmeData plain)
return mk_error (Out_Of_Core); return mk_error (Out_Of_Core);
gpgsm->input_data = ciph; gpgsm->input_data = ciph;
err = gpgsm_set_fd (gpgsm->assuan_ctx, "INPUT", gpgsm->input_fd_server); err = gpgsm_set_fd (gpgsm->assuan_ctx, "INPUT", gpgsm->input_fd_server, 0);
if (err) if (err)
return mk_error (General_Error); /* FIXME */ return mk_error (General_Error); /* FIXME */
gpgsm->output_data = plain; gpgsm->output_data = plain;
err = gpgsm_set_fd (gpgsm->assuan_ctx, "OUTPUT", gpgsm->output_fd_server); err = gpgsm_set_fd (gpgsm->assuan_ctx, "OUTPUT", gpgsm->output_fd_server, 0);
if (err) if (err)
return mk_error (General_Error); /* FIXME */ return mk_error (General_Error); /* FIXME */
_gpgme_io_close (gpgsm->message_fd); _gpgme_io_close (gpgsm->message_fd);
@ -311,11 +315,12 @@ _gpgme_gpgsm_op_encrypt (GpgsmObject gpgsm, GpgmeRecipients recp,
return mk_error (Out_Of_Core); return mk_error (Out_Of_Core);
gpgsm->input_data = plain; gpgsm->input_data = plain;
err = gpgsm_set_fd (gpgsm->assuan_ctx, "INPUT", gpgsm->input_fd_server); err = gpgsm_set_fd (gpgsm->assuan_ctx, "INPUT", gpgsm->input_fd_server, 0);
if (err) if (err)
return mk_error (General_Error); /* FIXME */ return mk_error (General_Error); /* FIXME */
gpgsm->output_data = ciph; gpgsm->output_data = ciph;
err = gpgsm_set_fd (gpgsm->assuan_ctx, "OUTPUT", gpgsm->output_fd_server); err = gpgsm_set_fd (gpgsm->assuan_ctx, "OUTPUT", gpgsm->output_fd_server,
use_armor ? "--armor" : 0);
if (err) if (err)
return mk_error (General_Error); /* FIXME */ return mk_error (General_Error); /* FIXME */
_gpgme_io_close (gpgsm->message_fd); _gpgme_io_close (gpgsm->message_fd);
@ -356,7 +361,7 @@ _gpgme_gpgsm_op_import (GpgsmObject gpgsm, GpgmeData keydata)
return mk_error (Out_Of_Core); return mk_error (Out_Of_Core);
gpgsm->input_data = keydata; gpgsm->input_data = keydata;
err = gpgsm_set_fd (gpgsm->assuan_ctx, "INPUT", gpgsm->input_fd_server); err = gpgsm_set_fd (gpgsm->assuan_ctx, "INPUT", gpgsm->input_fd_server, 0);
if (err) if (err)
return mk_error (General_Error); /* FIXME */ return mk_error (General_Error); /* FIXME */
_gpgme_io_close (gpgsm->output_fd); _gpgme_io_close (gpgsm->output_fd);
@ -406,11 +411,12 @@ _gpgme_gpgsm_op_sign (GpgsmObject gpgsm, GpgmeData in, GpgmeData out,
return mk_error (Out_Of_Core); return mk_error (Out_Of_Core);
gpgsm->input_data = in; gpgsm->input_data = in;
err = gpgsm_set_fd (gpgsm->assuan_ctx, "INPUT", gpgsm->input_fd_server); err = gpgsm_set_fd (gpgsm->assuan_ctx, "INPUT", gpgsm->input_fd_server, 0);
if (err) if (err)
return mk_error (General_Error); /* FIXME */ return mk_error (General_Error); /* FIXME */
gpgsm->output_data = out; gpgsm->output_data = out;
err = gpgsm_set_fd (gpgsm->assuan_ctx, "OUTPUT", gpgsm->output_fd_server); err = gpgsm_set_fd (gpgsm->assuan_ctx, "OUTPUT", gpgsm->output_fd_server,
use_armor ? "--armor" : 0);
if (err) if (err)
return mk_error (General_Error); /* FIXME */ return mk_error (General_Error); /* FIXME */
_gpgme_io_close (gpgsm->message_fd); _gpgme_io_close (gpgsm->message_fd);
@ -439,11 +445,12 @@ _gpgme_gpgsm_op_verify (GpgsmObject gpgsm, GpgmeData sig, GpgmeData text)
return mk_error (Out_Of_Core); return mk_error (Out_Of_Core);
gpgsm->input_data = sig; gpgsm->input_data = sig;
err = gpgsm_set_fd (gpgsm->assuan_ctx, "INPUT", gpgsm->input_fd_server); err = gpgsm_set_fd (gpgsm->assuan_ctx, "INPUT", gpgsm->input_fd_server, 0);
if (err) if (err)
return mk_error (General_Error); /* FIXME */ return mk_error (General_Error); /* FIXME */
gpgsm->message_data = sig; gpgsm->message_data = sig;
err = gpgsm_set_fd (gpgsm->assuan_ctx, "MESSAGE", gpgsm->message_fd_server); err = gpgsm_set_fd (gpgsm->assuan_ctx, "MESSAGE", gpgsm->message_fd_server,
0);
if (err) if (err)
return mk_error (General_Error); /* FIXME */ return mk_error (General_Error); /* FIXME */
_gpgme_io_close (gpgsm->output_fd); _gpgme_io_close (gpgsm->output_fd);