gpgme-tool: add help messages for a number of commands.
* src/gpgme-tool.c (hlp_engine, hlp_sub_protocol, hlp_armor, hlp_textmode,
hlp_include_certs, hlp_keylist_mode, hlp_input, hlp_output, hlp_message,
hlp_recipient, hlp_signer, hlp_signers_clear, hlp_decrypt, hlp_decrypt_verify,
hlp_encrypt, hlp_sign_encrypt, hlp_sign, hlp_verify, hlp_import): New strings.
(hlp_protocol): Fix typo.
(register_commands): Add documentation strings.
(doc): Mention Assuan.
2012-03-27 19:10:02 +00:00
|
|
|
|
/* gpgme-tool.c - Assuan server exposing GnuPG Made Easy operations.
|
2013-02-07 20:03:02 +00:00
|
|
|
|
Copyright (C) 2009, 2010, 2012, 2013 g10 Code GmbH
|
2012-10-11 14:54:58 +00:00
|
|
|
|
Copyright (C) 2001, 2003, 2009, 2011 Free Software Foundation, Inc.
|
2009-10-30 14:21:08 +00:00
|
|
|
|
|
|
|
|
|
This file is part of GPGME.
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
GPGME is free software; you can redistribute it and/or modify it
|
2012-10-11 14:54:58 +00:00
|
|
|
|
under the terms of the GNU General Public License as published by
|
|
|
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
|
|
|
(at your option) any later version.
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
GPGME is distributed in the hope that it will be useful, but
|
|
|
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
|
Lesser General Public License for more details.
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
2010-01-05 17:36:53 +00:00
|
|
|
|
License along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
*/
|
2009-10-30 14:21:08 +00:00
|
|
|
|
|
|
|
|
|
#if HAVE_CONFIG_H
|
|
|
|
|
#include <config.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#include <errno.h>
|
|
|
|
|
#include <getopt.h>
|
|
|
|
|
#include <ctype.h>
|
|
|
|
|
#include <stdarg.h>
|
2010-05-07 01:32:54 +00:00
|
|
|
|
#ifdef HAVE_LOCALE_H
|
2009-10-30 14:21:08 +00:00
|
|
|
|
#include <locale.h>
|
2010-05-07 01:32:54 +00:00
|
|
|
|
#endif
|
2009-10-30 14:21:08 +00:00
|
|
|
|
|
2009-11-06 00:44:44 +00:00
|
|
|
|
#include <assuan.h>
|
|
|
|
|
|
2015-08-31 18:33:44 +00:00
|
|
|
|
#include "argparse.h"
|
2009-10-30 14:21:08 +00:00
|
|
|
|
#include "gpgme.h"
|
|
|
|
|
|
2009-12-01 11:00:27 +00:00
|
|
|
|
/* GCC attributes. */
|
2012-09-25 13:29:49 +00:00
|
|
|
|
#if __GNUC__ >= 4
|
2009-12-01 11:00:27 +00:00
|
|
|
|
# define GT_GCC_A_SENTINEL(a) __attribute__ ((sentinel(a)))
|
|
|
|
|
#else
|
2012-09-25 13:29:49 +00:00
|
|
|
|
# define GT_GCC_A_SENTINEL(a)
|
2009-12-01 11:00:27 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 5 )
|
|
|
|
|
# define GT_GCC_A_PRINTF(f, a) __attribute__ ((format (printf,f,a)))
|
|
|
|
|
#else
|
|
|
|
|
# define GT_GCC_A_PRINTF(f, a)
|
|
|
|
|
#endif
|
|
|
|
|
|
2010-12-08 09:55:00 +00:00
|
|
|
|
#define DIM(v) (sizeof(v)/sizeof((v)[0]))
|
|
|
|
|
#define xtoi_1(p) (*(p) <= '9'? (*(p)- '0'): \
|
|
|
|
|
*(p) <= 'F'? (*(p)-'A'+10):(*(p)-'a'+10))
|
|
|
|
|
#define xtoi_2(p) ((xtoi_1(p) * 16) + xtoi_1((p)+1))
|
2009-12-01 11:00:27 +00:00
|
|
|
|
|
|
|
|
|
|
2012-10-11 15:02:50 +00:00
|
|
|
|
|
|
|
|
|
/* MEMBUF */
|
|
|
|
|
|
|
|
|
|
/* A simple implementation of a dynamic buffer. Use init_membuf() to
|
|
|
|
|
create a buffer, put_membuf to append bytes and get_membuf to
|
|
|
|
|
release and return the buffer. Allocation errors are detected but
|
|
|
|
|
only returned at the final get_membuf(), this helps not to clutter
|
|
|
|
|
the code with out-of-core checks. */
|
|
|
|
|
|
|
|
|
|
/* The definition of the structure is private, we only need it here,
|
|
|
|
|
so it can be allocated on the stack. */
|
|
|
|
|
struct private_membuf_s
|
|
|
|
|
{
|
|
|
|
|
size_t len;
|
|
|
|
|
size_t size;
|
|
|
|
|
char *buf;
|
|
|
|
|
int out_of_core;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
typedef struct private_membuf_s membuf_t;
|
|
|
|
|
|
|
|
|
|
/* Return the current length of the membuf. */
|
|
|
|
|
#define get_membuf_len(a) ((a)->len)
|
|
|
|
|
#define is_membuf_ready(a) ((a)->buf || (a)->out_of_core)
|
|
|
|
|
#define MEMBUF_ZERO { 0, 0, NULL, 0}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
init_membuf (membuf_t *mb, int initiallen)
|
|
|
|
|
{
|
|
|
|
|
mb->len = 0;
|
|
|
|
|
mb->size = initiallen;
|
|
|
|
|
mb->out_of_core = 0;
|
|
|
|
|
mb->buf = malloc (initiallen);
|
|
|
|
|
if (!mb->buf)
|
|
|
|
|
mb->out_of_core = errno;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Shift the the content of the membuf MB by AMOUNT bytes. The next
|
|
|
|
|
operation will then behave as if AMOUNT bytes had not been put into
|
|
|
|
|
the buffer. If AMOUNT is greater than the actual accumulated
|
|
|
|
|
bytes, the membuf is basically reset to its initial state. */
|
|
|
|
|
#if 0 /* Not yet used. */
|
|
|
|
|
static void
|
|
|
|
|
clear_membuf (membuf_t *mb, size_t amount)
|
|
|
|
|
{
|
|
|
|
|
/* No need to clear if we are already out of core. */
|
|
|
|
|
if (mb->out_of_core)
|
|
|
|
|
return;
|
|
|
|
|
if (amount >= mb->len)
|
|
|
|
|
mb->len = 0;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
mb->len -= amount;
|
|
|
|
|
memmove (mb->buf, mb->buf+amount, mb->len);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif /* unused */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
put_membuf (membuf_t *mb, const void *buf, size_t len)
|
|
|
|
|
{
|
|
|
|
|
if (mb->out_of_core || !len)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
if (mb->len + len >= mb->size)
|
|
|
|
|
{
|
|
|
|
|
char *p;
|
|
|
|
|
|
|
|
|
|
mb->size += len + 1024;
|
|
|
|
|
p = realloc (mb->buf, mb->size);
|
|
|
|
|
if (!p)
|
|
|
|
|
{
|
|
|
|
|
mb->out_of_core = errno ? errno : ENOMEM;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
mb->buf = p;
|
|
|
|
|
}
|
|
|
|
|
memcpy (mb->buf + mb->len, buf, len);
|
|
|
|
|
mb->len += len;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#if 0 /* Not yet used. */
|
|
|
|
|
static void
|
|
|
|
|
put_membuf_str (membuf_t *mb, const char *string)
|
|
|
|
|
{
|
|
|
|
|
put_membuf (mb, string, strlen (string));
|
|
|
|
|
}
|
|
|
|
|
#endif /* unused */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void *
|
|
|
|
|
get_membuf (membuf_t *mb, size_t *len)
|
|
|
|
|
{
|
|
|
|
|
char *p;
|
|
|
|
|
|
|
|
|
|
if (mb->out_of_core)
|
|
|
|
|
{
|
|
|
|
|
if (mb->buf)
|
|
|
|
|
{
|
|
|
|
|
free (mb->buf);
|
|
|
|
|
mb->buf = NULL;
|
|
|
|
|
}
|
|
|
|
|
gpg_err_set_errno (mb->out_of_core);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
p = mb->buf;
|
|
|
|
|
if (len)
|
|
|
|
|
*len = mb->len;
|
|
|
|
|
mb->buf = NULL;
|
|
|
|
|
mb->out_of_core = ENOMEM; /* hack to make sure it won't get reused. */
|
|
|
|
|
return p;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Peek at the membuf MB. On success a pointer to the buffer is
|
|
|
|
|
returned which is valid until the next operation on MB. If LEN is
|
|
|
|
|
not NULL the current LEN of the buffer is stored there. On error
|
|
|
|
|
NULL is returned and ERRNO is set. */
|
|
|
|
|
#if 0 /* Not yet used. */
|
|
|
|
|
static const void *
|
|
|
|
|
peek_membuf (membuf_t *mb, size_t *len)
|
|
|
|
|
{
|
|
|
|
|
const char *p;
|
|
|
|
|
|
|
|
|
|
if (mb->out_of_core)
|
|
|
|
|
{
|
|
|
|
|
gpg_err_set_errno (mb->out_of_core);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
p = mb->buf;
|
|
|
|
|
if (len)
|
|
|
|
|
*len = mb->len;
|
|
|
|
|
return p;
|
|
|
|
|
}
|
|
|
|
|
#endif /* unused */
|
|
|
|
|
|
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
|
|
|
|
|
/* SUPPORT. */
|
|
|
|
|
FILE *log_stream;
|
2016-09-13 18:59:07 +00:00
|
|
|
|
char program_name[] = "gpgme-tool";
|
2009-10-30 14:21:08 +00:00
|
|
|
|
|
2010-02-16 20:07:03 +00:00
|
|
|
|
#define spacep(p) (*(p) == ' ' || *(p) == '\t')
|
|
|
|
|
|
|
|
|
|
|
2012-09-25 13:29:49 +00:00
|
|
|
|
void log_error (int status, gpg_error_t errnum,
|
2009-12-01 11:00:27 +00:00
|
|
|
|
const char *fmt, ...) GT_GCC_A_PRINTF(3,4);
|
|
|
|
|
|
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
void
|
|
|
|
|
log_init (void)
|
|
|
|
|
{
|
|
|
|
|
log_stream = stderr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
log_error (int status, gpg_error_t errnum, const char *fmt, ...)
|
|
|
|
|
{
|
|
|
|
|
va_list ap;
|
|
|
|
|
|
|
|
|
|
fprintf (log_stream, "%s: ", program_name);
|
|
|
|
|
va_start (ap, fmt);
|
|
|
|
|
vfprintf (log_stream, fmt, ap);
|
|
|
|
|
va_end (ap);
|
|
|
|
|
if (errnum)
|
2013-02-07 20:03:02 +00:00
|
|
|
|
{
|
|
|
|
|
fprintf (log_stream, ": %s", gpg_strerror (errnum));
|
|
|
|
|
if (gpg_err_source (errnum) != GPG_ERR_SOURCE_GPGME)
|
|
|
|
|
fprintf (log_stream, " <%s>", gpg_strsource (errnum));
|
|
|
|
|
}
|
2009-10-30 14:21:08 +00:00
|
|
|
|
fprintf (log_stream, "\n");
|
|
|
|
|
if (status)
|
|
|
|
|
exit (status);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2010-12-08 09:55:00 +00:00
|
|
|
|
/* Note that it is sufficient to allocate the target string D as long
|
|
|
|
|
as the source string S, i.e.: strlen(s)+1;. D == S is allowed. */
|
|
|
|
|
static void
|
|
|
|
|
strcpy_escaped_plus (char *d, const char *s)
|
|
|
|
|
{
|
|
|
|
|
while (*s)
|
|
|
|
|
{
|
|
|
|
|
if (*s == '%' && s[1] && s[2])
|
2012-09-25 13:29:49 +00:00
|
|
|
|
{
|
2010-12-08 09:55:00 +00:00
|
|
|
|
s++;
|
|
|
|
|
*d++ = xtoi_2 (s);
|
|
|
|
|
s += 2;
|
|
|
|
|
}
|
|
|
|
|
else if (*s == '+')
|
|
|
|
|
*d++ = ' ', s++;
|
|
|
|
|
else
|
|
|
|
|
*d++ = *s++;
|
|
|
|
|
}
|
2012-09-25 13:29:49 +00:00
|
|
|
|
*d = 0;
|
2010-12-08 09:55:00 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2010-02-16 20:07:03 +00:00
|
|
|
|
/* Check whether the option NAME appears in LINE. */
|
|
|
|
|
static int
|
|
|
|
|
has_option (const char *line, const char *name)
|
|
|
|
|
{
|
|
|
|
|
const char *s;
|
|
|
|
|
int n = strlen (name);
|
|
|
|
|
|
|
|
|
|
s = strstr (line, name);
|
|
|
|
|
return (s && (s == line || spacep (s-1)) && (!s[n] || spacep (s+n)));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Skip over options. It is assumed that leading spaces have been
|
|
|
|
|
removed (this is the case for lines passed to a handler from
|
|
|
|
|
assuan). Blanks after the options are also removed. */
|
|
|
|
|
static char *
|
|
|
|
|
skip_options (char *line)
|
|
|
|
|
{
|
|
|
|
|
while ( *line == '-' && line[1] == '-' )
|
|
|
|
|
{
|
|
|
|
|
while (*line && !spacep (line))
|
|
|
|
|
line++;
|
|
|
|
|
while (spacep (line))
|
|
|
|
|
line++;
|
|
|
|
|
}
|
|
|
|
|
return line;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
|
|
|
|
|
typedef gpg_error_t (*result_xml_write_cb_t) (void *hook, const void *buf,
|
|
|
|
|
size_t len);
|
|
|
|
|
|
2012-09-28 06:31:13 +00:00
|
|
|
|
static char xml_preamble1[] = "<?xml version=\"1.0\" "
|
|
|
|
|
"encoding=\"UTF-8\" standalone=\"yes\"?>\n";
|
|
|
|
|
static const char xml_preamble2[] = "<gpgme>\n";
|
|
|
|
|
static const char xml_end[] = "</gpgme>\n";
|
|
|
|
|
|
|
|
|
|
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
struct result_xml_state
|
|
|
|
|
{
|
|
|
|
|
int indent;
|
|
|
|
|
result_xml_write_cb_t cb;
|
|
|
|
|
void *hook;
|
|
|
|
|
|
|
|
|
|
#define MAX_TAGS 20
|
|
|
|
|
int next_tag;
|
2016-09-13 18:59:07 +00:00
|
|
|
|
const char *tag[MAX_TAGS];
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
int had_data[MAX_TAGS];
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
result_init (struct result_xml_state *state, int indent,
|
|
|
|
|
result_xml_write_cb_t cb, void *hook)
|
|
|
|
|
{
|
|
|
|
|
memset (state, '\0', sizeof (*state));
|
|
|
|
|
state->indent = indent;
|
|
|
|
|
state->cb = cb;
|
|
|
|
|
state->hook = hook;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
result_xml_indent (struct result_xml_state *state)
|
|
|
|
|
{
|
|
|
|
|
char spaces[state->indent + 1];
|
|
|
|
|
int i;
|
|
|
|
|
for (i = 0; i < state->indent; i++)
|
|
|
|
|
spaces[i] = ' ';
|
|
|
|
|
spaces[i] = '\0';
|
|
|
|
|
return (*state->cb) (state->hook, spaces, i);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
2016-09-13 18:44:59 +00:00
|
|
|
|
result_xml_tag_start (struct result_xml_state *state, const char *name, ...)
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
{
|
|
|
|
|
result_xml_write_cb_t cb = state->cb;
|
|
|
|
|
void *hook = state->hook;
|
|
|
|
|
va_list ap;
|
|
|
|
|
char *attr;
|
|
|
|
|
char *attr_val;
|
2016-09-13 18:44:59 +00:00
|
|
|
|
char string_null[] = "(null)";
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
|
|
|
|
|
va_start (ap, name);
|
|
|
|
|
|
|
|
|
|
if (state->next_tag > 0)
|
|
|
|
|
{
|
|
|
|
|
if (! state->had_data[state->next_tag - 1])
|
|
|
|
|
{
|
|
|
|
|
(*cb) (hook, ">\n", 2);
|
|
|
|
|
(*cb) (hook, NULL, 0);
|
|
|
|
|
}
|
|
|
|
|
state->had_data[state->next_tag - 1] = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
result_xml_indent (state);
|
|
|
|
|
(*cb) (hook, "<", 1);
|
|
|
|
|
(*cb) (hook, name, strlen (name));
|
|
|
|
|
|
|
|
|
|
state->tag[state->next_tag] = name;
|
|
|
|
|
state->had_data[state->next_tag] = 0;
|
|
|
|
|
state->indent += 2;
|
|
|
|
|
state->next_tag++;
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
while (1)
|
|
|
|
|
{
|
|
|
|
|
attr = va_arg (ap, char *);
|
|
|
|
|
if (attr == NULL)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
attr_val = va_arg (ap, char *);
|
|
|
|
|
if (attr_val == NULL)
|
2016-09-13 18:44:59 +00:00
|
|
|
|
attr_val = string_null;
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
|
|
|
|
|
(*cb) (hook, " ", 1);
|
|
|
|
|
(*cb) (hook, attr, strlen (attr));
|
|
|
|
|
(*cb) (hook, "=\"", 2);
|
|
|
|
|
(*cb) (hook, attr_val, strlen (attr_val));
|
|
|
|
|
(*cb) (hook, "\"", 1);
|
|
|
|
|
}
|
|
|
|
|
va_end (ap);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2012-10-11 15:02:50 +00:00
|
|
|
|
/* Return a constant string with an XML entity for C. */
|
|
|
|
|
static const char *
|
2012-10-06 15:30:21 +00:00
|
|
|
|
result_xml_escape_replacement(char c)
|
|
|
|
|
{
|
|
|
|
|
switch (c)
|
|
|
|
|
{
|
|
|
|
|
case '<':
|
|
|
|
|
return "<";
|
|
|
|
|
case '>':
|
|
|
|
|
return ">";
|
|
|
|
|
case '&':
|
|
|
|
|
return "&";
|
|
|
|
|
default:
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2012-10-11 15:02:50 +00:00
|
|
|
|
/* Escape DATA by replacing certain characters with their XML
|
|
|
|
|
entities. The result is stored in a newly allocated buffer which
|
|
|
|
|
address will be stored at BUF. Returns 0 on success. */
|
|
|
|
|
static gpg_error_t
|
2012-10-06 15:30:21 +00:00
|
|
|
|
result_xml_escape (const char *data, char **buf)
|
|
|
|
|
{
|
2012-10-11 15:02:50 +00:00
|
|
|
|
int data_len, i;
|
2012-10-06 15:30:21 +00:00
|
|
|
|
const char *r;
|
2012-10-11 15:02:50 +00:00
|
|
|
|
membuf_t mb;
|
2012-10-06 15:30:21 +00:00
|
|
|
|
|
2012-10-11 15:02:50 +00:00
|
|
|
|
init_membuf (&mb, 128);
|
2014-08-12 15:42:08 +00:00
|
|
|
|
if (data)
|
2012-10-06 15:30:21 +00:00
|
|
|
|
{
|
2014-08-12 15:42:08 +00:00
|
|
|
|
data_len = strlen (data);
|
|
|
|
|
for (i = 0; i < data_len; i++)
|
|
|
|
|
{
|
|
|
|
|
r = result_xml_escape_replacement (data[i]);
|
|
|
|
|
if (r)
|
|
|
|
|
put_membuf (&mb, r, strlen (r));
|
|
|
|
|
else
|
|
|
|
|
put_membuf (&mb, data+i, 1);
|
|
|
|
|
}
|
2012-10-06 15:30:21 +00:00
|
|
|
|
}
|
2012-10-11 15:02:50 +00:00
|
|
|
|
put_membuf (&mb, "", 1);
|
|
|
|
|
*buf = get_membuf (&mb, NULL);
|
|
|
|
|
return *buf? 0 : gpg_error_from_syserror ();
|
2012-10-06 15:30:21 +00:00
|
|
|
|
}
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
|
2012-10-11 15:02:50 +00:00
|
|
|
|
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
gpg_error_t
|
2012-09-28 06:31:13 +00:00
|
|
|
|
result_xml_tag_data (struct result_xml_state *state, const char *data)
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
{
|
2012-10-06 15:30:21 +00:00
|
|
|
|
gpg_error_t err;
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
result_xml_write_cb_t cb = state->cb;
|
|
|
|
|
void *hook = state->hook;
|
2012-10-06 15:30:21 +00:00
|
|
|
|
char *buf = NULL;
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
|
|
|
|
|
if (state->had_data[state->next_tag - 1])
|
|
|
|
|
{
|
|
|
|
|
(*cb) (hook, "\n", 2);
|
|
|
|
|
(*cb) (hook, NULL, 0);
|
|
|
|
|
result_xml_indent (state);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
(*cb) (hook, ">", 1);
|
|
|
|
|
state->had_data[state->next_tag - 1] = 2;
|
|
|
|
|
|
2012-10-11 15:02:50 +00:00
|
|
|
|
err = result_xml_escape (data, &buf);
|
2012-10-06 15:30:21 +00:00
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
|
|
|
|
|
|
|
|
|
(*cb) (hook, buf, strlen (buf));
|
|
|
|
|
|
|
|
|
|
free (buf);
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
result_xml_tag_end (struct result_xml_state *state)
|
|
|
|
|
{
|
|
|
|
|
result_xml_write_cb_t cb = state->cb;
|
|
|
|
|
void *hook = state->hook;
|
|
|
|
|
|
|
|
|
|
state->next_tag--;
|
|
|
|
|
state->indent -= 2;
|
|
|
|
|
|
|
|
|
|
if (state->had_data[state->next_tag])
|
|
|
|
|
{
|
|
|
|
|
if (state->had_data[state->next_tag] == 1)
|
|
|
|
|
result_xml_indent (state);
|
|
|
|
|
(*cb) (hook, "</", 2);
|
|
|
|
|
(*cb) (hook, state->tag[state->next_tag],
|
|
|
|
|
strlen (state->tag[state->next_tag]));
|
|
|
|
|
(*cb) (hook, ">\n", 2);
|
|
|
|
|
(*cb) (hook, NULL, 0);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
(*cb) (hook, " />\n", 4);
|
|
|
|
|
(*cb) (hook, NULL, 0);
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
2016-09-13 18:59:07 +00:00
|
|
|
|
result_add_error (struct result_xml_state *state,
|
|
|
|
|
const char *name, gpg_error_t err)
|
2012-09-25 13:29:49 +00:00
|
|
|
|
{
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
char code[20];
|
|
|
|
|
char msg[1024];
|
|
|
|
|
snprintf (code, sizeof (code) - 1, "0x%x", err);
|
2012-10-06 15:30:21 +00:00
|
|
|
|
snprintf (msg, sizeof (msg) - 1, "%s <%s>",
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
gpg_strerror (err), gpg_strsource (err));
|
|
|
|
|
result_xml_tag_start (state, name, "value", code, NULL);
|
|
|
|
|
result_xml_tag_data (state, msg);
|
|
|
|
|
result_xml_tag_end (state);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
result_add_pubkey_algo (struct result_xml_state *state,
|
2016-09-13 18:59:07 +00:00
|
|
|
|
const char *name, gpgme_pubkey_algo_t algo)
|
2012-09-25 13:29:49 +00:00
|
|
|
|
{
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
char code[20];
|
|
|
|
|
char msg[80];
|
|
|
|
|
snprintf (code, sizeof (code) - 1, "0x%x", algo);
|
|
|
|
|
snprintf (msg, sizeof (msg) - 1, "%s",
|
|
|
|
|
gpgme_pubkey_algo_name (algo));
|
|
|
|
|
result_xml_tag_start (state, name, "value", code, NULL);
|
|
|
|
|
result_xml_tag_data (state, msg);
|
|
|
|
|
result_xml_tag_end (state);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
result_add_hash_algo (struct result_xml_state *state,
|
2016-09-13 18:59:07 +00:00
|
|
|
|
const char *name, gpgme_hash_algo_t algo)
|
2012-09-25 13:29:49 +00:00
|
|
|
|
{
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
char code[20];
|
|
|
|
|
char msg[80];
|
2016-09-13 18:59:07 +00:00
|
|
|
|
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
snprintf (code, sizeof (code) - 1, "0x%x", algo);
|
|
|
|
|
snprintf (msg, sizeof (msg) - 1, "%s",
|
|
|
|
|
gpgme_hash_algo_name (algo));
|
|
|
|
|
result_xml_tag_start (state, name, "value", code, NULL);
|
|
|
|
|
result_xml_tag_data (state, msg);
|
|
|
|
|
result_xml_tag_end (state);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
2016-09-13 18:59:07 +00:00
|
|
|
|
result_add_keyid (struct result_xml_state *state,
|
|
|
|
|
const char *name, const char *keyid)
|
2012-09-25 13:29:49 +00:00
|
|
|
|
{
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
result_xml_tag_start (state, name, NULL);
|
|
|
|
|
result_xml_tag_data (state, keyid);
|
|
|
|
|
result_xml_tag_end (state);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
2016-09-13 18:59:07 +00:00
|
|
|
|
result_add_fpr (struct result_xml_state *state,
|
|
|
|
|
const char *name, const char *fpr)
|
2012-09-25 13:29:49 +00:00
|
|
|
|
{
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
result_xml_tag_start (state, name, NULL);
|
|
|
|
|
result_xml_tag_data (state, fpr);
|
|
|
|
|
result_xml_tag_end (state);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
2016-09-13 18:59:07 +00:00
|
|
|
|
result_add_timestamp (struct result_xml_state *state, const char *name,
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
unsigned int timestamp)
|
2010-08-03 09:16:01 +00:00
|
|
|
|
{
|
2010-08-04 07:40:33 +00:00
|
|
|
|
char code[20];
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
|
|
|
|
|
snprintf (code, sizeof (code) - 1, "%ui", timestamp);
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
result_xml_tag_start (state, name, "unix", code, NULL);
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
result_xml_tag_end (state);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
2016-09-13 18:59:07 +00:00
|
|
|
|
result_add_sig_mode (struct result_xml_state *state, const char *name,
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
gpgme_sig_mode_t sig_mode)
|
2012-09-25 13:29:49 +00:00
|
|
|
|
{
|
2016-09-13 18:59:07 +00:00
|
|
|
|
const char *mode;
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
char code[20];
|
|
|
|
|
|
|
|
|
|
snprintf (code, sizeof (code) - 1, "%i", sig_mode);
|
|
|
|
|
switch (sig_mode)
|
|
|
|
|
{
|
|
|
|
|
case GPGME_SIG_MODE_NORMAL:
|
|
|
|
|
mode = "normal";
|
|
|
|
|
break;
|
|
|
|
|
case GPGME_SIG_MODE_DETACH:
|
|
|
|
|
mode = "detach";
|
|
|
|
|
break;
|
|
|
|
|
case GPGME_SIG_MODE_CLEAR:
|
|
|
|
|
mode = "clear";
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
mode = "unknown";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
result_xml_tag_start (state, name, "type", mode, "value", code, NULL);
|
|
|
|
|
result_xml_tag_data (state, mode);
|
|
|
|
|
result_xml_tag_end (state);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2012-09-28 06:31:13 +00:00
|
|
|
|
gpg_error_t
|
2016-09-13 18:59:07 +00:00
|
|
|
|
result_add_protocol (struct result_xml_state *state, const char *name,
|
2012-09-28 06:31:13 +00:00
|
|
|
|
gpgme_protocol_t protocol)
|
|
|
|
|
{
|
|
|
|
|
const char *str;
|
|
|
|
|
char code[20];
|
|
|
|
|
|
|
|
|
|
snprintf (code, sizeof (code) - 1, "%i", protocol);
|
|
|
|
|
str = gpgme_get_protocol_name(protocol);
|
|
|
|
|
if (!str)
|
|
|
|
|
str = "invalid";
|
|
|
|
|
result_xml_tag_start (state, name, "value", code, NULL);
|
|
|
|
|
result_xml_tag_data (state, str);
|
|
|
|
|
result_xml_tag_end (state);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
2016-09-13 18:59:07 +00:00
|
|
|
|
result_add_validity (struct result_xml_state *state, const char *name,
|
2012-09-28 06:31:13 +00:00
|
|
|
|
gpgme_validity_t validity)
|
|
|
|
|
{
|
|
|
|
|
const char *str;
|
|
|
|
|
char code[20];
|
|
|
|
|
|
|
|
|
|
snprintf (code, sizeof (code) - 1, "%i", validity);
|
|
|
|
|
switch (validity)
|
|
|
|
|
{
|
|
|
|
|
case GPGME_VALIDITY_UNDEFINED:
|
|
|
|
|
str ="undefined";
|
|
|
|
|
break;
|
|
|
|
|
case GPGME_VALIDITY_NEVER:
|
|
|
|
|
str ="never";
|
|
|
|
|
break;
|
|
|
|
|
case GPGME_VALIDITY_MARGINAL:
|
|
|
|
|
str ="marginal";
|
|
|
|
|
break;
|
|
|
|
|
case GPGME_VALIDITY_FULL:
|
|
|
|
|
str ="full";
|
|
|
|
|
break;
|
|
|
|
|
case GPGME_VALIDITY_ULTIMATE:
|
|
|
|
|
str ="ultimate";
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
str ="unknown";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
result_xml_tag_start (state, name, "value", code, NULL);
|
|
|
|
|
result_xml_tag_data (state, str);
|
|
|
|
|
result_xml_tag_end (state);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
gpg_error_t
|
|
|
|
|
result_add_value (struct result_xml_state *state,
|
2016-09-13 18:59:07 +00:00
|
|
|
|
const char *name, unsigned int val)
|
2012-09-25 13:29:49 +00:00
|
|
|
|
{
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
char code[20];
|
|
|
|
|
|
|
|
|
|
snprintf (code, sizeof (code) - 1, "0x%x", val);
|
|
|
|
|
result_xml_tag_start (state, name, "value", code, NULL);
|
|
|
|
|
result_xml_tag_end (state);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
result_add_string (struct result_xml_state *state,
|
2016-09-13 18:59:07 +00:00
|
|
|
|
const char *name, const char *str)
|
2012-09-25 13:29:49 +00:00
|
|
|
|
{
|
2012-09-28 06:31:13 +00:00
|
|
|
|
if (!str)
|
|
|
|
|
str = "";
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
result_xml_tag_start (state, name, NULL);
|
|
|
|
|
result_xml_tag_data (state, str);
|
|
|
|
|
result_xml_tag_end (state);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
result_encrypt_to_xml (gpgme_ctx_t ctx, int indent,
|
|
|
|
|
result_xml_write_cb_t cb, void *hook)
|
|
|
|
|
{
|
|
|
|
|
struct result_xml_state state;
|
|
|
|
|
gpgme_encrypt_result_t res = gpgme_op_encrypt_result (ctx);
|
|
|
|
|
gpgme_invalid_key_t inv_recp;
|
|
|
|
|
|
|
|
|
|
if (! res)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
result_init (&state, indent, cb, hook);
|
|
|
|
|
result_xml_tag_start (&state, "encrypt-result", NULL);
|
|
|
|
|
|
|
|
|
|
inv_recp = res->invalid_recipients;
|
|
|
|
|
if (inv_recp)
|
|
|
|
|
{
|
|
|
|
|
result_xml_tag_start (&state, "invalid-recipients", NULL);
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
while (inv_recp)
|
|
|
|
|
{
|
|
|
|
|
result_xml_tag_start (&state, "invalid-key", NULL);
|
2010-08-03 09:16:01 +00:00
|
|
|
|
if (inv_recp->fpr)
|
|
|
|
|
result_add_fpr (&state, "fpr", inv_recp->fpr);
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
result_add_error (&state, "reason", inv_recp->reason);
|
|
|
|
|
result_xml_tag_end (&state);
|
|
|
|
|
inv_recp = inv_recp->next;
|
|
|
|
|
}
|
|
|
|
|
result_xml_tag_end (&state);
|
|
|
|
|
}
|
|
|
|
|
result_xml_tag_end (&state);
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
result_decrypt_to_xml (gpgme_ctx_t ctx, int indent,
|
|
|
|
|
result_xml_write_cb_t cb, void *hook)
|
|
|
|
|
{
|
|
|
|
|
struct result_xml_state state;
|
|
|
|
|
gpgme_decrypt_result_t res = gpgme_op_decrypt_result (ctx);
|
|
|
|
|
gpgme_recipient_t recp;
|
|
|
|
|
|
|
|
|
|
if (! res)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
result_init (&state, indent, cb, hook);
|
|
|
|
|
result_xml_tag_start (&state, "decrypt-result", NULL);
|
|
|
|
|
|
|
|
|
|
if (res->file_name)
|
|
|
|
|
{
|
|
|
|
|
result_xml_tag_start (&state, "file-name", NULL);
|
|
|
|
|
result_xml_tag_data (&state, res->file_name);
|
|
|
|
|
result_xml_tag_end (&state);
|
|
|
|
|
}
|
|
|
|
|
if (res->unsupported_algorithm)
|
|
|
|
|
{
|
|
|
|
|
result_xml_tag_start (&state, "unsupported-alogorithm", NULL);
|
|
|
|
|
result_xml_tag_data (&state, res->unsupported_algorithm);
|
|
|
|
|
result_xml_tag_end (&state);
|
|
|
|
|
}
|
|
|
|
|
if (res->wrong_key_usage)
|
|
|
|
|
{
|
|
|
|
|
result_xml_tag_start (&state, "wrong-key-usage", NULL);
|
|
|
|
|
result_xml_tag_end (&state);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
recp = res->recipients;
|
|
|
|
|
if (recp)
|
|
|
|
|
{
|
|
|
|
|
result_xml_tag_start (&state, "recipients", NULL);
|
|
|
|
|
while (recp)
|
|
|
|
|
{
|
|
|
|
|
result_xml_tag_start (&state, "recipient", NULL);
|
|
|
|
|
result_add_keyid (&state, "keyid", recp->keyid);
|
|
|
|
|
result_add_pubkey_algo (&state, "pubkey-algo", recp->pubkey_algo);
|
|
|
|
|
result_add_error (&state, "status", recp->status);
|
|
|
|
|
result_xml_tag_end (&state);
|
|
|
|
|
recp = recp->next;
|
|
|
|
|
}
|
|
|
|
|
result_xml_tag_end (&state);
|
|
|
|
|
}
|
|
|
|
|
result_xml_tag_end (&state);
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
result_sign_to_xml (gpgme_ctx_t ctx, int indent,
|
|
|
|
|
result_xml_write_cb_t cb, void *hook)
|
|
|
|
|
{
|
|
|
|
|
struct result_xml_state state;
|
|
|
|
|
gpgme_sign_result_t res = gpgme_op_sign_result (ctx);
|
|
|
|
|
gpgme_invalid_key_t inv_key;
|
|
|
|
|
gpgme_new_signature_t new_sig;
|
|
|
|
|
|
|
|
|
|
if (! res)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
result_init (&state, indent, cb, hook);
|
|
|
|
|
result_xml_tag_start (&state, "sign-result", NULL);
|
|
|
|
|
|
|
|
|
|
inv_key = res->invalid_signers;
|
|
|
|
|
if (inv_key)
|
|
|
|
|
{
|
|
|
|
|
result_xml_tag_start (&state, "invalid-signers", NULL);
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
while (inv_key)
|
|
|
|
|
{
|
|
|
|
|
result_xml_tag_start (&state, "invalid-key", NULL);
|
2010-08-03 09:16:01 +00:00
|
|
|
|
if (inv_key->fpr)
|
|
|
|
|
result_add_fpr (&state, "fpr", inv_key->fpr);
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
result_add_error (&state, "reason", inv_key->reason);
|
|
|
|
|
result_xml_tag_end (&state);
|
|
|
|
|
inv_key = inv_key->next;
|
|
|
|
|
}
|
|
|
|
|
result_xml_tag_end (&state);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
new_sig = res->signatures;
|
|
|
|
|
if (new_sig)
|
|
|
|
|
{
|
|
|
|
|
result_xml_tag_start (&state, "signatures", NULL);
|
|
|
|
|
|
|
|
|
|
while (new_sig)
|
|
|
|
|
{
|
|
|
|
|
result_xml_tag_start (&state, "new-signature", NULL);
|
|
|
|
|
result_add_sig_mode (&state, "type", new_sig->type);
|
|
|
|
|
result_add_pubkey_algo (&state, "pubkey-algo", new_sig->pubkey_algo);
|
|
|
|
|
result_add_hash_algo (&state, "hash-algo", new_sig->hash_algo);
|
|
|
|
|
result_add_timestamp (&state, "timestamp", new_sig->timestamp);
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
if (new_sig->fpr)
|
|
|
|
|
result_add_fpr (&state, "fpr", new_sig->fpr);
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
result_add_value (&state, "sig-class", new_sig->sig_class);
|
|
|
|
|
|
|
|
|
|
result_xml_tag_end (&state);
|
|
|
|
|
new_sig = new_sig->next;
|
|
|
|
|
}
|
|
|
|
|
result_xml_tag_end (&state);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
result_xml_tag_end (&state);
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
result_verify_to_xml (gpgme_ctx_t ctx, int indent,
|
|
|
|
|
result_xml_write_cb_t cb, void *hook)
|
|
|
|
|
{
|
|
|
|
|
struct result_xml_state state;
|
|
|
|
|
gpgme_verify_result_t res = gpgme_op_verify_result (ctx);
|
|
|
|
|
gpgme_signature_t sig;
|
|
|
|
|
|
|
|
|
|
if (! res)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
result_init (&state, indent, cb, hook);
|
|
|
|
|
result_xml_tag_start (&state, "verify-result", NULL);
|
|
|
|
|
|
|
|
|
|
if (res->file_name)
|
|
|
|
|
{
|
|
|
|
|
result_xml_tag_start (&state, "file-name", NULL);
|
|
|
|
|
result_xml_tag_data (&state, res->file_name);
|
|
|
|
|
result_xml_tag_end (&state);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
sig = res->signatures;
|
|
|
|
|
if (sig)
|
|
|
|
|
{
|
|
|
|
|
result_xml_tag_start (&state, "signatures", NULL);
|
|
|
|
|
|
|
|
|
|
while (sig)
|
|
|
|
|
{
|
|
|
|
|
result_xml_tag_start (&state, "signature", NULL);
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2010-02-16 19:37:51 +00:00
|
|
|
|
/* FIXME: Could be done better. */
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
result_add_value (&state, "summary", sig->summary);
|
2010-08-03 09:16:01 +00:00
|
|
|
|
if (sig->fpr)
|
|
|
|
|
result_add_fpr (&state, "fpr", sig->fpr);
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
result_add_error (&state, "status", sig->status);
|
2010-02-16 19:37:51 +00:00
|
|
|
|
/* FIXME: notations */
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
result_add_timestamp (&state, "timestamp", sig->timestamp);
|
|
|
|
|
result_add_timestamp (&state, "exp-timestamp", sig->exp_timestamp);
|
|
|
|
|
result_add_value (&state, "wrong-key-usage", sig->wrong_key_usage);
|
|
|
|
|
result_add_value (&state, "pka-trust", sig->pka_trust);
|
|
|
|
|
result_add_value (&state, "chain-model", sig->chain_model);
|
|
|
|
|
result_add_value (&state, "validity", sig->validity);
|
|
|
|
|
result_add_error (&state, "validity-reason", sig->validity_reason);
|
|
|
|
|
result_add_pubkey_algo (&state, "pubkey-algo", sig->pubkey_algo);
|
|
|
|
|
result_add_hash_algo (&state, "hash-algo", sig->hash_algo);
|
|
|
|
|
if (sig->pka_address)
|
|
|
|
|
result_add_string (&state, "pka_address", sig->pka_address);
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
result_xml_tag_end (&state);
|
|
|
|
|
sig = sig->next;
|
|
|
|
|
}
|
|
|
|
|
result_xml_tag_end (&state);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
result_xml_tag_end (&state);
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
result_import_to_xml (gpgme_ctx_t ctx, int indent,
|
|
|
|
|
result_xml_write_cb_t cb, void *hook)
|
|
|
|
|
{
|
|
|
|
|
struct result_xml_state state;
|
|
|
|
|
gpgme_import_result_t res = gpgme_op_import_result (ctx);
|
|
|
|
|
gpgme_import_status_t stat;
|
|
|
|
|
|
|
|
|
|
if (! res)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
result_init (&state, indent, cb, hook);
|
|
|
|
|
result_xml_tag_start (&state, "import-result", NULL);
|
|
|
|
|
|
|
|
|
|
result_add_value (&state, "considered", res->considered);
|
|
|
|
|
result_add_value (&state, "no-user-id", res->no_user_id);
|
|
|
|
|
result_add_value (&state, "imported", res->imported);
|
|
|
|
|
result_add_value (&state, "imported-rsa", res->imported_rsa);
|
|
|
|
|
result_add_value (&state, "unchanged", res->unchanged);
|
|
|
|
|
result_add_value (&state, "new-user-ids", res->new_user_ids);
|
|
|
|
|
result_add_value (&state, "new-sub-keys", res->new_sub_keys);
|
|
|
|
|
result_add_value (&state, "new-signatures", res->new_signatures);
|
|
|
|
|
result_add_value (&state, "new-revocations", res->new_revocations);
|
|
|
|
|
result_add_value (&state, "secret-read", res->secret_read);
|
|
|
|
|
result_add_value (&state, "secret-imported", res->secret_imported);
|
|
|
|
|
result_add_value (&state, "secret-unchanged", res->secret_unchanged);
|
|
|
|
|
result_add_value (&state, "skipped-new-keys", res->skipped_new_keys);
|
|
|
|
|
result_add_value (&state, "not-imported", res->not_imported);
|
|
|
|
|
|
|
|
|
|
stat = res->imports;
|
|
|
|
|
if (stat)
|
|
|
|
|
{
|
|
|
|
|
result_xml_tag_start (&state, "imports", NULL);
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
while (stat)
|
|
|
|
|
{
|
|
|
|
|
result_xml_tag_start (&state, "import-status", NULL);
|
|
|
|
|
|
2010-08-03 09:16:01 +00:00
|
|
|
|
if (stat->fpr)
|
|
|
|
|
result_add_fpr (&state, "fpr", stat->fpr);
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
result_add_error (&state, "result", stat->result);
|
2010-02-16 19:37:51 +00:00
|
|
|
|
/* FIXME: Could be done better. */
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
result_add_value (&state, "status", stat->status);
|
|
|
|
|
|
|
|
|
|
result_xml_tag_end (&state);
|
|
|
|
|
stat = stat->next;
|
|
|
|
|
}
|
|
|
|
|
result_xml_tag_end (&state);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
result_xml_tag_end (&state);
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
result_genkey_to_xml (gpgme_ctx_t ctx, int indent,
|
|
|
|
|
result_xml_write_cb_t cb, void *hook)
|
|
|
|
|
{
|
|
|
|
|
struct result_xml_state state;
|
|
|
|
|
gpgme_genkey_result_t res = gpgme_op_genkey_result (ctx);
|
|
|
|
|
|
|
|
|
|
if (! res)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
result_init (&state, indent, cb, hook);
|
|
|
|
|
result_xml_tag_start (&state, "genkey-result", NULL);
|
|
|
|
|
|
|
|
|
|
result_add_value (&state, "primary", res->primary);
|
|
|
|
|
result_add_value (&state, "sub", res->sub);
|
2010-08-03 09:16:01 +00:00
|
|
|
|
if (res->fpr)
|
|
|
|
|
result_add_fpr (&state, "fpr", res->fpr);
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
|
|
|
|
|
result_xml_tag_end (&state);
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
result_keylist_to_xml (gpgme_ctx_t ctx, int indent,
|
|
|
|
|
result_xml_write_cb_t cb, void *hook)
|
|
|
|
|
{
|
|
|
|
|
struct result_xml_state state;
|
|
|
|
|
gpgme_keylist_result_t res = gpgme_op_keylist_result (ctx);
|
|
|
|
|
|
|
|
|
|
if (! res)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
result_init (&state, indent, cb, hook);
|
|
|
|
|
result_xml_tag_start (&state, "keylist-result", NULL);
|
|
|
|
|
|
|
|
|
|
result_add_value (&state, "truncated", res->truncated);
|
|
|
|
|
|
|
|
|
|
result_xml_tag_end (&state);
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
result_vfs_mount_to_xml (gpgme_ctx_t ctx, int indent,
|
|
|
|
|
result_xml_write_cb_t cb, void *hook)
|
|
|
|
|
{
|
|
|
|
|
struct result_xml_state state;
|
|
|
|
|
gpgme_vfs_mount_result_t res = gpgme_op_vfs_mount_result (ctx);
|
|
|
|
|
|
|
|
|
|
if (! res)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
result_init (&state, indent, cb, hook);
|
|
|
|
|
result_xml_tag_start (&state, "vfs-mount-result", NULL);
|
|
|
|
|
|
|
|
|
|
result_add_string (&state, "mount-dir", res->mount_dir);
|
|
|
|
|
|
|
|
|
|
result_xml_tag_end (&state);
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
|
|
|
|
|
typedef enum status
|
|
|
|
|
{
|
|
|
|
|
STATUS_PROTOCOL,
|
|
|
|
|
STATUS_PROGRESS,
|
|
|
|
|
STATUS_ENGINE,
|
|
|
|
|
STATUS_ARMOR,
|
|
|
|
|
STATUS_TEXTMODE,
|
|
|
|
|
STATUS_INCLUDE_CERTS,
|
|
|
|
|
STATUS_KEYLIST_MODE,
|
2009-11-03 19:15:35 +00:00
|
|
|
|
STATUS_RECIPIENT,
|
2013-08-09 17:19:26 +00:00
|
|
|
|
STATUS_ENCRYPT_RESULT,
|
|
|
|
|
STATUS_IDENTIFY_RESULT
|
2009-10-30 14:21:08 +00:00
|
|
|
|
} status_t;
|
|
|
|
|
|
|
|
|
|
const char *status_string[] =
|
|
|
|
|
{
|
|
|
|
|
"PROTOCOL",
|
|
|
|
|
"PROGRESS",
|
|
|
|
|
"ENGINE",
|
|
|
|
|
"ARMOR",
|
|
|
|
|
"TEXTMODE",
|
|
|
|
|
"INCLUDE_CERTS",
|
|
|
|
|
"KEYLIST_MODE",
|
2009-11-03 19:15:35 +00:00
|
|
|
|
"RECIPIENT",
|
2013-08-09 17:19:26 +00:00
|
|
|
|
"ENCRYPT_RESULT",
|
|
|
|
|
"IDENTIFY_RESULT"
|
2009-10-30 14:21:08 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct gpgme_tool
|
|
|
|
|
{
|
|
|
|
|
gpgme_ctx_t ctx;
|
|
|
|
|
#define MAX_RECIPIENTS 10
|
|
|
|
|
gpgme_key_t recipients[MAX_RECIPIENTS + 1];
|
|
|
|
|
int recipients_nr;
|
|
|
|
|
|
|
|
|
|
gpg_error_t (*write_status) (void *hook, const char *status, const char *msg);
|
|
|
|
|
void *write_status_hook;
|
2009-11-06 00:44:44 +00:00
|
|
|
|
gpg_error_t (*write_data) (void *hook, const void *buf, size_t len);
|
|
|
|
|
void *write_data_hook;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
};
|
|
|
|
|
typedef struct gpgme_tool *gpgme_tool_t;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Forward declaration. */
|
2012-09-25 13:29:49 +00:00
|
|
|
|
void gt_write_status (gpgme_tool_t gt,
|
2009-12-01 11:00:27 +00:00
|
|
|
|
status_t status, ...) GT_GCC_A_SENTINEL(0);
|
2013-02-07 20:03:02 +00:00
|
|
|
|
static gpg_error_t
|
|
|
|
|
server_passphrase_cb (void *opaque, const char *uid_hint, const char *info,
|
|
|
|
|
int was_bad, int fd);
|
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
_gt_progress_cb (void *opaque, const char *what,
|
|
|
|
|
int type, int current, int total)
|
|
|
|
|
{
|
|
|
|
|
gpgme_tool_t gt = opaque;
|
|
|
|
|
char buf[100];
|
|
|
|
|
|
|
|
|
|
snprintf (buf, sizeof (buf), "0x%02x %i %i", type, current, total);
|
2009-12-01 11:00:27 +00:00
|
|
|
|
gt_write_status (gt, STATUS_PROGRESS, what, buf, NULL);
|
2009-10-30 14:21:08 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
_gt_gpgme_new (gpgme_tool_t gt, gpgme_ctx_t *ctx)
|
|
|
|
|
{
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
|
|
|
|
|
err = gpgme_new (ctx);
|
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
2009-12-01 11:21:47 +00:00
|
|
|
|
gpgme_set_progress_cb (*ctx, _gt_progress_cb, gt);
|
|
|
|
|
return 0;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
gt_init (gpgme_tool_t gt)
|
|
|
|
|
{
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
|
2013-02-07 20:03:02 +00:00
|
|
|
|
memset (gt, '\0', sizeof (*gt));
|
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
err = _gt_gpgme_new (gt, >->ctx);
|
|
|
|
|
if (err)
|
|
|
|
|
log_error (1, err, "can't create gpgme context");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
gt_signers_add (gpgme_tool_t gt, const char *fpr)
|
|
|
|
|
{
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
gpgme_key_t key;
|
|
|
|
|
|
|
|
|
|
err = gpgme_get_key (gt->ctx, fpr, &key, 0);
|
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
|
|
|
|
|
|
|
|
|
return gpgme_signers_add (gt->ctx, key);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
gt_signers_clear (gpgme_tool_t gt)
|
|
|
|
|
{
|
|
|
|
|
gpgme_signers_clear (gt->ctx);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
2009-11-03 19:15:35 +00:00
|
|
|
|
gt_get_key (gpgme_tool_t gt, const char *pattern, gpgme_key_t *r_key)
|
|
|
|
|
{
|
|
|
|
|
gpgme_ctx_t ctx;
|
|
|
|
|
gpgme_ctx_t listctx;
|
|
|
|
|
gpgme_error_t err;
|
|
|
|
|
gpgme_key_t key;
|
|
|
|
|
|
|
|
|
|
if (!gt || !r_key || !pattern)
|
|
|
|
|
return gpg_error (GPG_ERR_INV_VALUE);
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2009-11-03 19:15:35 +00:00
|
|
|
|
ctx = gt->ctx;
|
|
|
|
|
|
|
|
|
|
err = gpgme_new (&listctx);
|
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
gpgme_protocol_t proto;
|
|
|
|
|
gpgme_engine_info_t info;
|
|
|
|
|
|
|
|
|
|
/* Clone the relevant state. */
|
|
|
|
|
proto = gpgme_get_protocol (ctx);
|
|
|
|
|
/* The g13 protocol does not allow keylisting, we need to choose
|
|
|
|
|
something else. */
|
|
|
|
|
if (proto == GPGME_PROTOCOL_G13)
|
|
|
|
|
proto = GPGME_PROTOCOL_OpenPGP;
|
|
|
|
|
|
|
|
|
|
gpgme_set_protocol (listctx, proto);
|
|
|
|
|
gpgme_set_keylist_mode (listctx, gpgme_get_keylist_mode (ctx));
|
|
|
|
|
info = gpgme_ctx_get_engine_info (ctx);
|
|
|
|
|
while (info && info->protocol != proto)
|
|
|
|
|
info = info->next;
|
|
|
|
|
if (info)
|
|
|
|
|
gpgme_ctx_set_engine_info (listctx, proto,
|
|
|
|
|
info->file_name, info->home_dir);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
err = gpgme_op_keylist_start (listctx, pattern, 0);
|
|
|
|
|
if (!err)
|
|
|
|
|
err = gpgme_op_keylist_next (listctx, r_key);
|
|
|
|
|
if (!err)
|
|
|
|
|
{
|
|
|
|
|
try_next_key:
|
|
|
|
|
err = gpgme_op_keylist_next (listctx, &key);
|
|
|
|
|
if (gpgme_err_code (err) == GPG_ERR_EOF)
|
|
|
|
|
err = 0;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (!err
|
|
|
|
|
&& *r_key && (*r_key)->subkeys && (*r_key)->subkeys->fpr
|
|
|
|
|
&& key && key->subkeys && key->subkeys->fpr
|
|
|
|
|
&& !strcmp ((*r_key)->subkeys->fpr, key->subkeys->fpr))
|
|
|
|
|
{
|
|
|
|
|
/* The fingerprint is identical. We assume that this is
|
|
|
|
|
the same key and don't mark it as an ambiguous. This
|
|
|
|
|
problem may occur with corrupted keyrings and has
|
|
|
|
|
been noticed often with gpgsm. In fact gpgsm uses a
|
|
|
|
|
similar hack to sort out such duplicates but it can't
|
|
|
|
|
do that while listing keys. */
|
|
|
|
|
gpgme_key_unref (key);
|
|
|
|
|
goto try_next_key;
|
|
|
|
|
}
|
|
|
|
|
if (!err)
|
|
|
|
|
{
|
|
|
|
|
gpgme_key_unref (key);
|
|
|
|
|
err = gpg_error (GPG_ERR_AMBIGUOUS_NAME);
|
|
|
|
|
}
|
|
|
|
|
gpgme_key_unref (*r_key);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
gpgme_release (listctx);
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2009-11-03 19:15:35 +00:00
|
|
|
|
if (! err)
|
2012-09-25 13:29:49 +00:00
|
|
|
|
gt_write_status (gt, STATUS_RECIPIENT,
|
|
|
|
|
((*r_key)->subkeys && (*r_key)->subkeys->fpr) ?
|
2009-11-03 19:15:35 +00:00
|
|
|
|
(*r_key)->subkeys->fpr : "invalid", NULL);
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
gt_recipients_add (gpgme_tool_t gt, const char *pattern)
|
2009-10-30 14:21:08 +00:00
|
|
|
|
{
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
gpgme_key_t key;
|
|
|
|
|
|
|
|
|
|
if (gt->recipients_nr >= MAX_RECIPIENTS)
|
2013-02-06 16:35:40 +00:00
|
|
|
|
return gpg_error (GPG_ERR_ENOMEM);
|
2009-10-30 14:21:08 +00:00
|
|
|
|
|
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Activate UIServer if FD passing is enabled and
Assuan is available.
m4/
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* libassuan.m4: Fix LIBASSUAN_VERSION.
src/
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (uiserver_components): New variable.
(main_sources): Add it.
* ops.h, key.c (_gpgme_key_append_name): Take CONVERT argument,
implement it. Adjust callers.
(gpgme_key_from_uid): New function.
* gpgme.h.in (gpgme_protocol_t): Add GPGME_PROTOCOL_DEFAULT.
(gpgme_encrypt_flags_t): Add GPGME_ENCRYPT_PREPARE,
GPGME_ENCRYPT_EXPECT_SIGN.
(gpgme_set_sub_protocol, gpgme_key_from_uid): New functions.
* libgpgme.vers, gpgme.def: Add new functions.
* gpgme.c (gpgme_set_protocol): Add UIServer protocol.
(gpgme_set_sub_protocol): New function.
(gpgme_get_protocol_name): Add UIServer and default protocol.
* assuan-support.c: Return correct error values, implement
socketpair for POSIX.
* priv-io.h, posix-io.c, w32-io.c, w32-glib-io.c,
w32-qt-io.cpp (_gpgme_io_spawn): Add ATFORK and ATFORKVALUE
arguments. Implement it for POSIX. Adjust all callers.
* engine.h, engine-backend.h (_gpgme_engine_set_protocol)
(_gpgme_engine_op_decrypt_verify): New prototypes. Adjust all
users.
* engine.c (engine_ops, gpgme_get_engine_info): Add UIServer
engine.
(_gpgme_engine_set_protocol, _gpgme_engine_op_decrypt_verify): New
function.
* decrypt-verify.c (decrypt_verify_start): Call
_gpgme_engine_op_decrypt_verify.
* util.h, posix-util.c,
w32-util.c (_gpgme_get_uiserver_socket_path): New function.
* engine-gpgsm.c (gpgsm_set_fd): Fix _gpgme_io_pipe invocation.
* gpgme-tool.c: Some support for UIServer protocol.
* engine-uiserver.c: New file.
2009-11-10 09:07:19 +00:00
|
|
|
|
if (gpgme_get_protocol (gt->ctx) == GPGME_PROTOCOL_UISERVER)
|
|
|
|
|
err = gpgme_key_from_uid (&key, pattern);
|
|
|
|
|
else
|
|
|
|
|
err = gt_get_key (gt, pattern, &key);
|
2009-10-30 14:21:08 +00:00
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
|
|
|
|
|
|
|
|
|
gt->recipients[gt->recipients_nr++] = key;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
gt_recipients_clear (gpgme_tool_t gt)
|
|
|
|
|
{
|
|
|
|
|
int idx;
|
|
|
|
|
|
|
|
|
|
for (idx = 0; idx < gt->recipients_nr; idx++)
|
|
|
|
|
gpgme_key_unref (gt->recipients[idx]);
|
|
|
|
|
memset (gt->recipients, '\0', gt->recipients_nr * sizeof (gpgme_key_t));
|
|
|
|
|
gt->recipients_nr = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
gt_reset (gpgme_tool_t gt)
|
|
|
|
|
{
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
gpgme_ctx_t ctx;
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
err = _gt_gpgme_new (gt, &ctx);
|
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
|
|
|
|
|
|
|
|
|
gpgme_release (gt->ctx);
|
|
|
|
|
gt->ctx = ctx;
|
|
|
|
|
gt_recipients_clear (gt);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
gt_write_status (gpgme_tool_t gt, status_t status, ...)
|
|
|
|
|
{
|
|
|
|
|
va_list ap;
|
|
|
|
|
const char *text;
|
|
|
|
|
char buf[950];
|
|
|
|
|
char *p;
|
|
|
|
|
size_t n;
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
|
|
|
|
|
va_start (ap, status);
|
|
|
|
|
p = buf;
|
|
|
|
|
n = 0;
|
|
|
|
|
while ((text = va_arg (ap, const char *)))
|
|
|
|
|
{
|
|
|
|
|
if (n)
|
|
|
|
|
{
|
|
|
|
|
*p++ = ' ';
|
|
|
|
|
n++;
|
|
|
|
|
}
|
|
|
|
|
while (*text && n < sizeof (buf) - 2)
|
|
|
|
|
{
|
|
|
|
|
*p++ = *text++;
|
|
|
|
|
n++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
*p = 0;
|
|
|
|
|
va_end (ap);
|
|
|
|
|
|
|
|
|
|
err = gt->write_status (gt->write_status_hook, status_string[status], buf);
|
|
|
|
|
if (err)
|
|
|
|
|
log_error (1, err, "can't write status line");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-11-06 00:44:44 +00:00
|
|
|
|
gpg_error_t
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
gt_write_data (gpgme_tool_t gt, const void *buf, size_t len)
|
2009-11-06 00:44:44 +00:00
|
|
|
|
{
|
|
|
|
|
return gt->write_data (gt->write_data_hook, buf, len);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
gpg_error_t
|
|
|
|
|
gt_get_engine_info (gpgme_tool_t gt, gpgme_protocol_t proto)
|
|
|
|
|
{
|
|
|
|
|
gpgme_engine_info_t info;
|
|
|
|
|
info = gpgme_ctx_get_engine_info (gt->ctx);
|
|
|
|
|
while (info)
|
|
|
|
|
{
|
|
|
|
|
if (proto == GPGME_PROTOCOL_UNKNOWN || proto == info->protocol)
|
|
|
|
|
gt_write_status (gt, STATUS_ENGINE,
|
|
|
|
|
gpgme_get_protocol_name (info->protocol),
|
|
|
|
|
info->file_name, info->version,
|
2009-12-01 11:00:27 +00:00
|
|
|
|
info->req_version, info->home_dir, NULL);
|
2009-10-30 14:21:08 +00:00
|
|
|
|
info = info->next;
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpgme_protocol_t
|
|
|
|
|
gt_protocol_from_name (const char *name)
|
|
|
|
|
{
|
|
|
|
|
if (! strcasecmp (name, gpgme_get_protocol_name (GPGME_PROTOCOL_OpenPGP)))
|
|
|
|
|
return GPGME_PROTOCOL_OpenPGP;
|
|
|
|
|
if (! strcasecmp (name, gpgme_get_protocol_name (GPGME_PROTOCOL_CMS)))
|
|
|
|
|
return GPGME_PROTOCOL_CMS;
|
|
|
|
|
if (! strcasecmp (name,gpgme_get_protocol_name (GPGME_PROTOCOL_GPGCONF)))
|
|
|
|
|
return GPGME_PROTOCOL_GPGCONF;
|
|
|
|
|
if (! strcasecmp (name, gpgme_get_protocol_name (GPGME_PROTOCOL_ASSUAN)))
|
|
|
|
|
return GPGME_PROTOCOL_ASSUAN;
|
|
|
|
|
if (! strcasecmp (name, gpgme_get_protocol_name (GPGME_PROTOCOL_G13)))
|
|
|
|
|
return GPGME_PROTOCOL_G13;
|
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Activate UIServer if FD passing is enabled and
Assuan is available.
m4/
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* libassuan.m4: Fix LIBASSUAN_VERSION.
src/
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (uiserver_components): New variable.
(main_sources): Add it.
* ops.h, key.c (_gpgme_key_append_name): Take CONVERT argument,
implement it. Adjust callers.
(gpgme_key_from_uid): New function.
* gpgme.h.in (gpgme_protocol_t): Add GPGME_PROTOCOL_DEFAULT.
(gpgme_encrypt_flags_t): Add GPGME_ENCRYPT_PREPARE,
GPGME_ENCRYPT_EXPECT_SIGN.
(gpgme_set_sub_protocol, gpgme_key_from_uid): New functions.
* libgpgme.vers, gpgme.def: Add new functions.
* gpgme.c (gpgme_set_protocol): Add UIServer protocol.
(gpgme_set_sub_protocol): New function.
(gpgme_get_protocol_name): Add UIServer and default protocol.
* assuan-support.c: Return correct error values, implement
socketpair for POSIX.
* priv-io.h, posix-io.c, w32-io.c, w32-glib-io.c,
w32-qt-io.cpp (_gpgme_io_spawn): Add ATFORK and ATFORKVALUE
arguments. Implement it for POSIX. Adjust all callers.
* engine.h, engine-backend.h (_gpgme_engine_set_protocol)
(_gpgme_engine_op_decrypt_verify): New prototypes. Adjust all
users.
* engine.c (engine_ops, gpgme_get_engine_info): Add UIServer
engine.
(_gpgme_engine_set_protocol, _gpgme_engine_op_decrypt_verify): New
function.
* decrypt-verify.c (decrypt_verify_start): Call
_gpgme_engine_op_decrypt_verify.
* util.h, posix-util.c,
w32-util.c (_gpgme_get_uiserver_socket_path): New function.
* engine-gpgsm.c (gpgsm_set_fd): Fix _gpgme_io_pipe invocation.
* gpgme-tool.c: Some support for UIServer protocol.
* engine-uiserver.c: New file.
2009-11-10 09:07:19 +00:00
|
|
|
|
if (! strcasecmp (name, gpgme_get_protocol_name (GPGME_PROTOCOL_UISERVER)))
|
|
|
|
|
return GPGME_PROTOCOL_UISERVER;
|
2014-04-10 11:01:00 +00:00
|
|
|
|
if (! strcasecmp (name, gpgme_get_protocol_name (GPGME_PROTOCOL_SPAWN)))
|
|
|
|
|
return GPGME_PROTOCOL_SPAWN;
|
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Activate UIServer if FD passing is enabled and
Assuan is available.
m4/
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* libassuan.m4: Fix LIBASSUAN_VERSION.
src/
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (uiserver_components): New variable.
(main_sources): Add it.
* ops.h, key.c (_gpgme_key_append_name): Take CONVERT argument,
implement it. Adjust callers.
(gpgme_key_from_uid): New function.
* gpgme.h.in (gpgme_protocol_t): Add GPGME_PROTOCOL_DEFAULT.
(gpgme_encrypt_flags_t): Add GPGME_ENCRYPT_PREPARE,
GPGME_ENCRYPT_EXPECT_SIGN.
(gpgme_set_sub_protocol, gpgme_key_from_uid): New functions.
* libgpgme.vers, gpgme.def: Add new functions.
* gpgme.c (gpgme_set_protocol): Add UIServer protocol.
(gpgme_set_sub_protocol): New function.
(gpgme_get_protocol_name): Add UIServer and default protocol.
* assuan-support.c: Return correct error values, implement
socketpair for POSIX.
* priv-io.h, posix-io.c, w32-io.c, w32-glib-io.c,
w32-qt-io.cpp (_gpgme_io_spawn): Add ATFORK and ATFORKVALUE
arguments. Implement it for POSIX. Adjust all callers.
* engine.h, engine-backend.h (_gpgme_engine_set_protocol)
(_gpgme_engine_op_decrypt_verify): New prototypes. Adjust all
users.
* engine.c (engine_ops, gpgme_get_engine_info): Add UIServer
engine.
(_gpgme_engine_set_protocol, _gpgme_engine_op_decrypt_verify): New
function.
* decrypt-verify.c (decrypt_verify_start): Call
_gpgme_engine_op_decrypt_verify.
* util.h, posix-util.c,
w32-util.c (_gpgme_get_uiserver_socket_path): New function.
* engine-gpgsm.c (gpgsm_set_fd): Fix _gpgme_io_pipe invocation.
* gpgme-tool.c: Some support for UIServer protocol.
* engine-uiserver.c: New file.
2009-11-10 09:07:19 +00:00
|
|
|
|
if (! strcasecmp (name, gpgme_get_protocol_name (GPGME_PROTOCOL_DEFAULT)))
|
|
|
|
|
return GPGME_PROTOCOL_DEFAULT;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
return GPGME_PROTOCOL_UNKNOWN;
|
|
|
|
|
}
|
|
|
|
|
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
gpg_error_t
|
|
|
|
|
gt_set_protocol (gpgme_tool_t gt, gpgme_protocol_t proto)
|
|
|
|
|
{
|
|
|
|
|
return gpgme_set_protocol (gt->ctx, proto);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-11-10 14:54:39 +00:00
|
|
|
|
gpg_error_t
|
|
|
|
|
gt_get_protocol (gpgme_tool_t gt)
|
|
|
|
|
{
|
|
|
|
|
gpgme_protocol_t proto = gpgme_get_protocol (gt->ctx);
|
|
|
|
|
|
|
|
|
|
gt_write_status (gt, STATUS_PROTOCOL, gpgme_get_protocol_name (proto),
|
|
|
|
|
NULL);
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Activate UIServer if FD passing is enabled and
Assuan is available.
m4/
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* libassuan.m4: Fix LIBASSUAN_VERSION.
src/
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (uiserver_components): New variable.
(main_sources): Add it.
* ops.h, key.c (_gpgme_key_append_name): Take CONVERT argument,
implement it. Adjust callers.
(gpgme_key_from_uid): New function.
* gpgme.h.in (gpgme_protocol_t): Add GPGME_PROTOCOL_DEFAULT.
(gpgme_encrypt_flags_t): Add GPGME_ENCRYPT_PREPARE,
GPGME_ENCRYPT_EXPECT_SIGN.
(gpgme_set_sub_protocol, gpgme_key_from_uid): New functions.
* libgpgme.vers, gpgme.def: Add new functions.
* gpgme.c (gpgme_set_protocol): Add UIServer protocol.
(gpgme_set_sub_protocol): New function.
(gpgme_get_protocol_name): Add UIServer and default protocol.
* assuan-support.c: Return correct error values, implement
socketpair for POSIX.
* priv-io.h, posix-io.c, w32-io.c, w32-glib-io.c,
w32-qt-io.cpp (_gpgme_io_spawn): Add ATFORK and ATFORKVALUE
arguments. Implement it for POSIX. Adjust all callers.
* engine.h, engine-backend.h (_gpgme_engine_set_protocol)
(_gpgme_engine_op_decrypt_verify): New prototypes. Adjust all
users.
* engine.c (engine_ops, gpgme_get_engine_info): Add UIServer
engine.
(_gpgme_engine_set_protocol, _gpgme_engine_op_decrypt_verify): New
function.
* decrypt-verify.c (decrypt_verify_start): Call
_gpgme_engine_op_decrypt_verify.
* util.h, posix-util.c,
w32-util.c (_gpgme_get_uiserver_socket_path): New function.
* engine-gpgsm.c (gpgsm_set_fd): Fix _gpgme_io_pipe invocation.
* gpgme-tool.c: Some support for UIServer protocol.
* engine-uiserver.c: New file.
2009-11-10 09:07:19 +00:00
|
|
|
|
gpg_error_t
|
|
|
|
|
gt_set_sub_protocol (gpgme_tool_t gt, gpgme_protocol_t proto)
|
|
|
|
|
{
|
|
|
|
|
return gpgme_set_sub_protocol (gt->ctx, proto);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
gpg_error_t
|
2009-11-10 14:54:39 +00:00
|
|
|
|
gt_get_sub_protocol (gpgme_tool_t gt)
|
2009-10-30 14:21:08 +00:00
|
|
|
|
{
|
2009-11-10 14:54:39 +00:00
|
|
|
|
gpgme_protocol_t proto = gpgme_get_sub_protocol (gt->ctx);
|
2009-10-30 14:21:08 +00:00
|
|
|
|
|
|
|
|
|
gt_write_status (gt, STATUS_PROTOCOL, gpgme_get_protocol_name (proto),
|
|
|
|
|
NULL);
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2013-02-07 20:03:02 +00:00
|
|
|
|
gpg_error_t
|
|
|
|
|
gt_set_pinentry_mode (gpgme_tool_t gt, gpgme_pinentry_mode_t mode, void *opaque)
|
|
|
|
|
{
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
|
|
|
|
|
gpgme_set_passphrase_cb (gt->ctx, NULL, NULL);
|
|
|
|
|
err = gpgme_set_pinentry_mode (gt->ctx, mode);
|
|
|
|
|
if (!err && mode == GPGME_PINENTRY_MODE_LOOPBACK)
|
|
|
|
|
gpgme_set_passphrase_cb (gt->ctx, server_passphrase_cb, opaque);
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
gpg_error_t
|
|
|
|
|
gt_set_armor (gpgme_tool_t gt, int armor)
|
|
|
|
|
{
|
|
|
|
|
gpgme_set_armor (gt->ctx, armor);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
gt_get_armor (gpgme_tool_t gt)
|
|
|
|
|
{
|
|
|
|
|
gt_write_status (gt, STATUS_ARMOR,
|
|
|
|
|
gpgme_get_armor (gt->ctx) ? "true" : "false", NULL);
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
gt_set_textmode (gpgme_tool_t gt, int textmode)
|
|
|
|
|
{
|
|
|
|
|
gpgme_set_textmode (gt->ctx, textmode);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
gt_get_textmode (gpgme_tool_t gt)
|
|
|
|
|
{
|
|
|
|
|
gt_write_status (gt, STATUS_TEXTMODE,
|
|
|
|
|
gpgme_get_textmode (gt->ctx) ? "true" : "false", NULL);
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
gt_set_keylist_mode (gpgme_tool_t gt, gpgme_keylist_mode_t keylist_mode)
|
|
|
|
|
{
|
|
|
|
|
gpgme_set_keylist_mode (gt->ctx, keylist_mode);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
gt_get_keylist_mode (gpgme_tool_t gt)
|
|
|
|
|
{
|
|
|
|
|
#define NR_KEYLIST_MODES 6
|
|
|
|
|
const char *modes[NR_KEYLIST_MODES + 1];
|
|
|
|
|
int idx = 0;
|
|
|
|
|
gpgme_keylist_mode_t mode = gpgme_get_keylist_mode (gt->ctx);
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
if (mode & GPGME_KEYLIST_MODE_LOCAL)
|
|
|
|
|
modes[idx++] = "local";
|
|
|
|
|
if (mode & GPGME_KEYLIST_MODE_EXTERN)
|
|
|
|
|
modes[idx++] = "extern";
|
|
|
|
|
if (mode & GPGME_KEYLIST_MODE_SIGS)
|
|
|
|
|
modes[idx++] = "sigs";
|
|
|
|
|
if (mode & GPGME_KEYLIST_MODE_SIG_NOTATIONS)
|
|
|
|
|
modes[idx++] = "sig_notations";
|
2014-06-04 07:57:54 +00:00
|
|
|
|
if (mode & GPGME_KEYLIST_MODE_WITH_SECRET)
|
|
|
|
|
modes[idx++] = "with_secret";
|
2009-10-30 14:21:08 +00:00
|
|
|
|
if (mode & GPGME_KEYLIST_MODE_EPHEMERAL)
|
|
|
|
|
modes[idx++] = "ephemeral";
|
|
|
|
|
if (mode & GPGME_KEYLIST_MODE_VALIDATE)
|
|
|
|
|
modes[idx++] = "validate";
|
|
|
|
|
modes[idx++] = NULL;
|
|
|
|
|
|
|
|
|
|
gt_write_status (gt, STATUS_KEYLIST_MODE, modes[0], modes[1], modes[2],
|
2009-12-01 11:00:27 +00:00
|
|
|
|
modes[3], modes[4], modes[5], modes[6], NULL);
|
2009-10-30 14:21:08 +00:00
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
gt_set_include_certs (gpgme_tool_t gt, int include_certs)
|
|
|
|
|
{
|
|
|
|
|
gpgme_set_include_certs (gt->ctx, include_certs);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
gt_get_include_certs (gpgme_tool_t gt)
|
|
|
|
|
{
|
|
|
|
|
int include_certs = gpgme_get_include_certs (gt->ctx);
|
|
|
|
|
char buf[100];
|
|
|
|
|
|
|
|
|
|
if (include_certs == GPGME_INCLUDE_CERTS_DEFAULT)
|
|
|
|
|
strcpy (buf, "default");
|
|
|
|
|
else
|
|
|
|
|
snprintf (buf, sizeof (buf), "%i", include_certs);
|
|
|
|
|
|
|
|
|
|
gt_write_status (gt, STATUS_INCLUDE_CERTS, buf, NULL);
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
gt_decrypt_verify (gpgme_tool_t gt, gpgme_data_t cipher, gpgme_data_t plain,
|
|
|
|
|
int verify)
|
|
|
|
|
{
|
|
|
|
|
if (verify)
|
|
|
|
|
return gpgme_op_decrypt_verify (gt->ctx, cipher, plain);
|
|
|
|
|
else
|
|
|
|
|
return gpgme_op_decrypt (gt->ctx, cipher, plain);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
gt_sign_encrypt (gpgme_tool_t gt, gpgme_encrypt_flags_t flags,
|
|
|
|
|
gpgme_data_t plain, gpgme_data_t cipher, int sign)
|
|
|
|
|
{
|
|
|
|
|
gpg_error_t err;
|
2013-05-22 08:50:12 +00:00
|
|
|
|
gpgme_key_t *recp;
|
|
|
|
|
|
|
|
|
|
recp = gt->recipients_nr? gt->recipients : NULL;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
|
|
|
|
|
if (sign)
|
2013-05-22 08:50:12 +00:00
|
|
|
|
err = gpgme_op_encrypt_sign (gt->ctx, recp, flags, plain, cipher);
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
else
|
2013-05-22 08:50:12 +00:00
|
|
|
|
err = gpgme_op_encrypt (gt->ctx, recp, flags, plain, cipher);
|
2009-10-30 14:21:08 +00:00
|
|
|
|
|
|
|
|
|
gt_recipients_clear (gt);
|
|
|
|
|
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
gt_sign (gpgme_tool_t gt, gpgme_data_t plain, gpgme_data_t sig,
|
|
|
|
|
gpgme_sig_mode_t mode)
|
|
|
|
|
{
|
|
|
|
|
return gpgme_op_sign (gt->ctx, plain, sig, mode);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
gt_verify (gpgme_tool_t gt, gpgme_data_t sig, gpgme_data_t sig_text,
|
|
|
|
|
gpgme_data_t plain)
|
|
|
|
|
{
|
|
|
|
|
return gpgme_op_verify (gt->ctx, sig, sig_text, plain);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
gt_import (gpgme_tool_t gt, gpgme_data_t data)
|
|
|
|
|
{
|
|
|
|
|
return gpgme_op_import (gt->ctx, data);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
gt_export (gpgme_tool_t gt, const char *pattern[], gpgme_export_mode_t mode,
|
|
|
|
|
gpgme_data_t data)
|
|
|
|
|
{
|
|
|
|
|
return gpgme_op_export_ext (gt->ctx, pattern, mode, data);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
gt_genkey (gpgme_tool_t gt, const char *parms, gpgme_data_t public,
|
|
|
|
|
gpgme_data_t secret)
|
|
|
|
|
{
|
|
|
|
|
return gpgme_op_genkey (gt->ctx, parms, public, secret);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
gt_import_keys (gpgme_tool_t gt, char *fpr[])
|
|
|
|
|
{
|
2010-05-06 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Require libgpg-error 1.8.
src/
2010-05-06 Marcus Brinkmann <marcus@g10code.de>
* sign.c, data-user.c, conversion.c, debug.c, verify.c, data.c,
decrypt.c, delete.c, assuan-support.c, import.c, engine-gpgsm.c,
data-mem.c, op-support.c, w32-io.c, w32-util.c, data-compat.c: Use
gpg_error_from_syserror instead gpg_error_from_errno, and use
gpg_err_set_errno to set error number.
* setenv.c: Include <gpg-error.h> and define __set_errno to use
gpg_err_set_errno.
* gpgme-tool.c (ARGP_ERR_UNKNOWN): Define to EDEADLOCK (which is
mapped in Windows CE) instead of E2BIG (which is not).
(gt_import_keys): Initialize err.
2010-05-06 13:39:55 +00:00
|
|
|
|
gpg_error_t err = 0;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
int cnt;
|
|
|
|
|
int idx;
|
|
|
|
|
gpgme_key_t *keys;
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
cnt = 0;
|
|
|
|
|
while (fpr[cnt])
|
|
|
|
|
cnt++;
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
if (! cnt)
|
|
|
|
|
return gpg_error (GPG_ERR_INV_VALUE);
|
|
|
|
|
|
|
|
|
|
keys = malloc ((cnt + 1) * sizeof (gpgme_key_t));
|
|
|
|
|
if (! keys)
|
|
|
|
|
return gpg_error_from_syserror ();
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
for (idx = 0; idx < cnt; idx++)
|
|
|
|
|
{
|
|
|
|
|
err = gpgme_get_key (gt->ctx, fpr[idx], &keys[idx], 0);
|
|
|
|
|
if (err)
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if (! err)
|
|
|
|
|
{
|
|
|
|
|
keys[cnt] = NULL;
|
|
|
|
|
err = gpgme_op_import_keys (gt->ctx, keys);
|
|
|
|
|
}
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
/* Rollback. */
|
|
|
|
|
while (--idx >= 0)
|
|
|
|
|
gpgme_key_unref (keys[idx]);
|
|
|
|
|
free (keys);
|
|
|
|
|
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
gt_delete (gpgme_tool_t gt, char *fpr, int allow_secret)
|
|
|
|
|
{
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
gpgme_key_t key;
|
|
|
|
|
|
|
|
|
|
err = gpgme_get_key (gt->ctx, fpr, &key, 0);
|
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
|
|
|
|
|
|
|
|
|
err = gpgme_op_delete (gt->ctx, key, allow_secret);
|
|
|
|
|
gpgme_key_unref (key);
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
gt_keylist_start (gpgme_tool_t gt, const char *pattern[], int secret_only)
|
|
|
|
|
{
|
|
|
|
|
return gpgme_op_keylist_ext_start (gt->ctx, pattern, secret_only, 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
gt_keylist_next (gpgme_tool_t gt, gpgme_key_t *key)
|
|
|
|
|
{
|
|
|
|
|
return gpgme_op_keylist_next (gt->ctx, key);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
gt_getauditlog (gpgme_tool_t gt, gpgme_data_t output, unsigned int flags)
|
|
|
|
|
{
|
|
|
|
|
return gpgme_op_getauditlog (gt->ctx, output, flags);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
gt_vfs_mount (gpgme_tool_t gt, const char *container_file,
|
|
|
|
|
const char *mount_dir, int flags)
|
|
|
|
|
{
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
gpg_error_t op_err;
|
|
|
|
|
err = gpgme_op_vfs_mount (gt->ctx, container_file, mount_dir, flags, &op_err);
|
2009-11-05 02:17:07 +00:00
|
|
|
|
return err ? err : op_err;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-11-03 19:15:35 +00:00
|
|
|
|
gpg_error_t
|
|
|
|
|
gt_vfs_create (gpgme_tool_t gt, const char *container_file, int flags)
|
|
|
|
|
{
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
gpg_error_t op_err;
|
|
|
|
|
err = gpgme_op_vfs_create (gt->ctx, gt->recipients, container_file,
|
|
|
|
|
flags, &op_err);
|
|
|
|
|
gt_recipients_clear (gt);
|
2009-11-05 02:17:07 +00:00
|
|
|
|
return err ? err : op_err;
|
2009-11-03 19:15:35 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2010-01-05 17:36:53 +00:00
|
|
|
|
gpg_error_t
|
|
|
|
|
gt_passwd (gpgme_tool_t gt, char *fpr)
|
|
|
|
|
{
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
gpgme_key_t key;
|
|
|
|
|
|
|
|
|
|
err = gpgme_get_key (gt->ctx, fpr, &key, 0);
|
|
|
|
|
if (err)
|
2010-01-08 19:15:06 +00:00
|
|
|
|
return gpg_err_code (err) == GPG_ERR_EOF? gpg_error (GPG_ERR_NO_PUBKEY):err;
|
2010-01-05 17:36:53 +00:00
|
|
|
|
|
|
|
|
|
err = gpgme_op_passwd (gt->ctx, key, 0);
|
|
|
|
|
gpgme_key_unref (key);
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2013-08-09 17:19:26 +00:00
|
|
|
|
gpg_error_t
|
|
|
|
|
gt_identify (gpgme_tool_t gt, gpgme_data_t data)
|
|
|
|
|
{
|
|
|
|
|
const char *s = "?";
|
|
|
|
|
|
|
|
|
|
switch (gpgme_data_identify (data, 0))
|
|
|
|
|
{
|
|
|
|
|
case GPGME_DATA_TYPE_INVALID: return gpg_error (GPG_ERR_GENERAL);
|
|
|
|
|
case GPGME_DATA_TYPE_UNKNOWN : s = "unknown"; break;
|
|
|
|
|
case GPGME_DATA_TYPE_PGP_SIGNED : s = "PGP-signed"; break;
|
2016-06-21 14:17:26 +00:00
|
|
|
|
case GPGME_DATA_TYPE_PGP_SIGNATURE: s = "PGP-signature"; break;
|
|
|
|
|
case GPGME_DATA_TYPE_PGP_ENCRYPTED: s = "PGP-encrypted"; break;
|
2013-08-09 17:19:26 +00:00
|
|
|
|
case GPGME_DATA_TYPE_PGP_OTHER : s = "PGP"; break;
|
|
|
|
|
case GPGME_DATA_TYPE_PGP_KEY : s = "PGP-key"; break;
|
|
|
|
|
case GPGME_DATA_TYPE_CMS_SIGNED : s = "CMS-signed"; break;
|
|
|
|
|
case GPGME_DATA_TYPE_CMS_ENCRYPTED: s = "CMS-encrypted"; break;
|
|
|
|
|
case GPGME_DATA_TYPE_CMS_OTHER : s = "CMS"; break;
|
|
|
|
|
case GPGME_DATA_TYPE_X509_CERT : s = "X.509"; break;
|
|
|
|
|
case GPGME_DATA_TYPE_PKCS12 : s = "PKCS12"; break;
|
|
|
|
|
}
|
|
|
|
|
gt_write_status (gt, STATUS_IDENTIFY_RESULT, s, NULL);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2014-04-10 11:01:00 +00:00
|
|
|
|
gpg_error_t
|
|
|
|
|
gt_spawn (gpgme_tool_t gt, const char *pgm,
|
|
|
|
|
gpgme_data_t inp, gpgme_data_t outp)
|
|
|
|
|
{
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
|
|
|
|
|
err = gpgme_op_spawn (gt->ctx, pgm, NULL, inp, outp, outp, 0);
|
|
|
|
|
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
#define GT_RESULT_ENCRYPT 0x1
|
|
|
|
|
#define GT_RESULT_DECRYPT 0x2
|
|
|
|
|
#define GT_RESULT_SIGN 0x4
|
|
|
|
|
#define GT_RESULT_VERIFY 0x8
|
|
|
|
|
#define GT_RESULT_IMPORT 0x10
|
|
|
|
|
#define GT_RESULT_GENKEY 0x20
|
|
|
|
|
#define GT_RESULT_KEYLIST 0x40
|
|
|
|
|
#define GT_RESULT_VFS_MOUNT 0x80
|
|
|
|
|
#define GT_RESULT_ALL (~0U)
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
gt_result (gpgme_tool_t gt, unsigned int flags)
|
|
|
|
|
{
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
int indent = 2;
|
|
|
|
|
|
2016-07-19 00:16:46 +00:00
|
|
|
|
gt_write_data (gt, xml_preamble1, strlen (xml_preamble1));
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
gt_write_data (gt, NULL, 0);
|
2016-07-19 00:16:46 +00:00
|
|
|
|
gt_write_data (gt, xml_preamble2, strlen (xml_preamble2));
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
gt_write_data (gt, NULL, 0);
|
2009-10-30 14:21:08 +00:00
|
|
|
|
if (flags & GT_RESULT_ENCRYPT)
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
result_encrypt_to_xml (gt->ctx, indent,
|
|
|
|
|
(result_xml_write_cb_t) gt_write_data, gt);
|
|
|
|
|
if (flags & GT_RESULT_DECRYPT)
|
|
|
|
|
result_decrypt_to_xml (gt->ctx, indent,
|
|
|
|
|
(result_xml_write_cb_t) gt_write_data, gt);
|
|
|
|
|
if (flags & GT_RESULT_SIGN)
|
|
|
|
|
result_sign_to_xml (gt->ctx, indent,
|
|
|
|
|
(result_xml_write_cb_t) gt_write_data, gt);
|
|
|
|
|
if (flags & GT_RESULT_VERIFY)
|
|
|
|
|
result_verify_to_xml (gt->ctx, indent,
|
|
|
|
|
(result_xml_write_cb_t) gt_write_data, gt);
|
|
|
|
|
if (flags & GT_RESULT_IMPORT)
|
|
|
|
|
result_import_to_xml (gt->ctx, indent,
|
|
|
|
|
(result_xml_write_cb_t) gt_write_data, gt);
|
|
|
|
|
if (flags & GT_RESULT_GENKEY)
|
|
|
|
|
result_genkey_to_xml (gt->ctx, indent,
|
|
|
|
|
(result_xml_write_cb_t) gt_write_data, gt);
|
|
|
|
|
if (flags & GT_RESULT_KEYLIST)
|
|
|
|
|
result_keylist_to_xml (gt->ctx, indent,
|
|
|
|
|
(result_xml_write_cb_t) gt_write_data, gt);
|
2009-11-06 00:44:44 +00:00
|
|
|
|
if (flags & GT_RESULT_VFS_MOUNT)
|
2010-01-07 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_xml_write_cb_t, struct result_xml_state):
New types.
(MAX_TAGS): New macro.
(result_init, result_xml_indent, result_xml_tag_start)
(result_xml_tag_data, result_xml_tag_end, result_add_error)
(result_add_pubkey_algo, result_add_hash_algo, result_add_keyid)
(result_add_fpr, result_add_timestamp, result_add_sig_mode)
(result_add_value, result_add_string, result_encrypt_to_xml)
(result_decrypt_to_xml, result_sign_to_xml)
(result_verify_to_xml, result_import_to_xml)
(result_genkey_to_xml, result_keylist_to_xml)
(result_vfs_mount_to_xml): New functions.
(gt_result): Rewritten.
2010-01-07 18:16:54 +00:00
|
|
|
|
result_vfs_mount_to_xml (gt->ctx, indent,
|
|
|
|
|
(result_xml_write_cb_t) gt_write_data, gt);
|
2016-07-19 00:16:46 +00:00
|
|
|
|
gt_write_data (gt, xml_end, strlen (xml_end));
|
2009-11-06 00:44:44 +00:00
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* GPGME SERVER. */
|
|
|
|
|
|
|
|
|
|
#include <assuan.h>
|
|
|
|
|
|
|
|
|
|
struct server
|
|
|
|
|
{
|
|
|
|
|
gpgme_tool_t gt;
|
|
|
|
|
assuan_context_t assuan_ctx;
|
|
|
|
|
|
|
|
|
|
gpgme_data_encoding_t input_enc;
|
|
|
|
|
gpgme_data_encoding_t output_enc;
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
assuan_fd_t input_fd;
|
|
|
|
|
char *input_filename;
|
|
|
|
|
FILE *input_stream;
|
|
|
|
|
assuan_fd_t output_fd;
|
|
|
|
|
char *output_filename;
|
|
|
|
|
FILE *output_stream;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
assuan_fd_t message_fd;
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
char *message_filename;
|
|
|
|
|
FILE *message_stream;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
gpgme_data_encoding_t message_enc;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gpg_error_t
|
|
|
|
|
server_write_status (void *hook, const char *status, const char *msg)
|
|
|
|
|
{
|
|
|
|
|
struct server *server = hook;
|
|
|
|
|
return assuan_write_status (server->assuan_ctx, status, msg);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-11-06 00:44:44 +00:00
|
|
|
|
gpg_error_t
|
|
|
|
|
server_write_data (void *hook, const void *buf, size_t len)
|
|
|
|
|
{
|
|
|
|
|
struct server *server = hook;
|
|
|
|
|
return assuan_send_data (server->assuan_ctx, buf, len);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2013-02-07 20:03:02 +00:00
|
|
|
|
static gpg_error_t
|
|
|
|
|
server_passphrase_cb (void *opaque, const char *uid_hint, const char *info,
|
|
|
|
|
int was_bad, int fd)
|
|
|
|
|
{
|
|
|
|
|
struct server *server = opaque;
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
unsigned char *buf = NULL;
|
|
|
|
|
size_t buflen = 0;
|
|
|
|
|
|
2016-09-13 18:53:14 +00:00
|
|
|
|
(void)was_bad;
|
|
|
|
|
|
2013-02-07 20:03:02 +00:00
|
|
|
|
if (server && server->assuan_ctx)
|
|
|
|
|
{
|
|
|
|
|
if (uid_hint)
|
|
|
|
|
assuan_write_status (server->assuan_ctx, "USERID_HINT", uid_hint);
|
|
|
|
|
if (info)
|
|
|
|
|
assuan_write_status (server->assuan_ctx, "NEED_PASSPHRASE", info);
|
|
|
|
|
|
|
|
|
|
err = assuan_inquire (server->assuan_ctx, "PASSPHRASE",
|
|
|
|
|
&buf, &buflen, 100);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
err = gpg_error (GPG_ERR_NO_PASSPHRASE);
|
|
|
|
|
|
|
|
|
|
if (!err)
|
|
|
|
|
{
|
|
|
|
|
/* We take care to always send a LF. */
|
|
|
|
|
if (gpgme_io_writen (fd, buf, buflen))
|
|
|
|
|
err = gpg_error_from_syserror ();
|
|
|
|
|
else if (!memchr (buf, '\n', buflen) && gpgme_io_writen (fd, "\n", 1))
|
|
|
|
|
err = gpg_error_from_syserror ();
|
|
|
|
|
}
|
|
|
|
|
free (buf);
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2012-09-26 07:37:22 +00:00
|
|
|
|
/* Wrapper around assuan_command_parse_fd to also handle a
|
|
|
|
|
"file=FILENAME" argument. On success either a filename is returned
|
|
|
|
|
at FILENAME or a file descriptor at RFD; the other one is set to
|
|
|
|
|
NULL respective ASSUAN_INVALID_FD. */
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
static gpg_error_t
|
|
|
|
|
server_parse_fd (assuan_context_t ctx, char *line, assuan_fd_t *rfd,
|
|
|
|
|
char **filename)
|
|
|
|
|
{
|
|
|
|
|
*rfd = ASSUAN_INVALID_FD;
|
|
|
|
|
*filename = NULL;
|
|
|
|
|
|
|
|
|
|
if (! strncasecmp (line, "file=", 5))
|
|
|
|
|
{
|
|
|
|
|
char *term;
|
|
|
|
|
*filename = strdup (line + 5);
|
|
|
|
|
if (!*filename)
|
|
|
|
|
return gpg_error_from_syserror();
|
|
|
|
|
term = strchr (*filename, ' ');
|
|
|
|
|
if (term)
|
|
|
|
|
*term = '\0';
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
return assuan_command_parse_fd (ctx, line, rfd);
|
|
|
|
|
}
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
static gpgme_data_encoding_t
|
|
|
|
|
server_data_encoding (const char *line)
|
|
|
|
|
{
|
|
|
|
|
if (strstr (line, "--binary"))
|
|
|
|
|
return GPGME_DATA_ENCODING_BINARY;
|
|
|
|
|
if (strstr (line, "--base64"))
|
|
|
|
|
return GPGME_DATA_ENCODING_BASE64;
|
|
|
|
|
if (strstr (line, "--armor"))
|
|
|
|
|
return GPGME_DATA_ENCODING_ARMOR;
|
|
|
|
|
if (strstr (line, "--url"))
|
|
|
|
|
return GPGME_DATA_ENCODING_URL;
|
|
|
|
|
if (strstr (line, "--urlesc"))
|
|
|
|
|
return GPGME_DATA_ENCODING_URLESC;
|
|
|
|
|
if (strstr (line, "--url0"))
|
|
|
|
|
return GPGME_DATA_ENCODING_URL0;
|
2016-07-13 12:45:02 +00:00
|
|
|
|
if (strstr (line, "--mime"))
|
|
|
|
|
return GPGME_DATA_ENCODING_MIME;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
return GPGME_DATA_ENCODING_NONE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static gpgme_error_t
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
server_data_obj (assuan_fd_t fd, char *fn, int out,
|
|
|
|
|
gpgme_data_encoding_t encoding,
|
|
|
|
|
gpgme_data_t *data, FILE **fs)
|
2009-10-30 14:21:08 +00:00
|
|
|
|
{
|
|
|
|
|
gpgme_error_t err;
|
|
|
|
|
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
*fs = NULL;
|
|
|
|
|
if (fn)
|
|
|
|
|
{
|
|
|
|
|
*fs = fopen (fn, out ? "wb" : "rb");
|
|
|
|
|
if (!*fs)
|
|
|
|
|
return gpg_error_from_syserror ();
|
|
|
|
|
|
|
|
|
|
err = gpgme_data_new_from_stream (data, *fs);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
err = gpgme_data_new_from_fd (data, (int) fd);
|
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
|
|
|
|
return gpgme_data_set_encoding (*data, encoding);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
server_reset_fds (struct server *server)
|
|
|
|
|
{
|
|
|
|
|
/* assuan closes the input and output FDs for us when doing a RESET,
|
|
|
|
|
but we use this same function after commands, so repeat it
|
|
|
|
|
here. */
|
2012-09-26 07:37:22 +00:00
|
|
|
|
if (server->input_fd != ASSUAN_INVALID_FD)
|
|
|
|
|
{
|
|
|
|
|
#if HAVE_W32_SYSTEM
|
|
|
|
|
CloseHandle (server->input_fd);
|
|
|
|
|
#else
|
|
|
|
|
close (server->input_fd);
|
|
|
|
|
#endif
|
|
|
|
|
server->input_fd = ASSUAN_INVALID_FD;
|
|
|
|
|
}
|
|
|
|
|
if (server->output_fd != ASSUAN_INVALID_FD)
|
|
|
|
|
{
|
|
|
|
|
#if HAVE_W32_SYSTEM
|
|
|
|
|
CloseHandle (server->output_fd);
|
|
|
|
|
#else
|
|
|
|
|
close (server->output_fd);
|
|
|
|
|
#endif
|
|
|
|
|
server->output_fd = ASSUAN_INVALID_FD;
|
|
|
|
|
}
|
2010-05-07 01:06:14 +00:00
|
|
|
|
if (server->message_fd != ASSUAN_INVALID_FD)
|
2009-10-30 14:21:08 +00:00
|
|
|
|
{
|
|
|
|
|
/* FIXME: Assuan should provide a close function. */
|
2010-05-07 01:06:14 +00:00
|
|
|
|
#if HAVE_W32_SYSTEM
|
|
|
|
|
CloseHandle (server->message_fd);
|
|
|
|
|
#else
|
2009-10-30 14:21:08 +00:00
|
|
|
|
close (server->message_fd);
|
2010-05-07 01:06:14 +00:00
|
|
|
|
#endif
|
|
|
|
|
server->message_fd = ASSUAN_INVALID_FD;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
}
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
if (server->input_filename)
|
|
|
|
|
{
|
|
|
|
|
free (server->input_filename);
|
|
|
|
|
server->input_filename = NULL;
|
|
|
|
|
}
|
|
|
|
|
if (server->output_filename)
|
|
|
|
|
{
|
|
|
|
|
free (server->output_filename);
|
|
|
|
|
server->output_filename = NULL;
|
|
|
|
|
}
|
|
|
|
|
if (server->message_filename)
|
|
|
|
|
{
|
|
|
|
|
free (server->message_filename);
|
|
|
|
|
server->message_filename = NULL;
|
|
|
|
|
}
|
|
|
|
|
if (server->input_stream)
|
|
|
|
|
{
|
|
|
|
|
fclose (server->input_stream);
|
|
|
|
|
server->input_stream = NULL;
|
|
|
|
|
}
|
|
|
|
|
if (server->output_stream)
|
|
|
|
|
{
|
|
|
|
|
fclose (server->output_stream);
|
|
|
|
|
server->output_stream = NULL;
|
|
|
|
|
}
|
|
|
|
|
if (server->message_stream)
|
|
|
|
|
{
|
|
|
|
|
fclose (server->message_stream);
|
|
|
|
|
server->message_stream = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
server->input_enc = GPGME_DATA_ENCODING_NONE;
|
|
|
|
|
server->output_enc = GPGME_DATA_ENCODING_NONE;
|
|
|
|
|
server->message_enc = GPGME_DATA_ENCODING_NONE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static gpg_error_t
|
|
|
|
|
reset_notify (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
struct server *server = assuan_get_pointer (ctx);
|
2016-09-13 18:53:14 +00:00
|
|
|
|
|
|
|
|
|
(void)line;
|
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
server_reset_fds (server);
|
|
|
|
|
gt_reset (server->gt);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
|
2012-09-25 13:29:49 +00:00
|
|
|
|
static const char hlp_version[] =
|
2009-11-04 10:43:42 +00:00
|
|
|
|
"VERSION [<string>]\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Call the function gpgme_check_version.";
|
2009-10-30 14:21:08 +00:00
|
|
|
|
static gpg_error_t
|
|
|
|
|
cmd_version (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
if (line && *line)
|
|
|
|
|
{
|
|
|
|
|
const char *version = gpgme_check_version (line);
|
|
|
|
|
return version ? 0 : gpg_error (GPG_ERR_SELFTEST_FAILED);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
const char *version = gpgme_check_version (NULL);
|
|
|
|
|
return assuan_send_data (ctx, version, strlen (version));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
gpgme-tool: add help messages for a number of commands.
* src/gpgme-tool.c (hlp_engine, hlp_sub_protocol, hlp_armor, hlp_textmode,
hlp_include_certs, hlp_keylist_mode, hlp_input, hlp_output, hlp_message,
hlp_recipient, hlp_signer, hlp_signers_clear, hlp_decrypt, hlp_decrypt_verify,
hlp_encrypt, hlp_sign_encrypt, hlp_sign, hlp_verify, hlp_import): New strings.
(hlp_protocol): Fix typo.
(register_commands): Add documentation strings.
(doc): Mention Assuan.
2012-03-27 19:10:02 +00:00
|
|
|
|
static const char hlp_engine[] =
|
|
|
|
|
"ENGINE [<string>]\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Get information about a GPGME engine (a.k.a. protocol).";
|
2009-10-30 14:21:08 +00:00
|
|
|
|
static gpg_error_t
|
|
|
|
|
cmd_engine (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
struct server *server = assuan_get_pointer (ctx);
|
|
|
|
|
return gt_get_engine_info (server->gt, gt_protocol_from_name (line));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2012-09-25 13:29:49 +00:00
|
|
|
|
static const char hlp_protocol[] =
|
2009-11-04 10:43:42 +00:00
|
|
|
|
"PROTOCOL [<name>]\n"
|
|
|
|
|
"\n"
|
gpgme-tool: add help messages for a number of commands.
* src/gpgme-tool.c (hlp_engine, hlp_sub_protocol, hlp_armor, hlp_textmode,
hlp_include_certs, hlp_keylist_mode, hlp_input, hlp_output, hlp_message,
hlp_recipient, hlp_signer, hlp_signers_clear, hlp_decrypt, hlp_decrypt_verify,
hlp_encrypt, hlp_sign_encrypt, hlp_sign, hlp_verify, hlp_import): New strings.
(hlp_protocol): Fix typo.
(register_commands): Add documentation strings.
(doc): Mention Assuan.
2012-03-27 19:10:02 +00:00
|
|
|
|
"With NAME, set the protocol. Without, return the current\n"
|
|
|
|
|
"protocol.";
|
2009-10-30 14:21:08 +00:00
|
|
|
|
static gpg_error_t
|
|
|
|
|
cmd_protocol (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
struct server *server = assuan_get_pointer (ctx);
|
|
|
|
|
if (line && *line)
|
|
|
|
|
return gt_set_protocol (server->gt, gt_protocol_from_name (line));
|
|
|
|
|
else
|
|
|
|
|
return gt_get_protocol (server->gt);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
gpgme-tool: add help messages for a number of commands.
* src/gpgme-tool.c (hlp_engine, hlp_sub_protocol, hlp_armor, hlp_textmode,
hlp_include_certs, hlp_keylist_mode, hlp_input, hlp_output, hlp_message,
hlp_recipient, hlp_signer, hlp_signers_clear, hlp_decrypt, hlp_decrypt_verify,
hlp_encrypt, hlp_sign_encrypt, hlp_sign, hlp_verify, hlp_import): New strings.
(hlp_protocol): Fix typo.
(register_commands): Add documentation strings.
(doc): Mention Assuan.
2012-03-27 19:10:02 +00:00
|
|
|
|
static const char hlp_sub_protocol[] =
|
|
|
|
|
"SUB_PROTOCOL [<name>]\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"With NAME, set the sub-protocol. Without, return the\n"
|
|
|
|
|
"current sub-protocol.";
|
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Activate UIServer if FD passing is enabled and
Assuan is available.
m4/
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* libassuan.m4: Fix LIBASSUAN_VERSION.
src/
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (uiserver_components): New variable.
(main_sources): Add it.
* ops.h, key.c (_gpgme_key_append_name): Take CONVERT argument,
implement it. Adjust callers.
(gpgme_key_from_uid): New function.
* gpgme.h.in (gpgme_protocol_t): Add GPGME_PROTOCOL_DEFAULT.
(gpgme_encrypt_flags_t): Add GPGME_ENCRYPT_PREPARE,
GPGME_ENCRYPT_EXPECT_SIGN.
(gpgme_set_sub_protocol, gpgme_key_from_uid): New functions.
* libgpgme.vers, gpgme.def: Add new functions.
* gpgme.c (gpgme_set_protocol): Add UIServer protocol.
(gpgme_set_sub_protocol): New function.
(gpgme_get_protocol_name): Add UIServer and default protocol.
* assuan-support.c: Return correct error values, implement
socketpair for POSIX.
* priv-io.h, posix-io.c, w32-io.c, w32-glib-io.c,
w32-qt-io.cpp (_gpgme_io_spawn): Add ATFORK and ATFORKVALUE
arguments. Implement it for POSIX. Adjust all callers.
* engine.h, engine-backend.h (_gpgme_engine_set_protocol)
(_gpgme_engine_op_decrypt_verify): New prototypes. Adjust all
users.
* engine.c (engine_ops, gpgme_get_engine_info): Add UIServer
engine.
(_gpgme_engine_set_protocol, _gpgme_engine_op_decrypt_verify): New
function.
* decrypt-verify.c (decrypt_verify_start): Call
_gpgme_engine_op_decrypt_verify.
* util.h, posix-util.c,
w32-util.c (_gpgme_get_uiserver_socket_path): New function.
* engine-gpgsm.c (gpgsm_set_fd): Fix _gpgme_io_pipe invocation.
* gpgme-tool.c: Some support for UIServer protocol.
* engine-uiserver.c: New file.
2009-11-10 09:07:19 +00:00
|
|
|
|
static gpg_error_t
|
|
|
|
|
cmd_sub_protocol (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
struct server *server = assuan_get_pointer (ctx);
|
|
|
|
|
if (line && *line)
|
|
|
|
|
return gt_set_sub_protocol (server->gt, gt_protocol_from_name (line));
|
2009-11-10 14:54:39 +00:00
|
|
|
|
else
|
|
|
|
|
return gt_get_sub_protocol (server->gt);
|
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Activate UIServer if FD passing is enabled and
Assuan is available.
m4/
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* libassuan.m4: Fix LIBASSUAN_VERSION.
src/
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (uiserver_components): New variable.
(main_sources): Add it.
* ops.h, key.c (_gpgme_key_append_name): Take CONVERT argument,
implement it. Adjust callers.
(gpgme_key_from_uid): New function.
* gpgme.h.in (gpgme_protocol_t): Add GPGME_PROTOCOL_DEFAULT.
(gpgme_encrypt_flags_t): Add GPGME_ENCRYPT_PREPARE,
GPGME_ENCRYPT_EXPECT_SIGN.
(gpgme_set_sub_protocol, gpgme_key_from_uid): New functions.
* libgpgme.vers, gpgme.def: Add new functions.
* gpgme.c (gpgme_set_protocol): Add UIServer protocol.
(gpgme_set_sub_protocol): New function.
(gpgme_get_protocol_name): Add UIServer and default protocol.
* assuan-support.c: Return correct error values, implement
socketpair for POSIX.
* priv-io.h, posix-io.c, w32-io.c, w32-glib-io.c,
w32-qt-io.cpp (_gpgme_io_spawn): Add ATFORK and ATFORKVALUE
arguments. Implement it for POSIX. Adjust all callers.
* engine.h, engine-backend.h (_gpgme_engine_set_protocol)
(_gpgme_engine_op_decrypt_verify): New prototypes. Adjust all
users.
* engine.c (engine_ops, gpgme_get_engine_info): Add UIServer
engine.
(_gpgme_engine_set_protocol, _gpgme_engine_op_decrypt_verify): New
function.
* decrypt-verify.c (decrypt_verify_start): Call
_gpgme_engine_op_decrypt_verify.
* util.h, posix-util.c,
w32-util.c (_gpgme_get_uiserver_socket_path): New function.
* engine-gpgsm.c (gpgsm_set_fd): Fix _gpgme_io_pipe invocation.
* gpgme-tool.c: Some support for UIServer protocol.
* engine-uiserver.c: New file.
2009-11-10 09:07:19 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2013-02-07 20:03:02 +00:00
|
|
|
|
static const char hlp_pinentry_mode[] =
|
|
|
|
|
"PINENTRY_MODE <name>\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Set the pinentry mode to NAME. Allowedvalues for NAME are:\n"
|
|
|
|
|
" default - reset to the default of the engine,\n"
|
|
|
|
|
" ask - force the use of the pinentry,\n"
|
|
|
|
|
" cancel - emulate use of pinentry's cancel button,\n"
|
|
|
|
|
" error - return a pinentry error,\n"
|
|
|
|
|
" loopback - redirect pinentry queries to the caller.\n"
|
|
|
|
|
"Note that only recent versions of GPG support changing the pinentry mode.";
|
|
|
|
|
static gpg_error_t
|
|
|
|
|
cmd_pinentry_mode (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
struct server *server = assuan_get_pointer (ctx);
|
|
|
|
|
gpgme_pinentry_mode_t mode;
|
|
|
|
|
|
|
|
|
|
if (!line || !*line || !strcmp (line, "default"))
|
|
|
|
|
mode = GPGME_PINENTRY_MODE_DEFAULT;
|
|
|
|
|
else if (!strcmp (line, "ask"))
|
|
|
|
|
mode = GPGME_PINENTRY_MODE_ASK;
|
|
|
|
|
else if (!strcmp (line, "cancel"))
|
|
|
|
|
mode = GPGME_PINENTRY_MODE_CANCEL;
|
|
|
|
|
else if (!strcmp (line, "error"))
|
|
|
|
|
mode = GPGME_PINENTRY_MODE_ERROR;
|
|
|
|
|
else if (!strcmp (line, "loopback"))
|
|
|
|
|
mode = GPGME_PINENTRY_MODE_LOOPBACK;
|
|
|
|
|
else
|
|
|
|
|
return gpg_error (GPG_ERR_INV_VALUE);
|
|
|
|
|
|
|
|
|
|
return gt_set_pinentry_mode (server->gt, mode, server);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
gpgme-tool: add help messages for a number of commands.
* src/gpgme-tool.c (hlp_engine, hlp_sub_protocol, hlp_armor, hlp_textmode,
hlp_include_certs, hlp_keylist_mode, hlp_input, hlp_output, hlp_message,
hlp_recipient, hlp_signer, hlp_signers_clear, hlp_decrypt, hlp_decrypt_verify,
hlp_encrypt, hlp_sign_encrypt, hlp_sign, hlp_verify, hlp_import): New strings.
(hlp_protocol): Fix typo.
(register_commands): Add documentation strings.
(doc): Mention Assuan.
2012-03-27 19:10:02 +00:00
|
|
|
|
static const char hlp_armor[] =
|
|
|
|
|
"ARMOR [true|false]\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"With 'true' or 'false', turn output ASCII armoring on or\n"
|
|
|
|
|
"off. Without, return the current armoring status.";
|
2009-10-30 14:21:08 +00:00
|
|
|
|
static gpg_error_t
|
|
|
|
|
cmd_armor (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
struct server *server = assuan_get_pointer (ctx);
|
|
|
|
|
if (line && *line)
|
|
|
|
|
{
|
|
|
|
|
int flag = 0;
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
if (! strcasecmp (line, "true") || ! strcasecmp (line, "yes")
|
|
|
|
|
|| line[0] == '1')
|
|
|
|
|
flag = 1;
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
return gt_set_armor (server->gt, flag);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
return gt_get_armor (server->gt);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
gpgme-tool: add help messages for a number of commands.
* src/gpgme-tool.c (hlp_engine, hlp_sub_protocol, hlp_armor, hlp_textmode,
hlp_include_certs, hlp_keylist_mode, hlp_input, hlp_output, hlp_message,
hlp_recipient, hlp_signer, hlp_signers_clear, hlp_decrypt, hlp_decrypt_verify,
hlp_encrypt, hlp_sign_encrypt, hlp_sign, hlp_verify, hlp_import): New strings.
(hlp_protocol): Fix typo.
(register_commands): Add documentation strings.
(doc): Mention Assuan.
2012-03-27 19:10:02 +00:00
|
|
|
|
static const char hlp_textmode[] =
|
|
|
|
|
"TEXTMODE [true|false]\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"With 'true' or 'false', turn text mode on or off.\n"
|
|
|
|
|
"Without, return the current text mode status.";
|
2009-10-30 14:21:08 +00:00
|
|
|
|
static gpg_error_t
|
|
|
|
|
cmd_textmode (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
struct server *server = assuan_get_pointer (ctx);
|
|
|
|
|
if (line && *line)
|
|
|
|
|
{
|
|
|
|
|
int flag = 0;
|
|
|
|
|
|
|
|
|
|
if (! strcasecmp (line, "true") || ! strcasecmp (line, "yes")
|
|
|
|
|
|| line[0] == '1')
|
|
|
|
|
flag = 1;
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
return gt_set_textmode (server->gt, flag);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
return gt_get_textmode (server->gt);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
gpgme-tool: add help messages for a number of commands.
* src/gpgme-tool.c (hlp_engine, hlp_sub_protocol, hlp_armor, hlp_textmode,
hlp_include_certs, hlp_keylist_mode, hlp_input, hlp_output, hlp_message,
hlp_recipient, hlp_signer, hlp_signers_clear, hlp_decrypt, hlp_decrypt_verify,
hlp_encrypt, hlp_sign_encrypt, hlp_sign, hlp_verify, hlp_import): New strings.
(hlp_protocol): Fix typo.
(register_commands): Add documentation strings.
(doc): Mention Assuan.
2012-03-27 19:10:02 +00:00
|
|
|
|
static const char hlp_include_certs[] =
|
|
|
|
|
"INCLUDE_CERTS [default|<n>]\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"With DEFAULT or N, set how many certificates should be\n"
|
|
|
|
|
"included in the next S/MIME signed message. See the\n"
|
|
|
|
|
"GPGME documentation for details on the meaning of"
|
|
|
|
|
"various N. Without either, return the current setting.";
|
2009-10-30 14:21:08 +00:00
|
|
|
|
static gpg_error_t
|
|
|
|
|
cmd_include_certs (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
struct server *server = assuan_get_pointer (ctx);
|
|
|
|
|
|
|
|
|
|
if (line && *line)
|
|
|
|
|
{
|
|
|
|
|
int include_certs = 0;
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
if (! strcasecmp (line, "default"))
|
|
|
|
|
include_certs = GPGME_INCLUDE_CERTS_DEFAULT;
|
|
|
|
|
else
|
|
|
|
|
include_certs = atoi (line);
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
return gt_set_include_certs (server->gt, include_certs);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
return gt_get_include_certs (server->gt);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
gpgme-tool: add help messages for a number of commands.
* src/gpgme-tool.c (hlp_engine, hlp_sub_protocol, hlp_armor, hlp_textmode,
hlp_include_certs, hlp_keylist_mode, hlp_input, hlp_output, hlp_message,
hlp_recipient, hlp_signer, hlp_signers_clear, hlp_decrypt, hlp_decrypt_verify,
hlp_encrypt, hlp_sign_encrypt, hlp_sign, hlp_verify, hlp_import): New strings.
(hlp_protocol): Fix typo.
(register_commands): Add documentation strings.
(doc): Mention Assuan.
2012-03-27 19:10:02 +00:00
|
|
|
|
static const char hlp_keylist_mode[] =
|
|
|
|
|
"KEYLIST_MODE [local] [extern] [sigs] [sig_notations]\n"
|
|
|
|
|
" [ephemeral] [validate]\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Set the mode for the next KEYLIST command.";
|
2009-10-30 14:21:08 +00:00
|
|
|
|
static gpg_error_t
|
|
|
|
|
cmd_keylist_mode (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
struct server *server = assuan_get_pointer (ctx);
|
|
|
|
|
|
|
|
|
|
if (line && *line)
|
|
|
|
|
{
|
|
|
|
|
gpgme_keylist_mode_t mode = 0;
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
if (strstr (line, "local"))
|
|
|
|
|
mode |= GPGME_KEYLIST_MODE_LOCAL;
|
|
|
|
|
if (strstr (line, "extern"))
|
|
|
|
|
mode |= GPGME_KEYLIST_MODE_EXTERN;
|
|
|
|
|
if (strstr (line, "sigs"))
|
|
|
|
|
mode |= GPGME_KEYLIST_MODE_SIGS;
|
|
|
|
|
if (strstr (line, "sig_notations"))
|
|
|
|
|
mode |= GPGME_KEYLIST_MODE_SIG_NOTATIONS;
|
2014-06-04 07:57:54 +00:00
|
|
|
|
if (strstr (line, "with_secret"))
|
|
|
|
|
mode |= GPGME_KEYLIST_MODE_WITH_SECRET;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
if (strstr (line, "ephemeral"))
|
|
|
|
|
mode |= GPGME_KEYLIST_MODE_EPHEMERAL;
|
|
|
|
|
if (strstr (line, "validate"))
|
|
|
|
|
mode |= GPGME_KEYLIST_MODE_VALIDATE;
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
return gt_set_keylist_mode (server->gt, mode);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
return gt_get_keylist_mode (server->gt);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
gpgme-tool: add help messages for a number of commands.
* src/gpgme-tool.c (hlp_engine, hlp_sub_protocol, hlp_armor, hlp_textmode,
hlp_include_certs, hlp_keylist_mode, hlp_input, hlp_output, hlp_message,
hlp_recipient, hlp_signer, hlp_signers_clear, hlp_decrypt, hlp_decrypt_verify,
hlp_encrypt, hlp_sign_encrypt, hlp_sign, hlp_verify, hlp_import): New strings.
(hlp_protocol): Fix typo.
(register_commands): Add documentation strings.
(doc): Mention Assuan.
2012-03-27 19:10:02 +00:00
|
|
|
|
static const char hlp_input[] =
|
|
|
|
|
"INPUT [<fd>|FILE=<path>]\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Set the input for the next command. Use either the\n"
|
|
|
|
|
"Assuan file descriptor FD or a filesystem PATH.";
|
2009-11-02 17:18:48 +00:00
|
|
|
|
static gpg_error_t
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
cmd_input (assuan_context_t ctx, char *line)
|
2009-10-30 14:21:08 +00:00
|
|
|
|
{
|
|
|
|
|
struct server *server = assuan_get_pointer (ctx);
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
gpg_error_t err;
|
|
|
|
|
assuan_fd_t sysfd;
|
|
|
|
|
char *filename;
|
|
|
|
|
|
|
|
|
|
err = server_parse_fd (ctx, line, &sysfd, &filename);
|
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
|
|
|
|
server->input_fd = sysfd;
|
|
|
|
|
server->input_filename = filename;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
server->input_enc = server_data_encoding (line);
|
2009-11-02 17:18:48 +00:00
|
|
|
|
return 0;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
gpgme-tool: add help messages for a number of commands.
* src/gpgme-tool.c (hlp_engine, hlp_sub_protocol, hlp_armor, hlp_textmode,
hlp_include_certs, hlp_keylist_mode, hlp_input, hlp_output, hlp_message,
hlp_recipient, hlp_signer, hlp_signers_clear, hlp_decrypt, hlp_decrypt_verify,
hlp_encrypt, hlp_sign_encrypt, hlp_sign, hlp_verify, hlp_import): New strings.
(hlp_protocol): Fix typo.
(register_commands): Add documentation strings.
(doc): Mention Assuan.
2012-03-27 19:10:02 +00:00
|
|
|
|
static const char hlp_output[] =
|
|
|
|
|
"OUTPUT [<fd>|FILE=<path>]\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Set the output for the next command. Use either the\n"
|
|
|
|
|
"Assuan file descriptor FD or a filesystem PATH.";
|
2009-11-02 17:18:48 +00:00
|
|
|
|
static gpg_error_t
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
cmd_output (assuan_context_t ctx, char *line)
|
2009-10-30 14:21:08 +00:00
|
|
|
|
{
|
|
|
|
|
struct server *server = assuan_get_pointer (ctx);
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
gpg_error_t err;
|
|
|
|
|
assuan_fd_t sysfd;
|
|
|
|
|
char *filename;
|
|
|
|
|
|
|
|
|
|
err = server_parse_fd (ctx, line, &sysfd, &filename);
|
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
|
|
|
|
server->output_fd = sysfd;
|
|
|
|
|
server->output_filename = filename;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
server->output_enc = server_data_encoding (line);
|
2009-11-02 17:18:48 +00:00
|
|
|
|
return 0;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
gpgme-tool: add help messages for a number of commands.
* src/gpgme-tool.c (hlp_engine, hlp_sub_protocol, hlp_armor, hlp_textmode,
hlp_include_certs, hlp_keylist_mode, hlp_input, hlp_output, hlp_message,
hlp_recipient, hlp_signer, hlp_signers_clear, hlp_decrypt, hlp_decrypt_verify,
hlp_encrypt, hlp_sign_encrypt, hlp_sign, hlp_verify, hlp_import): New strings.
(hlp_protocol): Fix typo.
(register_commands): Add documentation strings.
(doc): Mention Assuan.
2012-03-27 19:10:02 +00:00
|
|
|
|
static const char hlp_message[] =
|
|
|
|
|
"MESSAGE [<fd>|FILE=<path>]\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Set the plaintext message for the next VERIFY command\n"
|
|
|
|
|
"with a detached signature. Use either the Assuan file\n"
|
|
|
|
|
"descriptor FD or a filesystem PATH.";
|
2009-10-30 14:21:08 +00:00
|
|
|
|
static gpg_error_t
|
|
|
|
|
cmd_message (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
struct server *server = assuan_get_pointer (ctx);
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
assuan_fd_t sysfd;
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
char *filename;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
err = server_parse_fd (ctx, line, &sysfd, &filename);
|
2009-10-30 14:21:08 +00:00
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
|
|
|
|
server->message_fd = sysfd;
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
server->message_filename = filename;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
server->message_enc = server_data_encoding (line);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
gpgme-tool: add help messages for a number of commands.
* src/gpgme-tool.c (hlp_engine, hlp_sub_protocol, hlp_armor, hlp_textmode,
hlp_include_certs, hlp_keylist_mode, hlp_input, hlp_output, hlp_message,
hlp_recipient, hlp_signer, hlp_signers_clear, hlp_decrypt, hlp_decrypt_verify,
hlp_encrypt, hlp_sign_encrypt, hlp_sign, hlp_verify, hlp_import): New strings.
(hlp_protocol): Fix typo.
(register_commands): Add documentation strings.
(doc): Mention Assuan.
2012-03-27 19:10:02 +00:00
|
|
|
|
static const char hlp_recipient[] =
|
|
|
|
|
"RECIPIENT <pattern>\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Add the key matching PATTERN to the list of recipients\n"
|
|
|
|
|
"for the next encryption command.";
|
2009-10-30 14:21:08 +00:00
|
|
|
|
static gpg_error_t
|
|
|
|
|
cmd_recipient (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
struct server *server = assuan_get_pointer (ctx);
|
|
|
|
|
|
|
|
|
|
return gt_recipients_add (server->gt, line);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
gpgme-tool: add help messages for a number of commands.
* src/gpgme-tool.c (hlp_engine, hlp_sub_protocol, hlp_armor, hlp_textmode,
hlp_include_certs, hlp_keylist_mode, hlp_input, hlp_output, hlp_message,
hlp_recipient, hlp_signer, hlp_signers_clear, hlp_decrypt, hlp_decrypt_verify,
hlp_encrypt, hlp_sign_encrypt, hlp_sign, hlp_verify, hlp_import): New strings.
(hlp_protocol): Fix typo.
(register_commands): Add documentation strings.
(doc): Mention Assuan.
2012-03-27 19:10:02 +00:00
|
|
|
|
static const char hlp_signer[] =
|
|
|
|
|
"SIGNER <fingerprint>\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Add the key with FINGERPRINT to the list of signers to\n"
|
|
|
|
|
"be used for the next signing command.";
|
2009-10-30 14:21:08 +00:00
|
|
|
|
static gpg_error_t
|
|
|
|
|
cmd_signer (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
struct server *server = assuan_get_pointer (ctx);
|
|
|
|
|
|
|
|
|
|
return gt_signers_add (server->gt, line);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
gpgme-tool: add help messages for a number of commands.
* src/gpgme-tool.c (hlp_engine, hlp_sub_protocol, hlp_armor, hlp_textmode,
hlp_include_certs, hlp_keylist_mode, hlp_input, hlp_output, hlp_message,
hlp_recipient, hlp_signer, hlp_signers_clear, hlp_decrypt, hlp_decrypt_verify,
hlp_encrypt, hlp_sign_encrypt, hlp_sign, hlp_verify, hlp_import): New strings.
(hlp_protocol): Fix typo.
(register_commands): Add documentation strings.
(doc): Mention Assuan.
2012-03-27 19:10:02 +00:00
|
|
|
|
static const char hlp_signers_clear[] =
|
|
|
|
|
"SIGNERS_CLEAR\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Clear the list of signers specified by previous SIGNER\n"
|
|
|
|
|
"commands.";
|
2009-10-30 14:21:08 +00:00
|
|
|
|
static gpg_error_t
|
|
|
|
|
cmd_signers_clear (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
struct server *server = assuan_get_pointer (ctx);
|
|
|
|
|
|
2016-09-13 18:53:14 +00:00
|
|
|
|
(void)line;
|
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
return gt_signers_clear (server->gt);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static gpg_error_t
|
|
|
|
|
_cmd_decrypt_verify (assuan_context_t ctx, char *line, int verify)
|
|
|
|
|
{
|
|
|
|
|
struct server *server = assuan_get_pointer (ctx);
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
assuan_fd_t inp_fd;
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
char *inp_fn;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
assuan_fd_t out_fd;
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
char *out_fn;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
gpgme_data_t inp_data;
|
|
|
|
|
gpgme_data_t out_data;
|
|
|
|
|
|
2016-09-13 18:53:14 +00:00
|
|
|
|
(void)line;
|
|
|
|
|
|
2012-09-26 07:37:22 +00:00
|
|
|
|
inp_fd = server->input_fd;
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
inp_fn = server->input_filename;
|
|
|
|
|
if (inp_fd == ASSUAN_INVALID_FD && !inp_fn)
|
2009-10-30 14:21:08 +00:00
|
|
|
|
return GPG_ERR_ASS_NO_INPUT;
|
2012-09-26 07:37:22 +00:00
|
|
|
|
out_fd = server->output_fd;
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
out_fn = server->output_filename;
|
|
|
|
|
if (out_fd == ASSUAN_INVALID_FD && !out_fn)
|
2009-10-30 14:21:08 +00:00
|
|
|
|
return GPG_ERR_ASS_NO_OUTPUT;
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
err = server_data_obj (inp_fd, inp_fn, 0, server->input_enc, &inp_data,
|
|
|
|
|
&server->input_stream);
|
2009-10-30 14:21:08 +00:00
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
err = server_data_obj (out_fd, out_fn, 1, server->output_enc, &out_data,
|
|
|
|
|
&server->output_stream);
|
2009-10-30 14:21:08 +00:00
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
gpgme_data_release (inp_data);
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
2012-09-25 13:29:49 +00:00
|
|
|
|
err = gt_decrypt_verify (server->gt, inp_data, out_data, verify);
|
2009-10-30 14:21:08 +00:00
|
|
|
|
|
|
|
|
|
gpgme_data_release (inp_data);
|
|
|
|
|
gpgme_data_release (out_data);
|
|
|
|
|
|
|
|
|
|
server_reset_fds (server);
|
|
|
|
|
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
gpgme-tool: add help messages for a number of commands.
* src/gpgme-tool.c (hlp_engine, hlp_sub_protocol, hlp_armor, hlp_textmode,
hlp_include_certs, hlp_keylist_mode, hlp_input, hlp_output, hlp_message,
hlp_recipient, hlp_signer, hlp_signers_clear, hlp_decrypt, hlp_decrypt_verify,
hlp_encrypt, hlp_sign_encrypt, hlp_sign, hlp_verify, hlp_import): New strings.
(hlp_protocol): Fix typo.
(register_commands): Add documentation strings.
(doc): Mention Assuan.
2012-03-27 19:10:02 +00:00
|
|
|
|
static const char hlp_decrypt[] =
|
|
|
|
|
"DECRYPT\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Decrypt the object set by the last INPUT command and\n"
|
|
|
|
|
"write the decrypted message to the object set by the\n"
|
|
|
|
|
"last OUTPUT command.";
|
2009-10-30 14:21:08 +00:00
|
|
|
|
static gpg_error_t
|
|
|
|
|
cmd_decrypt (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
return _cmd_decrypt_verify (ctx, line, 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
gpgme-tool: add help messages for a number of commands.
* src/gpgme-tool.c (hlp_engine, hlp_sub_protocol, hlp_armor, hlp_textmode,
hlp_include_certs, hlp_keylist_mode, hlp_input, hlp_output, hlp_message,
hlp_recipient, hlp_signer, hlp_signers_clear, hlp_decrypt, hlp_decrypt_verify,
hlp_encrypt, hlp_sign_encrypt, hlp_sign, hlp_verify, hlp_import): New strings.
(hlp_protocol): Fix typo.
(register_commands): Add documentation strings.
(doc): Mention Assuan.
2012-03-27 19:10:02 +00:00
|
|
|
|
static const char hlp_decrypt_verify[] =
|
|
|
|
|
"DECRYPT_VERIFY\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Decrypt the object set by the last INPUT command and\n"
|
|
|
|
|
"verify any embedded signatures. Write the decrypted\n"
|
|
|
|
|
"message to the object set by the last OUTPUT command.";
|
2009-10-30 14:21:08 +00:00
|
|
|
|
static gpg_error_t
|
|
|
|
|
cmd_decrypt_verify (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
return _cmd_decrypt_verify (ctx, line, 1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static gpg_error_t
|
|
|
|
|
_cmd_sign_encrypt (assuan_context_t ctx, char *line, int sign)
|
|
|
|
|
{
|
|
|
|
|
struct server *server = assuan_get_pointer (ctx);
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
assuan_fd_t inp_fd;
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
char *inp_fn;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
assuan_fd_t out_fd;
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
char *out_fn;
|
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Activate UIServer if FD passing is enabled and
Assuan is available.
m4/
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* libassuan.m4: Fix LIBASSUAN_VERSION.
src/
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (uiserver_components): New variable.
(main_sources): Add it.
* ops.h, key.c (_gpgme_key_append_name): Take CONVERT argument,
implement it. Adjust callers.
(gpgme_key_from_uid): New function.
* gpgme.h.in (gpgme_protocol_t): Add GPGME_PROTOCOL_DEFAULT.
(gpgme_encrypt_flags_t): Add GPGME_ENCRYPT_PREPARE,
GPGME_ENCRYPT_EXPECT_SIGN.
(gpgme_set_sub_protocol, gpgme_key_from_uid): New functions.
* libgpgme.vers, gpgme.def: Add new functions.
* gpgme.c (gpgme_set_protocol): Add UIServer protocol.
(gpgme_set_sub_protocol): New function.
(gpgme_get_protocol_name): Add UIServer and default protocol.
* assuan-support.c: Return correct error values, implement
socketpair for POSIX.
* priv-io.h, posix-io.c, w32-io.c, w32-glib-io.c,
w32-qt-io.cpp (_gpgme_io_spawn): Add ATFORK and ATFORKVALUE
arguments. Implement it for POSIX. Adjust all callers.
* engine.h, engine-backend.h (_gpgme_engine_set_protocol)
(_gpgme_engine_op_decrypt_verify): New prototypes. Adjust all
users.
* engine.c (engine_ops, gpgme_get_engine_info): Add UIServer
engine.
(_gpgme_engine_set_protocol, _gpgme_engine_op_decrypt_verify): New
function.
* decrypt-verify.c (decrypt_verify_start): Call
_gpgme_engine_op_decrypt_verify.
* util.h, posix-util.c,
w32-util.c (_gpgme_get_uiserver_socket_path): New function.
* engine-gpgsm.c (gpgsm_set_fd): Fix _gpgme_io_pipe invocation.
* gpgme-tool.c: Some support for UIServer protocol.
* engine-uiserver.c: New file.
2009-11-10 09:07:19 +00:00
|
|
|
|
gpgme_data_t inp_data = NULL;
|
|
|
|
|
gpgme_data_t out_data = NULL;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
gpgme_encrypt_flags_t flags = 0;
|
|
|
|
|
|
|
|
|
|
if (strstr (line, "--always-trust"))
|
|
|
|
|
flags |= GPGME_ENCRYPT_ALWAYS_TRUST;
|
|
|
|
|
if (strstr (line, "--no-encrypt-to"))
|
|
|
|
|
flags |= GPGME_ENCRYPT_NO_ENCRYPT_TO;
|
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Activate UIServer if FD passing is enabled and
Assuan is available.
m4/
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* libassuan.m4: Fix LIBASSUAN_VERSION.
src/
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (uiserver_components): New variable.
(main_sources): Add it.
* ops.h, key.c (_gpgme_key_append_name): Take CONVERT argument,
implement it. Adjust callers.
(gpgme_key_from_uid): New function.
* gpgme.h.in (gpgme_protocol_t): Add GPGME_PROTOCOL_DEFAULT.
(gpgme_encrypt_flags_t): Add GPGME_ENCRYPT_PREPARE,
GPGME_ENCRYPT_EXPECT_SIGN.
(gpgme_set_sub_protocol, gpgme_key_from_uid): New functions.
* libgpgme.vers, gpgme.def: Add new functions.
* gpgme.c (gpgme_set_protocol): Add UIServer protocol.
(gpgme_set_sub_protocol): New function.
(gpgme_get_protocol_name): Add UIServer and default protocol.
* assuan-support.c: Return correct error values, implement
socketpair for POSIX.
* priv-io.h, posix-io.c, w32-io.c, w32-glib-io.c,
w32-qt-io.cpp (_gpgme_io_spawn): Add ATFORK and ATFORKVALUE
arguments. Implement it for POSIX. Adjust all callers.
* engine.h, engine-backend.h (_gpgme_engine_set_protocol)
(_gpgme_engine_op_decrypt_verify): New prototypes. Adjust all
users.
* engine.c (engine_ops, gpgme_get_engine_info): Add UIServer
engine.
(_gpgme_engine_set_protocol, _gpgme_engine_op_decrypt_verify): New
function.
* decrypt-verify.c (decrypt_verify_start): Call
_gpgme_engine_op_decrypt_verify.
* util.h, posix-util.c,
w32-util.c (_gpgme_get_uiserver_socket_path): New function.
* engine-gpgsm.c (gpgsm_set_fd): Fix _gpgme_io_pipe invocation.
* gpgme-tool.c: Some support for UIServer protocol.
* engine-uiserver.c: New file.
2009-11-10 09:07:19 +00:00
|
|
|
|
if (strstr (line, "--prepare"))
|
|
|
|
|
flags |= GPGME_ENCRYPT_PREPARE;
|
|
|
|
|
if (strstr (line, "--expect-sign"))
|
|
|
|
|
flags |= GPGME_ENCRYPT_EXPECT_SIGN;
|
2014-05-08 09:31:30 +00:00
|
|
|
|
if (strstr (line, "--no-compress"))
|
|
|
|
|
flags |= GPGME_ENCRYPT_NO_COMPRESS;
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2012-09-26 07:37:22 +00:00
|
|
|
|
inp_fd = server->input_fd;
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
inp_fn = server->input_filename;
|
2012-09-26 07:37:22 +00:00
|
|
|
|
out_fd = server->output_fd;
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
out_fn = server->output_filename;
|
|
|
|
|
if (inp_fd != ASSUAN_INVALID_FD || inp_fn)
|
2009-10-30 14:21:08 +00:00
|
|
|
|
{
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
err = server_data_obj (inp_fd, inp_fn, 0, server->input_enc, &inp_data,
|
|
|
|
|
&server->input_stream);
|
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Activate UIServer if FD passing is enabled and
Assuan is available.
m4/
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* libassuan.m4: Fix LIBASSUAN_VERSION.
src/
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (uiserver_components): New variable.
(main_sources): Add it.
* ops.h, key.c (_gpgme_key_append_name): Take CONVERT argument,
implement it. Adjust callers.
(gpgme_key_from_uid): New function.
* gpgme.h.in (gpgme_protocol_t): Add GPGME_PROTOCOL_DEFAULT.
(gpgme_encrypt_flags_t): Add GPGME_ENCRYPT_PREPARE,
GPGME_ENCRYPT_EXPECT_SIGN.
(gpgme_set_sub_protocol, gpgme_key_from_uid): New functions.
* libgpgme.vers, gpgme.def: Add new functions.
* gpgme.c (gpgme_set_protocol): Add UIServer protocol.
(gpgme_set_sub_protocol): New function.
(gpgme_get_protocol_name): Add UIServer and default protocol.
* assuan-support.c: Return correct error values, implement
socketpair for POSIX.
* priv-io.h, posix-io.c, w32-io.c, w32-glib-io.c,
w32-qt-io.cpp (_gpgme_io_spawn): Add ATFORK and ATFORKVALUE
arguments. Implement it for POSIX. Adjust all callers.
* engine.h, engine-backend.h (_gpgme_engine_set_protocol)
(_gpgme_engine_op_decrypt_verify): New prototypes. Adjust all
users.
* engine.c (engine_ops, gpgme_get_engine_info): Add UIServer
engine.
(_gpgme_engine_set_protocol, _gpgme_engine_op_decrypt_verify): New
function.
* decrypt-verify.c (decrypt_verify_start): Call
_gpgme_engine_op_decrypt_verify.
* util.h, posix-util.c,
w32-util.c (_gpgme_get_uiserver_socket_path): New function.
* engine-gpgsm.c (gpgsm_set_fd): Fix _gpgme_io_pipe invocation.
* gpgme-tool.c: Some support for UIServer protocol.
* engine-uiserver.c: New file.
2009-11-10 09:07:19 +00:00
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
|
|
|
|
}
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
if (out_fd != ASSUAN_INVALID_FD || out_fn)
|
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Activate UIServer if FD passing is enabled and
Assuan is available.
m4/
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* libassuan.m4: Fix LIBASSUAN_VERSION.
src/
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (uiserver_components): New variable.
(main_sources): Add it.
* ops.h, key.c (_gpgme_key_append_name): Take CONVERT argument,
implement it. Adjust callers.
(gpgme_key_from_uid): New function.
* gpgme.h.in (gpgme_protocol_t): Add GPGME_PROTOCOL_DEFAULT.
(gpgme_encrypt_flags_t): Add GPGME_ENCRYPT_PREPARE,
GPGME_ENCRYPT_EXPECT_SIGN.
(gpgme_set_sub_protocol, gpgme_key_from_uid): New functions.
* libgpgme.vers, gpgme.def: Add new functions.
* gpgme.c (gpgme_set_protocol): Add UIServer protocol.
(gpgme_set_sub_protocol): New function.
(gpgme_get_protocol_name): Add UIServer and default protocol.
* assuan-support.c: Return correct error values, implement
socketpair for POSIX.
* priv-io.h, posix-io.c, w32-io.c, w32-glib-io.c,
w32-qt-io.cpp (_gpgme_io_spawn): Add ATFORK and ATFORKVALUE
arguments. Implement it for POSIX. Adjust all callers.
* engine.h, engine-backend.h (_gpgme_engine_set_protocol)
(_gpgme_engine_op_decrypt_verify): New prototypes. Adjust all
users.
* engine.c (engine_ops, gpgme_get_engine_info): Add UIServer
engine.
(_gpgme_engine_set_protocol, _gpgme_engine_op_decrypt_verify): New
function.
* decrypt-verify.c (decrypt_verify_start): Call
_gpgme_engine_op_decrypt_verify.
* util.h, posix-util.c,
w32-util.c (_gpgme_get_uiserver_socket_path): New function.
* engine-gpgsm.c (gpgsm_set_fd): Fix _gpgme_io_pipe invocation.
* gpgme-tool.c: Some support for UIServer protocol.
* engine-uiserver.c: New file.
2009-11-10 09:07:19 +00:00
|
|
|
|
{
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
err = server_data_obj (out_fd, out_fn, 1, server->output_enc, &out_data,
|
|
|
|
|
&server->output_stream);
|
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Activate UIServer if FD passing is enabled and
Assuan is available.
m4/
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* libassuan.m4: Fix LIBASSUAN_VERSION.
src/
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (uiserver_components): New variable.
(main_sources): Add it.
* ops.h, key.c (_gpgme_key_append_name): Take CONVERT argument,
implement it. Adjust callers.
(gpgme_key_from_uid): New function.
* gpgme.h.in (gpgme_protocol_t): Add GPGME_PROTOCOL_DEFAULT.
(gpgme_encrypt_flags_t): Add GPGME_ENCRYPT_PREPARE,
GPGME_ENCRYPT_EXPECT_SIGN.
(gpgme_set_sub_protocol, gpgme_key_from_uid): New functions.
* libgpgme.vers, gpgme.def: Add new functions.
* gpgme.c (gpgme_set_protocol): Add UIServer protocol.
(gpgme_set_sub_protocol): New function.
(gpgme_get_protocol_name): Add UIServer and default protocol.
* assuan-support.c: Return correct error values, implement
socketpair for POSIX.
* priv-io.h, posix-io.c, w32-io.c, w32-glib-io.c,
w32-qt-io.cpp (_gpgme_io_spawn): Add ATFORK and ATFORKVALUE
arguments. Implement it for POSIX. Adjust all callers.
* engine.h, engine-backend.h (_gpgme_engine_set_protocol)
(_gpgme_engine_op_decrypt_verify): New prototypes. Adjust all
users.
* engine.c (engine_ops, gpgme_get_engine_info): Add UIServer
engine.
(_gpgme_engine_set_protocol, _gpgme_engine_op_decrypt_verify): New
function.
* decrypt-verify.c (decrypt_verify_start): Call
_gpgme_engine_op_decrypt_verify.
* util.h, posix-util.c,
w32-util.c (_gpgme_get_uiserver_socket_path): New function.
* engine-gpgsm.c (gpgsm_set_fd): Fix _gpgme_io_pipe invocation.
* gpgme-tool.c: Some support for UIServer protocol.
* engine-uiserver.c: New file.
2009-11-10 09:07:19 +00:00
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
gpgme_data_release (inp_data);
|
|
|
|
|
return err;
|
|
|
|
|
}
|
2009-10-30 14:21:08 +00:00
|
|
|
|
}
|
|
|
|
|
|
2012-09-25 13:29:49 +00:00
|
|
|
|
err = gt_sign_encrypt (server->gt, flags, inp_data, out_data, sign);
|
2009-10-30 14:21:08 +00:00
|
|
|
|
|
|
|
|
|
gpgme_data_release (inp_data);
|
|
|
|
|
gpgme_data_release (out_data);
|
|
|
|
|
|
|
|
|
|
server_reset_fds (server);
|
|
|
|
|
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
gpgme-tool: add help messages for a number of commands.
* src/gpgme-tool.c (hlp_engine, hlp_sub_protocol, hlp_armor, hlp_textmode,
hlp_include_certs, hlp_keylist_mode, hlp_input, hlp_output, hlp_message,
hlp_recipient, hlp_signer, hlp_signers_clear, hlp_decrypt, hlp_decrypt_verify,
hlp_encrypt, hlp_sign_encrypt, hlp_sign, hlp_verify, hlp_import): New strings.
(hlp_protocol): Fix typo.
(register_commands): Add documentation strings.
(doc): Mention Assuan.
2012-03-27 19:10:02 +00:00
|
|
|
|
static const char hlp_encrypt[] =
|
|
|
|
|
"ENCRYPT [--always-trust] [--no-encrypt-to]\n"
|
2014-05-08 09:31:30 +00:00
|
|
|
|
" [--no-compress] [--prepare] [--expect-sign]\n"
|
gpgme-tool: add help messages for a number of commands.
* src/gpgme-tool.c (hlp_engine, hlp_sub_protocol, hlp_armor, hlp_textmode,
hlp_include_certs, hlp_keylist_mode, hlp_input, hlp_output, hlp_message,
hlp_recipient, hlp_signer, hlp_signers_clear, hlp_decrypt, hlp_decrypt_verify,
hlp_encrypt, hlp_sign_encrypt, hlp_sign, hlp_verify, hlp_import): New strings.
(hlp_protocol): Fix typo.
(register_commands): Add documentation strings.
(doc): Mention Assuan.
2012-03-27 19:10:02 +00:00
|
|
|
|
"\n"
|
|
|
|
|
"Encrypt the object set by the last INPUT command to\n"
|
|
|
|
|
"the keys specified by previous RECIPIENT commands. \n"
|
|
|
|
|
"Write the signed and encrypted message to the object\n"
|
|
|
|
|
"set by the last OUTPUT command.";
|
2009-10-30 14:21:08 +00:00
|
|
|
|
static gpg_error_t
|
|
|
|
|
cmd_encrypt (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
return _cmd_sign_encrypt (ctx, line, 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
gpgme-tool: add help messages for a number of commands.
* src/gpgme-tool.c (hlp_engine, hlp_sub_protocol, hlp_armor, hlp_textmode,
hlp_include_certs, hlp_keylist_mode, hlp_input, hlp_output, hlp_message,
hlp_recipient, hlp_signer, hlp_signers_clear, hlp_decrypt, hlp_decrypt_verify,
hlp_encrypt, hlp_sign_encrypt, hlp_sign, hlp_verify, hlp_import): New strings.
(hlp_protocol): Fix typo.
(register_commands): Add documentation strings.
(doc): Mention Assuan.
2012-03-27 19:10:02 +00:00
|
|
|
|
static const char hlp_sign_encrypt[] =
|
|
|
|
|
"SIGN_ENCRYPT [--always-trust] [--no-encrypt-to]\n"
|
2014-05-08 09:31:30 +00:00
|
|
|
|
" [--no-compress] [--prepare] [--expect-sign]\n"
|
gpgme-tool: add help messages for a number of commands.
* src/gpgme-tool.c (hlp_engine, hlp_sub_protocol, hlp_armor, hlp_textmode,
hlp_include_certs, hlp_keylist_mode, hlp_input, hlp_output, hlp_message,
hlp_recipient, hlp_signer, hlp_signers_clear, hlp_decrypt, hlp_decrypt_verify,
hlp_encrypt, hlp_sign_encrypt, hlp_sign, hlp_verify, hlp_import): New strings.
(hlp_protocol): Fix typo.
(register_commands): Add documentation strings.
(doc): Mention Assuan.
2012-03-27 19:10:02 +00:00
|
|
|
|
"\n"
|
|
|
|
|
"Sign the object set by the last INPUT command with the\n"
|
|
|
|
|
"keys specified by previous SIGNER commands and encrypt\n"
|
|
|
|
|
"it to the keys specified by previous RECIPIENT\n"
|
|
|
|
|
"commands. Write the signed and encrypted message to\n"
|
|
|
|
|
"the object set by the last OUTPUT command.";
|
2009-10-30 14:21:08 +00:00
|
|
|
|
static gpg_error_t
|
|
|
|
|
cmd_sign_encrypt (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
return _cmd_sign_encrypt (ctx, line, 1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
gpgme-tool: add help messages for a number of commands.
* src/gpgme-tool.c (hlp_engine, hlp_sub_protocol, hlp_armor, hlp_textmode,
hlp_include_certs, hlp_keylist_mode, hlp_input, hlp_output, hlp_message,
hlp_recipient, hlp_signer, hlp_signers_clear, hlp_decrypt, hlp_decrypt_verify,
hlp_encrypt, hlp_sign_encrypt, hlp_sign, hlp_verify, hlp_import): New strings.
(hlp_protocol): Fix typo.
(register_commands): Add documentation strings.
(doc): Mention Assuan.
2012-03-27 19:10:02 +00:00
|
|
|
|
static const char hlp_sign[] =
|
|
|
|
|
"SIGN [--clear|--detach]\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Sign the object set by the last INPUT command with the\n"
|
|
|
|
|
"keys specified by previous SIGNER commands. Write the\n"
|
|
|
|
|
"signed message to the object set by the last OUTPUT\n"
|
|
|
|
|
"command. With `--clear`, generate a clear text\n"
|
|
|
|
|
"signature. With `--detach`, generate a detached\n"
|
|
|
|
|
"signature.";
|
2009-10-30 14:21:08 +00:00
|
|
|
|
static gpg_error_t
|
|
|
|
|
cmd_sign (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
struct server *server = assuan_get_pointer (ctx);
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
assuan_fd_t inp_fd;
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
char *inp_fn;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
assuan_fd_t out_fd;
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
char *out_fn;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
gpgme_data_t inp_data;
|
|
|
|
|
gpgme_data_t out_data;
|
|
|
|
|
gpgme_sig_mode_t mode = GPGME_SIG_MODE_NORMAL;
|
|
|
|
|
|
|
|
|
|
if (strstr (line, "--clear"))
|
|
|
|
|
mode = GPGME_SIG_MODE_CLEAR;
|
|
|
|
|
if (strstr (line, "--detach"))
|
|
|
|
|
mode = GPGME_SIG_MODE_DETACH;
|
|
|
|
|
|
2012-09-26 07:37:22 +00:00
|
|
|
|
inp_fd = server->input_fd;
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
inp_fn = server->input_filename;
|
|
|
|
|
if (inp_fd == ASSUAN_INVALID_FD && !inp_fn)
|
2009-10-30 14:21:08 +00:00
|
|
|
|
return GPG_ERR_ASS_NO_INPUT;
|
2012-09-26 07:37:22 +00:00
|
|
|
|
out_fd = server->output_fd;
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
out_fn = server->output_filename;
|
|
|
|
|
if (out_fd == ASSUAN_INVALID_FD && !out_fn)
|
2009-10-30 14:21:08 +00:00
|
|
|
|
return GPG_ERR_ASS_NO_OUTPUT;
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
err = server_data_obj (inp_fd, inp_fn, 0, server->input_enc, &inp_data,
|
|
|
|
|
&server->input_stream);
|
2009-10-30 14:21:08 +00:00
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
err = server_data_obj (out_fd, out_fn, 1, server->output_enc, &out_data,
|
|
|
|
|
&server->output_stream);
|
2009-10-30 14:21:08 +00:00
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
gpgme_data_release (inp_data);
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
err = gt_sign (server->gt, inp_data, out_data, mode);
|
|
|
|
|
|
|
|
|
|
gpgme_data_release (inp_data);
|
|
|
|
|
gpgme_data_release (out_data);
|
|
|
|
|
server_reset_fds (server);
|
|
|
|
|
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
gpgme-tool: add help messages for a number of commands.
* src/gpgme-tool.c (hlp_engine, hlp_sub_protocol, hlp_armor, hlp_textmode,
hlp_include_certs, hlp_keylist_mode, hlp_input, hlp_output, hlp_message,
hlp_recipient, hlp_signer, hlp_signers_clear, hlp_decrypt, hlp_decrypt_verify,
hlp_encrypt, hlp_sign_encrypt, hlp_sign, hlp_verify, hlp_import): New strings.
(hlp_protocol): Fix typo.
(register_commands): Add documentation strings.
(doc): Mention Assuan.
2012-03-27 19:10:02 +00:00
|
|
|
|
static const char hlp_verify[] =
|
|
|
|
|
"VERIFY\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Verify signatures on the object set by the last INPUT\n"
|
|
|
|
|
"and MESSAGE commands. If the message was encrypted,\n"
|
|
|
|
|
"write the plaintext to the object set by the last\n"
|
|
|
|
|
"OUTPUT command.";
|
2009-10-30 14:21:08 +00:00
|
|
|
|
static gpg_error_t
|
|
|
|
|
cmd_verify (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
struct server *server = assuan_get_pointer (ctx);
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
assuan_fd_t inp_fd;
|
|
|
|
|
assuan_fd_t msg_fd;
|
|
|
|
|
assuan_fd_t out_fd;
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
char *inp_fn;
|
|
|
|
|
char *msg_fn;
|
|
|
|
|
char *out_fn;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
gpgme_data_t inp_data;
|
|
|
|
|
gpgme_data_t msg_data = NULL;
|
|
|
|
|
gpgme_data_t out_data = NULL;
|
|
|
|
|
|
2016-09-13 18:53:14 +00:00
|
|
|
|
(void)line;
|
|
|
|
|
|
2012-09-26 07:37:22 +00:00
|
|
|
|
inp_fd = server->input_fd;
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
inp_fn = server->input_filename;
|
|
|
|
|
if (inp_fd == ASSUAN_INVALID_FD && !inp_fn)
|
2009-10-30 14:21:08 +00:00
|
|
|
|
return GPG_ERR_ASS_NO_INPUT;
|
|
|
|
|
msg_fd = server->message_fd;
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
msg_fn = server->message_filename;
|
2012-09-26 07:37:22 +00:00
|
|
|
|
out_fd = server->output_fd;
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
out_fn = server->output_filename;
|
|
|
|
|
|
|
|
|
|
err = server_data_obj (inp_fd, inp_fn, 0, server->input_enc, &inp_data,
|
|
|
|
|
&server->input_stream);
|
2009-10-30 14:21:08 +00:00
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
if (msg_fd != ASSUAN_INVALID_FD || msg_fn)
|
2009-10-30 14:21:08 +00:00
|
|
|
|
{
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
err = server_data_obj (msg_fd, msg_fn, 0, server->message_enc, &msg_data,
|
|
|
|
|
&server->message_stream);
|
2009-10-30 14:21:08 +00:00
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
gpgme_data_release (inp_data);
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
}
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
if (out_fd != ASSUAN_INVALID_FD || out_fn)
|
2009-10-30 14:21:08 +00:00
|
|
|
|
{
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
err = server_data_obj (out_fd, out_fn, 1, server->output_enc, &out_data,
|
|
|
|
|
&server->output_stream);
|
2009-10-30 14:21:08 +00:00
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
gpgme_data_release (inp_data);
|
|
|
|
|
gpgme_data_release (msg_data);
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
err = gt_verify (server->gt, inp_data, msg_data, out_data);
|
|
|
|
|
|
|
|
|
|
gpgme_data_release (inp_data);
|
|
|
|
|
if (msg_data)
|
|
|
|
|
gpgme_data_release (msg_data);
|
|
|
|
|
if (out_data)
|
|
|
|
|
gpgme_data_release (out_data);
|
|
|
|
|
|
|
|
|
|
server_reset_fds (server);
|
|
|
|
|
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
gpgme-tool: add help messages for a number of commands.
* src/gpgme-tool.c (hlp_engine, hlp_sub_protocol, hlp_armor, hlp_textmode,
hlp_include_certs, hlp_keylist_mode, hlp_input, hlp_output, hlp_message,
hlp_recipient, hlp_signer, hlp_signers_clear, hlp_decrypt, hlp_decrypt_verify,
hlp_encrypt, hlp_sign_encrypt, hlp_sign, hlp_verify, hlp_import): New strings.
(hlp_protocol): Fix typo.
(register_commands): Add documentation strings.
(doc): Mention Assuan.
2012-03-27 19:10:02 +00:00
|
|
|
|
static const char hlp_import[] =
|
|
|
|
|
"IMPORT [<pattern>]\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"With PATTERN, import the keys described by PATTERN.\n"
|
|
|
|
|
"Without, read a key (or keys) from the object set by the\n"
|
|
|
|
|
"last INPUT command.";
|
2009-10-30 14:21:08 +00:00
|
|
|
|
static gpg_error_t
|
|
|
|
|
cmd_import (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
struct server *server = assuan_get_pointer (ctx);
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
if (line && *line)
|
|
|
|
|
{
|
|
|
|
|
char *fprs[2] = { line, NULL };
|
|
|
|
|
|
|
|
|
|
return gt_import_keys (server->gt, fprs);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
assuan_fd_t inp_fd;
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
char *inp_fn;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
gpgme_data_t inp_data;
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2012-09-26 07:37:22 +00:00
|
|
|
|
inp_fd = server->input_fd;
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
inp_fn = server->input_filename;
|
|
|
|
|
if (inp_fd == ASSUAN_INVALID_FD && !inp_fn)
|
2009-10-30 14:21:08 +00:00
|
|
|
|
return GPG_ERR_ASS_NO_INPUT;
|
|
|
|
|
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
err = server_data_obj (inp_fd, inp_fn, 0, server->input_enc, &inp_data,
|
|
|
|
|
&server->input_stream);
|
2009-10-30 14:21:08 +00:00
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
|
|
|
|
err = gt_import (server->gt, inp_data);
|
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
gpgme_data_release (inp_data);
|
|
|
|
|
server_reset_fds (server);
|
|
|
|
|
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2012-09-25 13:29:49 +00:00
|
|
|
|
static const char hlp_export[] =
|
2015-08-24 10:41:24 +00:00
|
|
|
|
"EXPORT [--extern] [--minimal] [--secret [--pkcs12] [--raw]] [<pattern>]\n"
|
2010-02-16 20:07:03 +00:00
|
|
|
|
"\n"
|
|
|
|
|
"Export the keys described by PATTERN. Write the\n"
|
|
|
|
|
"the output to the object set by the last OUTPUT command.";
|
2009-10-30 14:21:08 +00:00
|
|
|
|
static gpg_error_t
|
|
|
|
|
cmd_export (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
struct server *server = assuan_get_pointer (ctx);
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
assuan_fd_t out_fd;
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
char *out_fn;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
gpgme_data_t out_data;
|
|
|
|
|
gpgme_export_mode_t mode = 0;
|
|
|
|
|
const char *pattern[2];
|
|
|
|
|
|
2012-09-26 07:37:22 +00:00
|
|
|
|
out_fd = server->output_fd;
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
out_fn = server->output_filename;
|
|
|
|
|
if (out_fd == ASSUAN_INVALID_FD && !out_fn)
|
2009-10-30 14:21:08 +00:00
|
|
|
|
return GPG_ERR_ASS_NO_OUTPUT;
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
err = server_data_obj (out_fd, out_fn, 1, server->output_enc, &out_data,
|
|
|
|
|
&server->output_stream);
|
2009-10-30 14:21:08 +00:00
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
|
|
|
|
|
2010-02-16 20:07:03 +00:00
|
|
|
|
if (has_option (line, "--extern"))
|
|
|
|
|
mode |= GPGME_EXPORT_MODE_EXTERN;
|
|
|
|
|
if (has_option (line, "--minimal"))
|
|
|
|
|
mode |= GPGME_EXPORT_MODE_MINIMAL;
|
2015-08-24 10:41:24 +00:00
|
|
|
|
if (has_option (line, "--secret"))
|
|
|
|
|
mode |= GPGME_EXPORT_MODE_SECRET;
|
|
|
|
|
if (has_option (line, "--raw"))
|
|
|
|
|
mode |= GPGME_EXPORT_MODE_RAW;
|
|
|
|
|
if (has_option (line, "--pkcs12"))
|
|
|
|
|
mode |= GPGME_EXPORT_MODE_PKCS12;
|
2010-02-16 20:07:03 +00:00
|
|
|
|
|
|
|
|
|
line = skip_options (line);
|
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
pattern[0] = line;
|
|
|
|
|
pattern[1] = NULL;
|
|
|
|
|
|
|
|
|
|
err = gt_export (server->gt, pattern, mode, out_data);
|
|
|
|
|
|
|
|
|
|
gpgme_data_release (out_data);
|
|
|
|
|
server_reset_fds (server);
|
|
|
|
|
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static gpg_error_t
|
|
|
|
|
_cmd_genkey_write (gpgme_data_t data, const void *buf, size_t size)
|
|
|
|
|
{
|
|
|
|
|
while (size > 0)
|
|
|
|
|
{
|
Make definition of off_t robust against misbehaving w32 toolchains.
* configure.ac (NEED__FILE_OFFSET_BITS): Change to define gpgme_off_t
and gpgme_ssize_t.
(API__OFF_T, API__SSIZE_T): New ac_subst.
* src/gpgme.h.in: Replace all ssize_t and off_t by ac_subst macros.
* src/assuan-support.c, src/ath-pthread.c, src/ath.c, src/ath.h
* src/data-compat.c, src/data-fd.c, src/data-mem.c, src/data-stream.c
* src/data-user.c, src/data.c, src/data.h, src/engine-gpgsm.c
* src/engine-uiserver.c, src/gpgme-tool.c, src/gpgme.c: Replace off_t
by gpgme_off_t and sszie_t by gpgme_ssize_t.
* src/ath-pthread.c, src/ath.h: Include gpgme.h.
--
For a detailed description, see the gpgme.texi diff.
2013-04-25 11:00:16 +00:00
|
|
|
|
gpgme_ssize_t writen = gpgme_data_write (data, buf, size);
|
2009-10-30 14:21:08 +00:00
|
|
|
|
if (writen < 0 && errno != EAGAIN)
|
|
|
|
|
return gpg_error_from_syserror ();
|
|
|
|
|
else if (writen > 0)
|
|
|
|
|
{
|
|
|
|
|
buf = (void *) (((char *) buf) + writen);
|
|
|
|
|
size -= writen;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static gpg_error_t
|
|
|
|
|
cmd_genkey (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
struct server *server = assuan_get_pointer (ctx);
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
assuan_fd_t inp_fd;
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
char *inp_fn;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
assuan_fd_t out_fd;
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
char *out_fn;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
gpgme_data_t inp_data;
|
|
|
|
|
gpgme_data_t out_data = NULL;
|
|
|
|
|
gpgme_data_t parms_data = NULL;
|
|
|
|
|
const char *parms;
|
|
|
|
|
|
2016-09-13 18:53:14 +00:00
|
|
|
|
(void)line;
|
|
|
|
|
|
2012-09-26 07:37:22 +00:00
|
|
|
|
inp_fd = server->input_fd;
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
inp_fn = server->input_filename;
|
|
|
|
|
if (inp_fd == ASSUAN_INVALID_FD && !inp_fn)
|
2009-10-30 14:21:08 +00:00
|
|
|
|
return GPG_ERR_ASS_NO_INPUT;
|
2012-09-26 07:37:22 +00:00
|
|
|
|
out_fd = server->output_fd;
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
out_fn = server->output_filename;
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
err = server_data_obj (inp_fd, inp_fn, 0, server->input_enc, &inp_data,
|
|
|
|
|
&server->input_stream);
|
2009-10-30 14:21:08 +00:00
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
if (out_fd != ASSUAN_INVALID_FD || out_fn)
|
2009-10-30 14:21:08 +00:00
|
|
|
|
{
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
err = server_data_obj (out_fd, out_fn, 1, server->output_enc, &out_data,
|
|
|
|
|
&server->output_stream);
|
2009-10-30 14:21:08 +00:00
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
gpgme_data_release (inp_data);
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Convert input data. */
|
|
|
|
|
err = gpgme_data_new (&parms_data);
|
|
|
|
|
if (err)
|
|
|
|
|
goto out;
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
char buf[512];
|
Make definition of off_t robust against misbehaving w32 toolchains.
* configure.ac (NEED__FILE_OFFSET_BITS): Change to define gpgme_off_t
and gpgme_ssize_t.
(API__OFF_T, API__SSIZE_T): New ac_subst.
* src/gpgme.h.in: Replace all ssize_t and off_t by ac_subst macros.
* src/assuan-support.c, src/ath-pthread.c, src/ath.c, src/ath.h
* src/data-compat.c, src/data-fd.c, src/data-mem.c, src/data-stream.c
* src/data-user.c, src/data.c, src/data.h, src/engine-gpgsm.c
* src/engine-uiserver.c, src/gpgme-tool.c, src/gpgme.c: Replace off_t
by gpgme_off_t and sszie_t by gpgme_ssize_t.
* src/ath-pthread.c, src/ath.h: Include gpgme.h.
--
For a detailed description, see the gpgme.texi diff.
2013-04-25 11:00:16 +00:00
|
|
|
|
gpgme_ssize_t readn = gpgme_data_read (inp_data, buf, sizeof (buf));
|
2009-10-30 14:21:08 +00:00
|
|
|
|
if (readn < 0)
|
|
|
|
|
{
|
|
|
|
|
err = gpg_error_from_syserror ();
|
|
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
else if (readn == 0)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
err = _cmd_genkey_write (parms_data, buf, readn);
|
|
|
|
|
if (err)
|
|
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
while (1);
|
|
|
|
|
err = _cmd_genkey_write (parms_data, "", 1);
|
|
|
|
|
if (err)
|
|
|
|
|
goto out;
|
|
|
|
|
parms = gpgme_data_release_and_get_mem (parms_data, NULL);
|
|
|
|
|
parms_data = NULL;
|
|
|
|
|
if (! parms)
|
|
|
|
|
{
|
|
|
|
|
err = gpg_error (GPG_ERR_GENERAL);
|
|
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
err = gt_genkey (server->gt, parms, out_data, NULL);
|
|
|
|
|
|
|
|
|
|
server_reset_fds (server);
|
|
|
|
|
|
|
|
|
|
out:
|
|
|
|
|
gpgme_data_release (inp_data);
|
|
|
|
|
if (out_data)
|
|
|
|
|
gpgme_data_release (out_data);
|
|
|
|
|
if (parms_data)
|
|
|
|
|
gpgme_data_release (parms_data);
|
|
|
|
|
|
2012-09-25 13:29:49 +00:00
|
|
|
|
return err;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static gpg_error_t
|
|
|
|
|
cmd_delete (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
struct server *server = assuan_get_pointer (ctx);
|
|
|
|
|
int allow_secret = 0;
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
const char optstr[] = "--allow-secret";
|
2009-10-30 14:21:08 +00:00
|
|
|
|
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
if (!strncasecmp (line, optstr, strlen (optstr)))
|
2009-10-30 14:21:08 +00:00
|
|
|
|
{
|
|
|
|
|
allow_secret = 1;
|
|
|
|
|
line += strlen (optstr);
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
while (*line && !spacep (line))
|
|
|
|
|
line++;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
}
|
|
|
|
|
return gt_delete (server->gt, line, allow_secret);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2012-09-25 13:29:49 +00:00
|
|
|
|
static const char hlp_keylist[] =
|
2010-12-08 09:55:00 +00:00
|
|
|
|
"KEYLIST [--secret-only] [<patterns>]\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"List all certificates or only those specified by PATTERNS. Each\n"
|
|
|
|
|
"pattern shall be a percent-plus escaped certificate specification.";
|
2009-10-30 14:21:08 +00:00
|
|
|
|
static gpg_error_t
|
|
|
|
|
cmd_keylist (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
2010-12-08 09:55:00 +00:00
|
|
|
|
#define MAX_CMD_KEYLIST_PATTERN 20
|
2009-10-30 14:21:08 +00:00
|
|
|
|
struct server *server = assuan_get_pointer (ctx);
|
2012-09-28 06:31:13 +00:00
|
|
|
|
gpgme_tool_t gt = server->gt;
|
|
|
|
|
struct result_xml_state state;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
gpg_error_t err;
|
|
|
|
|
int secret_only = 0;
|
2012-09-28 06:31:13 +00:00
|
|
|
|
int idx, indent=2;
|
2010-12-08 09:55:00 +00:00
|
|
|
|
const char *pattern[MAX_CMD_KEYLIST_PATTERN+1];
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
const char optstr[] = "--secret-only";
|
2010-12-08 09:55:00 +00:00
|
|
|
|
char *p;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
if (!strncasecmp (line, optstr, strlen (optstr)))
|
2009-10-30 14:21:08 +00:00
|
|
|
|
{
|
|
|
|
|
secret_only = 1;
|
|
|
|
|
line += strlen (optstr);
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
while (*line && !spacep (line))
|
|
|
|
|
line++;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
}
|
2010-12-08 09:55:00 +00:00
|
|
|
|
|
|
|
|
|
idx = 0;
|
|
|
|
|
for (p=line; *p; line = p)
|
|
|
|
|
{
|
|
|
|
|
while (*p && *p != ' ')
|
|
|
|
|
p++;
|
|
|
|
|
if (*p)
|
|
|
|
|
*p++ = 0;
|
|
|
|
|
if (*line)
|
|
|
|
|
{
|
|
|
|
|
if (idx+1 == DIM (pattern))
|
|
|
|
|
return gpg_error (GPG_ERR_TOO_MANY);
|
|
|
|
|
strcpy_escaped_plus (line, line);
|
|
|
|
|
pattern[idx++] = line;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
pattern[idx] = NULL;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
|
2016-07-19 00:16:46 +00:00
|
|
|
|
gt_write_data (gt, xml_preamble1, strlen (xml_preamble1));
|
2012-09-28 06:31:13 +00:00
|
|
|
|
gt_write_data (gt, NULL, 0);
|
2016-07-19 00:16:46 +00:00
|
|
|
|
gt_write_data (gt, xml_preamble2, strlen (xml_preamble2));
|
2012-09-28 06:31:13 +00:00
|
|
|
|
gt_write_data (gt, NULL, 0);
|
|
|
|
|
result_init (&state, indent, (result_xml_write_cb_t) gt_write_data, gt);
|
|
|
|
|
result_xml_tag_start (&state, "keylist", NULL);
|
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
err = gt_keylist_start (server->gt, pattern, secret_only);
|
|
|
|
|
while (! err)
|
|
|
|
|
{
|
|
|
|
|
gpgme_key_t key;
|
2012-09-28 06:31:13 +00:00
|
|
|
|
gpgme_subkey_t subkey;
|
|
|
|
|
gpgme_user_id_t uid;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
|
|
|
|
|
err = gt_keylist_next (server->gt, &key);
|
|
|
|
|
if (gpg_err_code (err) == GPG_ERR_EOF)
|
|
|
|
|
{
|
|
|
|
|
err = 0;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
else if (! err)
|
|
|
|
|
{
|
2012-09-28 06:31:13 +00:00
|
|
|
|
result_xml_tag_start (&state, "key", NULL);
|
|
|
|
|
result_add_value (&state, "revoked", key->revoked);
|
|
|
|
|
result_add_value (&state, "expired", key->expired);
|
|
|
|
|
result_add_value (&state, "disabled", key->disabled);
|
|
|
|
|
result_add_value (&state, "invalid", key->invalid);
|
|
|
|
|
result_add_value (&state, "can-encrypt", key->can_encrypt);
|
|
|
|
|
result_add_value (&state, "can-sign", key->can_sign);
|
|
|
|
|
result_add_value (&state, "can-certify", key->can_certify);
|
|
|
|
|
result_add_value (&state, "can-authenticate", key->can_authenticate);
|
|
|
|
|
result_add_value (&state, "is-qualified", key->is_qualified);
|
|
|
|
|
result_add_value (&state, "secret", key->secret);
|
|
|
|
|
result_add_protocol (&state, "protocol", key->protocol);
|
|
|
|
|
result_xml_tag_start (&state, "issuer", NULL);
|
|
|
|
|
result_add_string (&state, "serial", key->issuer_serial);
|
|
|
|
|
result_add_string (&state, "name", key->issuer_name);
|
|
|
|
|
result_xml_tag_end (&state); /* issuer */
|
2012-10-06 13:33:30 +00:00
|
|
|
|
result_add_string (&state, "chain-id", key->chain_id);
|
2012-09-28 06:31:13 +00:00
|
|
|
|
result_add_validity (&state, "owner-trust", key->owner_trust);
|
|
|
|
|
result_xml_tag_start (&state, "subkeys", NULL);
|
|
|
|
|
subkey = key->subkeys;
|
|
|
|
|
while (subkey) {
|
|
|
|
|
result_xml_tag_start (&state, "subkey", NULL);
|
|
|
|
|
/* FIXME: more data */
|
2014-08-12 08:36:30 +00:00
|
|
|
|
result_add_keyid (&state, "keyid", subkey->keyid);
|
|
|
|
|
if (subkey->fpr)
|
|
|
|
|
result_add_fpr (&state, "fpr", subkey->fpr);
|
2014-06-04 07:57:54 +00:00
|
|
|
|
result_add_value (&state, "secret", subkey->secret);
|
|
|
|
|
result_add_value (&state, "is_cardkey", subkey->is_cardkey);
|
|
|
|
|
if (subkey->card_number)
|
|
|
|
|
result_add_string (&state, "card_number", subkey->card_number);
|
|
|
|
|
if (subkey->curve)
|
|
|
|
|
result_add_string (&state, "curve", subkey->curve);
|
2012-09-28 06:31:13 +00:00
|
|
|
|
result_xml_tag_end (&state); /* subkey */
|
|
|
|
|
subkey = subkey->next;
|
|
|
|
|
}
|
|
|
|
|
result_xml_tag_end (&state); /* subkeys */
|
|
|
|
|
result_xml_tag_start (&state, "uids", NULL);
|
|
|
|
|
uid = key->uids;
|
|
|
|
|
while (uid) {
|
|
|
|
|
result_xml_tag_start (&state, "uid", NULL);
|
|
|
|
|
/* FIXME: more data */
|
|
|
|
|
result_add_string (&state, "uid", uid->uid);
|
|
|
|
|
result_add_string (&state, "name", uid->name);
|
|
|
|
|
result_add_string (&state, "email", uid->email);
|
|
|
|
|
result_add_string (&state, "comment", uid->comment);
|
|
|
|
|
result_xml_tag_end (&state); /* uid */
|
|
|
|
|
uid = uid->next;
|
|
|
|
|
}
|
|
|
|
|
result_xml_tag_end (&state); /* uids */
|
|
|
|
|
result_xml_tag_end (&state); /* key */
|
2009-10-30 14:21:08 +00:00
|
|
|
|
gpgme_key_unref (key);
|
|
|
|
|
}
|
|
|
|
|
}
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2012-09-28 06:31:13 +00:00
|
|
|
|
result_xml_tag_end (&state); /* keylist */
|
2016-07-19 00:16:46 +00:00
|
|
|
|
gt_write_data (gt, xml_end, strlen (xml_end));
|
2012-09-28 06:31:13 +00:00
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
server_reset_fds (server);
|
|
|
|
|
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2012-09-25 13:29:49 +00:00
|
|
|
|
static const char hlp_getauditlog[] =
|
2009-12-01 11:21:47 +00:00
|
|
|
|
"GETAUDITLOG [--html] [--with-help]\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Call the function gpgme_op_getauditlog with the given flags. Write\n"
|
|
|
|
|
"the output to the object set by the last OUTPUT command.";
|
2009-10-30 14:21:08 +00:00
|
|
|
|
static gpg_error_t
|
|
|
|
|
cmd_getauditlog (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
struct server *server = assuan_get_pointer (ctx);
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
assuan_fd_t out_fd;
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
char *out_fn;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
gpgme_data_t out_data;
|
2009-12-01 11:21:47 +00:00
|
|
|
|
unsigned int flags = 0;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
|
2012-09-26 07:37:22 +00:00
|
|
|
|
out_fd = server->output_fd;
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
out_fn = server->output_filename;
|
|
|
|
|
if (out_fd == ASSUAN_INVALID_FD && !out_fn)
|
2009-10-30 14:21:08 +00:00
|
|
|
|
return GPG_ERR_ASS_NO_OUTPUT;
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
err = server_data_obj (out_fd, out_fn, 1, server->output_enc, &out_data,
|
|
|
|
|
&server->output_stream);
|
2009-10-30 14:21:08 +00:00
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
|
|
|
|
|
2009-12-01 11:21:47 +00:00
|
|
|
|
if (strstr (line, "--html"))
|
|
|
|
|
flags |= GPGME_AUDITLOG_HTML;
|
|
|
|
|
if (strstr (line, "--with-help"))
|
|
|
|
|
flags |= GPGME_AUDITLOG_WITH_HELP;
|
|
|
|
|
|
|
|
|
|
err = gt_getauditlog (server->gt, out_data, flags);
|
2009-10-30 14:21:08 +00:00
|
|
|
|
|
|
|
|
|
gpgme_data_release (out_data);
|
|
|
|
|
server_reset_fds (server);
|
|
|
|
|
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static gpg_error_t
|
|
|
|
|
cmd_vfs_mount (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
struct server *server = assuan_get_pointer (ctx);
|
|
|
|
|
char *mount_dir;
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
|
|
|
|
|
mount_dir = strchr (line, ' ');
|
|
|
|
|
if (mount_dir)
|
|
|
|
|
{
|
|
|
|
|
*(mount_dir++) = '\0';
|
|
|
|
|
while (*mount_dir == ' ')
|
|
|
|
|
mount_dir++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
err = gt_vfs_mount (server->gt, line, mount_dir, 0);
|
|
|
|
|
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-11-03 19:15:35 +00:00
|
|
|
|
static gpg_error_t
|
|
|
|
|
cmd_vfs_create (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
struct server *server = assuan_get_pointer (ctx);
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
char *end;
|
|
|
|
|
|
|
|
|
|
end = strchr (line, ' ');
|
|
|
|
|
if (end)
|
|
|
|
|
{
|
|
|
|
|
*(end++) = '\0';
|
|
|
|
|
while (*end == ' ')
|
|
|
|
|
end++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
err = gt_vfs_create (server->gt, line, 0);
|
|
|
|
|
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2013-08-09 17:19:26 +00:00
|
|
|
|
static const char hlp_passwd[] =
|
|
|
|
|
"PASSWD <user-id>\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Ask the backend to change the passphrase for the key\n"
|
|
|
|
|
"specified by USER-ID.";
|
2010-01-05 17:36:53 +00:00
|
|
|
|
static gpg_error_t
|
|
|
|
|
cmd_passwd (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
struct server *server = assuan_get_pointer (ctx);
|
|
|
|
|
|
|
|
|
|
return gt_passwd (server->gt, line);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
static gpg_error_t
|
|
|
|
|
cmd_result (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
struct server *server = assuan_get_pointer (ctx);
|
2016-09-13 18:53:14 +00:00
|
|
|
|
|
|
|
|
|
(void)line;
|
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
return gt_result (server->gt, GT_RESULT_ALL);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* STRERROR <err> */
|
|
|
|
|
static gpg_error_t
|
|
|
|
|
cmd_strerror (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
char buf[100];
|
|
|
|
|
|
|
|
|
|
err = atoi (line);
|
|
|
|
|
snprintf (buf, sizeof (buf), "%s <%s>", gpgme_strerror (err),
|
|
|
|
|
gpgme_strsource (err));
|
|
|
|
|
return assuan_send_data (ctx, buf, strlen (buf));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static gpg_error_t
|
|
|
|
|
cmd_pubkey_algo_name (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
gpgme_pubkey_algo_t algo;
|
|
|
|
|
char buf[100];
|
|
|
|
|
|
|
|
|
|
algo = atoi (line);
|
|
|
|
|
snprintf (buf, sizeof (buf), "%s", gpgme_pubkey_algo_name (algo));
|
|
|
|
|
return assuan_send_data (ctx, buf, strlen (buf));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static gpg_error_t
|
|
|
|
|
cmd_hash_algo_name (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
gpgme_hash_algo_t algo;
|
|
|
|
|
char buf[100];
|
|
|
|
|
|
|
|
|
|
algo = atoi (line);
|
|
|
|
|
snprintf (buf, sizeof (buf), "%s", gpgme_hash_algo_name (algo));
|
|
|
|
|
return assuan_send_data (ctx, buf, strlen (buf));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2013-08-09 17:19:26 +00:00
|
|
|
|
static const char hlp_identify[] =
|
|
|
|
|
"IDENTIY\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Identify the type of data set with the INPUT command.";
|
|
|
|
|
static gpg_error_t
|
|
|
|
|
cmd_identify (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
struct server *server = assuan_get_pointer (ctx);
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
assuan_fd_t inp_fd;
|
|
|
|
|
char *inp_fn;
|
|
|
|
|
gpgme_data_t inp_data;
|
|
|
|
|
|
2016-09-13 18:53:14 +00:00
|
|
|
|
(void)line;
|
|
|
|
|
|
2013-08-09 17:19:26 +00:00
|
|
|
|
inp_fd = server->input_fd;
|
|
|
|
|
inp_fn = server->input_filename;
|
|
|
|
|
if (inp_fd == ASSUAN_INVALID_FD && !inp_fn)
|
|
|
|
|
return GPG_ERR_ASS_NO_INPUT;
|
|
|
|
|
|
|
|
|
|
err = server_data_obj (inp_fd, inp_fn, 0, server->input_enc, &inp_data,
|
|
|
|
|
&server->input_stream);
|
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
|
|
|
|
|
|
|
|
|
err = gt_identify (server->gt, inp_data);
|
|
|
|
|
|
|
|
|
|
gpgme_data_release (inp_data);
|
|
|
|
|
server_reset_fds (server);
|
|
|
|
|
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2014-04-10 11:01:00 +00:00
|
|
|
|
static const char hlp_spawn[] =
|
|
|
|
|
"SPAWN PGM [args]\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Run program PGM with stdin connected to the INPUT source;\n"
|
|
|
|
|
"stdout and stderr to the OUTPUT source.";
|
|
|
|
|
static gpg_error_t
|
|
|
|
|
cmd_spawn (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
struct server *server = assuan_get_pointer (ctx);
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
assuan_fd_t inp_fd;
|
|
|
|
|
char *inp_fn;
|
|
|
|
|
assuan_fd_t out_fd;
|
|
|
|
|
char *out_fn;
|
|
|
|
|
gpgme_data_t inp_data = NULL;
|
|
|
|
|
gpgme_data_t out_data = NULL;
|
|
|
|
|
|
|
|
|
|
inp_fd = server->input_fd;
|
|
|
|
|
inp_fn = server->input_filename;
|
|
|
|
|
out_fd = server->output_fd;
|
|
|
|
|
out_fn = server->output_filename;
|
|
|
|
|
if (inp_fd != ASSUAN_INVALID_FD || inp_fn)
|
|
|
|
|
{
|
|
|
|
|
err = server_data_obj (inp_fd, inp_fn, 0, server->input_enc, &inp_data,
|
|
|
|
|
&server->input_stream);
|
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
if (out_fd != ASSUAN_INVALID_FD || out_fn)
|
|
|
|
|
{
|
|
|
|
|
err = server_data_obj (out_fd, out_fn, 1, server->output_enc, &out_data,
|
|
|
|
|
&server->output_stream);
|
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
gpgme_data_release (inp_data);
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
err = gt_spawn (server->gt, line, inp_data, out_data);
|
|
|
|
|
|
|
|
|
|
gpgme_data_release (inp_data);
|
|
|
|
|
gpgme_data_release (out_data);
|
|
|
|
|
|
|
|
|
|
server_reset_fds (server);
|
|
|
|
|
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
2013-08-09 17:19:26 +00:00
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
/* Tell the assuan library about our commands. */
|
|
|
|
|
static gpg_error_t
|
|
|
|
|
register_commands (assuan_context_t ctx)
|
|
|
|
|
{
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
static struct {
|
|
|
|
|
const char *name;
|
2009-11-04 10:43:42 +00:00
|
|
|
|
assuan_handler_t handler;
|
|
|
|
|
const char * const help;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
} table[] = {
|
2010-02-16 19:37:51 +00:00
|
|
|
|
/* RESET, BYE are implicit. */
|
2009-11-04 10:43:42 +00:00
|
|
|
|
{ "VERSION", cmd_version, hlp_version },
|
2010-02-16 19:37:51 +00:00
|
|
|
|
/* TODO: Set engine info. */
|
gpgme-tool: add help messages for a number of commands.
* src/gpgme-tool.c (hlp_engine, hlp_sub_protocol, hlp_armor, hlp_textmode,
hlp_include_certs, hlp_keylist_mode, hlp_input, hlp_output, hlp_message,
hlp_recipient, hlp_signer, hlp_signers_clear, hlp_decrypt, hlp_decrypt_verify,
hlp_encrypt, hlp_sign_encrypt, hlp_sign, hlp_verify, hlp_import): New strings.
(hlp_protocol): Fix typo.
(register_commands): Add documentation strings.
(doc): Mention Assuan.
2012-03-27 19:10:02 +00:00
|
|
|
|
{ "ENGINE", cmd_engine, hlp_engine },
|
2009-11-04 10:43:42 +00:00
|
|
|
|
{ "PROTOCOL", cmd_protocol, hlp_protocol },
|
gpgme-tool: add help messages for a number of commands.
* src/gpgme-tool.c (hlp_engine, hlp_sub_protocol, hlp_armor, hlp_textmode,
hlp_include_certs, hlp_keylist_mode, hlp_input, hlp_output, hlp_message,
hlp_recipient, hlp_signer, hlp_signers_clear, hlp_decrypt, hlp_decrypt_verify,
hlp_encrypt, hlp_sign_encrypt, hlp_sign, hlp_verify, hlp_import): New strings.
(hlp_protocol): Fix typo.
(register_commands): Add documentation strings.
(doc): Mention Assuan.
2012-03-27 19:10:02 +00:00
|
|
|
|
{ "SUB_PROTOCOL", cmd_sub_protocol, hlp_sub_protocol },
|
2013-02-07 20:03:02 +00:00
|
|
|
|
{ "PINENTRY_MODE", cmd_pinentry_mode, hlp_pinentry_mode },
|
gpgme-tool: add help messages for a number of commands.
* src/gpgme-tool.c (hlp_engine, hlp_sub_protocol, hlp_armor, hlp_textmode,
hlp_include_certs, hlp_keylist_mode, hlp_input, hlp_output, hlp_message,
hlp_recipient, hlp_signer, hlp_signers_clear, hlp_decrypt, hlp_decrypt_verify,
hlp_encrypt, hlp_sign_encrypt, hlp_sign, hlp_verify, hlp_import): New strings.
(hlp_protocol): Fix typo.
(register_commands): Add documentation strings.
(doc): Mention Assuan.
2012-03-27 19:10:02 +00:00
|
|
|
|
{ "ARMOR", cmd_armor, hlp_armor },
|
|
|
|
|
{ "TEXTMODE", cmd_textmode, hlp_textmode },
|
|
|
|
|
{ "INCLUDE_CERTS", cmd_include_certs, hlp_include_certs },
|
|
|
|
|
{ "KEYLIST_MODE", cmd_keylist_mode, hlp_keylist_mode },
|
|
|
|
|
{ "INPUT", cmd_input, hlp_input },
|
|
|
|
|
{ "OUTPUT", cmd_output, hlp_output },
|
|
|
|
|
{ "MESSAGE", cmd_message, hlp_message },
|
|
|
|
|
{ "RECIPIENT", cmd_recipient, hlp_recipient },
|
|
|
|
|
{ "SIGNER", cmd_signer, hlp_signer },
|
|
|
|
|
{ "SIGNERS_CLEAR", cmd_signers_clear, hlp_signers_clear },
|
2010-02-16 19:37:51 +00:00
|
|
|
|
/* TODO: SIGNOTATION missing. */
|
|
|
|
|
/* TODO: Could add wait interface if we allow more than one context */
|
|
|
|
|
/* and add _START variants. */
|
|
|
|
|
/* TODO: Could add data interfaces if we allow multiple data objects. */
|
gpgme-tool: add help messages for a number of commands.
* src/gpgme-tool.c (hlp_engine, hlp_sub_protocol, hlp_armor, hlp_textmode,
hlp_include_certs, hlp_keylist_mode, hlp_input, hlp_output, hlp_message,
hlp_recipient, hlp_signer, hlp_signers_clear, hlp_decrypt, hlp_decrypt_verify,
hlp_encrypt, hlp_sign_encrypt, hlp_sign, hlp_verify, hlp_import): New strings.
(hlp_protocol): Fix typo.
(register_commands): Add documentation strings.
(doc): Mention Assuan.
2012-03-27 19:10:02 +00:00
|
|
|
|
{ "DECRYPT", cmd_decrypt, hlp_decrypt },
|
|
|
|
|
{ "DECRYPT_VERIFY", cmd_decrypt_verify, hlp_decrypt_verify },
|
|
|
|
|
{ "ENCRYPT", cmd_encrypt, hlp_encrypt },
|
|
|
|
|
{ "ENCRYPT_SIGN", cmd_sign_encrypt, hlp_sign_encrypt },
|
|
|
|
|
{ "SIGN_ENCRYPT", cmd_sign_encrypt, hlp_sign_encrypt },
|
|
|
|
|
{ "SIGN", cmd_sign, hlp_sign },
|
|
|
|
|
{ "VERIFY", cmd_verify, hlp_verify },
|
|
|
|
|
{ "IMPORT", cmd_import, hlp_import },
|
2010-02-16 20:07:03 +00:00
|
|
|
|
{ "EXPORT", cmd_export, hlp_export },
|
2009-10-30 14:21:08 +00:00
|
|
|
|
{ "GENKEY", cmd_genkey },
|
|
|
|
|
{ "DELETE", cmd_delete },
|
2010-02-16 19:37:51 +00:00
|
|
|
|
/* TODO: EDIT, CARD_EDIT (with INQUIRE) */
|
2010-12-08 09:55:00 +00:00
|
|
|
|
{ "KEYLIST", cmd_keylist, hlp_keylist },
|
|
|
|
|
{ "LISTKEYS", cmd_keylist, hlp_keylist },
|
2010-02-16 19:37:51 +00:00
|
|
|
|
/* TODO: TRUSTLIST, TRUSTLIST_EXT */
|
2009-12-01 11:21:47 +00:00
|
|
|
|
{ "GETAUDITLOG", cmd_getauditlog, hlp_getauditlog },
|
2010-02-16 19:37:51 +00:00
|
|
|
|
/* TODO: ASSUAN */
|
2009-10-30 14:21:08 +00:00
|
|
|
|
{ "VFS_MOUNT", cmd_vfs_mount },
|
|
|
|
|
{ "MOUNT", cmd_vfs_mount },
|
2009-11-03 19:15:35 +00:00
|
|
|
|
{ "VFS_CREATE", cmd_vfs_create },
|
|
|
|
|
{ "CREATE", cmd_vfs_create },
|
2010-02-16 19:37:51 +00:00
|
|
|
|
/* TODO: GPGCONF */
|
2009-10-30 14:21:08 +00:00
|
|
|
|
{ "RESULT", cmd_result },
|
|
|
|
|
{ "STRERROR", cmd_strerror },
|
|
|
|
|
{ "PUBKEY_ALGO_NAME", cmd_pubkey_algo_name },
|
|
|
|
|
{ "HASH_ALGO_NAME", cmd_hash_algo_name },
|
2010-01-05 17:36:53 +00:00
|
|
|
|
{ "PASSWD", cmd_passwd, hlp_passwd },
|
2013-08-09 17:19:26 +00:00
|
|
|
|
{ "IDENTIFY", cmd_identify, hlp_identify },
|
2014-04-10 11:01:00 +00:00
|
|
|
|
{ "SPAWN", cmd_spawn, hlp_spawn },
|
2009-10-30 14:21:08 +00:00
|
|
|
|
{ NULL }
|
|
|
|
|
};
|
|
|
|
|
int idx;
|
|
|
|
|
|
|
|
|
|
for (idx = 0; table[idx].name; idx++)
|
|
|
|
|
{
|
2009-11-04 10:43:42 +00:00
|
|
|
|
err = assuan_register_command (ctx, table[idx].name, table[idx].handler,
|
|
|
|
|
table[idx].help);
|
2009-10-30 14:21:08 +00:00
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
2012-09-25 13:29:49 +00:00
|
|
|
|
}
|
2009-10-30 14:21:08 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
gpgme_server (gpgme_tool_t gt)
|
|
|
|
|
{
|
|
|
|
|
gpg_error_t err;
|
2009-11-25 17:57:05 +00:00
|
|
|
|
assuan_fd_t filedes[2];
|
2009-10-30 14:21:08 +00:00
|
|
|
|
struct server server;
|
|
|
|
|
static const char hello[] = ("GPGME-Tool " VERSION " ready");
|
|
|
|
|
|
|
|
|
|
memset (&server, 0, sizeof (server));
|
2012-09-26 23:26:00 +00:00
|
|
|
|
server.input_fd = ASSUAN_INVALID_FD;
|
|
|
|
|
server.output_fd = ASSUAN_INVALID_FD;
|
2010-05-07 01:06:14 +00:00
|
|
|
|
server.message_fd = ASSUAN_INVALID_FD;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
server.input_enc = GPGME_DATA_ENCODING_NONE;
|
|
|
|
|
server.output_enc = GPGME_DATA_ENCODING_NONE;
|
|
|
|
|
server.message_enc = GPGME_DATA_ENCODING_NONE;
|
|
|
|
|
|
|
|
|
|
server.gt = gt;
|
|
|
|
|
gt->write_status = server_write_status;
|
|
|
|
|
gt->write_status_hook = &server;
|
2009-11-06 00:44:44 +00:00
|
|
|
|
gt->write_data = server_write_data;
|
|
|
|
|
gt->write_data_hook = &server;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
|
|
|
|
|
/* We use a pipe based server so that we can work from scripts.
|
|
|
|
|
assuan_init_pipe_server will automagically detect when we are
|
|
|
|
|
called with a socketpair and ignore FIELDES in this case. */
|
2010-06-10 17:29:43 +00:00
|
|
|
|
#ifdef HAVE_W32CE_SYSTEM
|
|
|
|
|
filedes[0] = ASSUAN_STDIN;
|
|
|
|
|
filedes[1] = ASSUAN_STDOUT;
|
|
|
|
|
#else
|
2009-11-25 17:57:05 +00:00
|
|
|
|
filedes[0] = assuan_fdopen (0);
|
|
|
|
|
filedes[1] = assuan_fdopen (1);
|
2010-06-10 17:29:43 +00:00
|
|
|
|
#endif
|
2009-10-30 14:21:08 +00:00
|
|
|
|
err = assuan_new (&server.assuan_ctx);
|
|
|
|
|
if (err)
|
|
|
|
|
log_error (1, err, "can't create assuan context");
|
|
|
|
|
|
|
|
|
|
assuan_set_pointer (server.assuan_ctx, &server);
|
|
|
|
|
|
|
|
|
|
err = assuan_init_pipe_server (server.assuan_ctx, filedes);
|
|
|
|
|
if (err)
|
|
|
|
|
log_error (1, err, "can't initialize assuan server");
|
|
|
|
|
err = register_commands (server.assuan_ctx);
|
|
|
|
|
if (err)
|
|
|
|
|
log_error (1, err, "can't register assuan commands");
|
|
|
|
|
assuan_set_hello_line (server.assuan_ctx, hello);
|
|
|
|
|
|
|
|
|
|
assuan_register_reset_notify (server.assuan_ctx, reset_notify);
|
|
|
|
|
|
|
|
|
|
#define DBG_ASSUAN 0
|
|
|
|
|
if (DBG_ASSUAN)
|
|
|
|
|
assuan_set_log_stream (server.assuan_ctx, log_stream);
|
|
|
|
|
|
|
|
|
|
for (;;)
|
|
|
|
|
{
|
|
|
|
|
err = assuan_accept (server.assuan_ctx);
|
|
|
|
|
if (err == -1)
|
|
|
|
|
break;
|
|
|
|
|
else if (err)
|
|
|
|
|
{
|
|
|
|
|
log_error (0, err, "assuan accept problem");
|
|
|
|
|
break;
|
|
|
|
|
}
|
2012-09-25 13:29:49 +00:00
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
err = assuan_process (server.assuan_ctx);
|
|
|
|
|
if (err)
|
|
|
|
|
log_error (0, err, "assuan processing failed");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
assuan_release (server.assuan_ctx);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2015-08-31 18:33:44 +00:00
|
|
|
|
static const char *
|
|
|
|
|
my_strusage( int level )
|
2009-10-30 14:21:08 +00:00
|
|
|
|
{
|
2015-08-31 18:33:44 +00:00
|
|
|
|
const char *p;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
|
2015-08-31 18:33:44 +00:00
|
|
|
|
switch (level)
|
2009-10-30 14:21:08 +00:00
|
|
|
|
{
|
2015-08-31 18:33:44 +00:00
|
|
|
|
case 11: p = "gpgme-tool"; break;
|
|
|
|
|
case 13: p = PACKAGE_VERSION; break;
|
|
|
|
|
case 14: p = "Copyright (C) 2015 g10 Code GmbH"; break;
|
|
|
|
|
case 19: p = "Please report bugs to <" PACKAGE_BUGREPORT ">.\n"; break;
|
|
|
|
|
case 1:
|
|
|
|
|
case 40:
|
|
|
|
|
p = "Usage: gpgme-tool [OPTIONS] [COMMANDS]";
|
2015-07-23 09:40:09 +00:00
|
|
|
|
break;
|
2015-08-31 18:33:44 +00:00
|
|
|
|
case 41:
|
|
|
|
|
p = "GPGME Tool -- Assuan server exposing GPGME operations\n";
|
2009-10-30 14:21:08 +00:00
|
|
|
|
break;
|
2015-08-31 18:33:44 +00:00
|
|
|
|
case 42:
|
|
|
|
|
p = "1"; /* Flag print 40 as part of 41. */
|
2009-10-30 14:21:08 +00:00
|
|
|
|
break;
|
2015-08-31 18:33:44 +00:00
|
|
|
|
default: p = NULL; break;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
}
|
2015-08-31 18:33:44 +00:00
|
|
|
|
return p;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
}
|
|
|
|
|
|
2015-08-31 18:33:44 +00:00
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
int
|
|
|
|
|
main (int argc, char *argv[])
|
|
|
|
|
{
|
2015-08-31 18:33:44 +00:00
|
|
|
|
static ARGPARSE_OPTS opts[] = {
|
|
|
|
|
ARGPARSE_c ('s', "server", "Server mode"),
|
|
|
|
|
ARGPARSE_s_s(501, "gpg-binary", "|FILE|Use FILE for the GPG backend"),
|
|
|
|
|
ARGPARSE_c (502, "lib-version", "Show library version"),
|
|
|
|
|
ARGPARSE_end()
|
|
|
|
|
};
|
|
|
|
|
ARGPARSE_ARGS pargs = { &argc, &argv, 0 };
|
|
|
|
|
enum { CMD_DEFAULT, CMD_SERVER, CMD_LIBVERSION } cmd = CMD_DEFAULT;
|
|
|
|
|
const char *gpg_binary = NULL;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
struct gpgme_tool gt;
|
2013-02-07 20:03:02 +00:00
|
|
|
|
gpg_error_t err;
|
2015-07-23 09:40:09 +00:00
|
|
|
|
int needgt = 1;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
|
2015-08-31 18:33:44 +00:00
|
|
|
|
set_strusage (my_strusage);
|
|
|
|
|
|
2010-05-12 17:40:08 +00:00
|
|
|
|
#ifdef HAVE_SETLOCALE
|
2009-10-30 14:21:08 +00:00
|
|
|
|
setlocale (LC_ALL, "");
|
2010-05-12 17:40:08 +00:00
|
|
|
|
#endif
|
2009-10-30 14:21:08 +00:00
|
|
|
|
gpgme_check_version (NULL);
|
2010-05-07 01:32:54 +00:00
|
|
|
|
#ifdef LC_CTYPE
|
2009-10-30 14:21:08 +00:00
|
|
|
|
gpgme_set_locale (NULL, LC_CTYPE, setlocale (LC_CTYPE, NULL));
|
2010-05-07 01:32:54 +00:00
|
|
|
|
#endif
|
2009-10-30 14:21:08 +00:00
|
|
|
|
#ifdef LC_MESSAGES
|
|
|
|
|
gpgme_set_locale (NULL, LC_MESSAGES, setlocale (LC_MESSAGES, NULL));
|
|
|
|
|
#endif
|
2010-05-07 01:32:54 +00:00
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
log_init ();
|
|
|
|
|
|
2015-08-31 18:33:44 +00:00
|
|
|
|
while (arg_parse (&pargs, opts))
|
|
|
|
|
{
|
|
|
|
|
switch (pargs.r_opt)
|
|
|
|
|
{
|
|
|
|
|
case 's': cmd = CMD_SERVER; break;
|
|
|
|
|
case 501: gpg_binary = pargs.r.ret_str; break;
|
|
|
|
|
case 502: cmd = CMD_LIBVERSION; break;
|
|
|
|
|
default:
|
|
|
|
|
pargs.err = ARGPARSE_PRINT_WARNING;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (cmd == CMD_LIBVERSION)
|
2015-07-23 09:40:09 +00:00
|
|
|
|
needgt = 0;
|
|
|
|
|
|
2015-08-31 18:33:44 +00:00
|
|
|
|
if (needgt && gpg_binary)
|
2013-02-07 20:03:02 +00:00
|
|
|
|
{
|
2015-08-31 18:33:44 +00:00
|
|
|
|
if (access (gpg_binary, X_OK))
|
2013-02-07 20:03:02 +00:00
|
|
|
|
err = gpg_error_from_syserror ();
|
|
|
|
|
else
|
|
|
|
|
err = gpgme_set_engine_info (GPGME_PROTOCOL_OpenPGP,
|
2015-08-31 18:33:44 +00:00
|
|
|
|
gpg_binary, NULL);
|
2013-02-07 20:03:02 +00:00
|
|
|
|
if (err)
|
|
|
|
|
log_error (1, err, "error witching OpenPGP engine to '%s'",
|
2015-08-31 18:33:44 +00:00
|
|
|
|
gpg_binary);
|
2013-02-07 20:03:02 +00:00
|
|
|
|
}
|
|
|
|
|
|
2015-07-23 09:40:09 +00:00
|
|
|
|
if (needgt)
|
|
|
|
|
gt_init (>);
|
2009-10-30 14:21:08 +00:00
|
|
|
|
|
2015-08-31 18:33:44 +00:00
|
|
|
|
switch (cmd)
|
2009-10-30 14:21:08 +00:00
|
|
|
|
{
|
|
|
|
|
case CMD_DEFAULT:
|
|
|
|
|
case CMD_SERVER:
|
|
|
|
|
gpgme_server (>);
|
|
|
|
|
break;
|
2015-07-23 09:40:09 +00:00
|
|
|
|
|
|
|
|
|
case CMD_LIBVERSION:
|
|
|
|
|
printf ("Version from header: %s (0x%06x)\n",
|
|
|
|
|
GPGME_VERSION, GPGME_VERSION_NUMBER);
|
|
|
|
|
printf ("Version from binary: %s\n", gpgme_check_version (NULL));
|
|
|
|
|
printf ("Copyright blurb ...:%s\n", gpgme_check_version ("\x01\x01"));
|
|
|
|
|
break;
|
2009-10-30 14:21:08 +00:00
|
|
|
|
}
|
|
|
|
|
|
2015-07-23 09:40:09 +00:00
|
|
|
|
if (needgt)
|
|
|
|
|
gpgme_release (gt.ctx);
|
2009-10-30 14:21:08 +00:00
|
|
|
|
|
2010-06-09 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (result_add_timestamp): Add missing NULL argument.
(result_sign_to_xml): Protect against NULL fingerprint.
(struct server): New members input_fd, input_filename,
input_stream output_fd, output_filename, output_stream,
message_filename, message_stream.
(server_reset_fds): Deallocate those.
(server_parse_fd): New function.
(server_data_obj): Take optional filename argument and direction
argument. Also take new argument to return a filestream that
needs to be closed after destroying the data object.
Change all callers, too.
(input_notify, output_notify): Removed.
(cmd_input, cmd_output): New functions.
(gpgme_server): Do not register input and output notifier.
(register_commands): Use cmd_input and cmd_output.
(cmd_message): Rewritten to use server_parse_fd.
(cmd_delete, cmd_keylist): Fix inverted option check.
(main) [HAVE_W32CE_SYSTEM]: Sleep a bit to work around bug in ssh.
2010-06-09 13:23:30 +00:00
|
|
|
|
#ifdef HAVE_W32CE_SYSTEM
|
|
|
|
|
/* Give the buggy ssh server time to flush the output buffers. */
|
|
|
|
|
Sleep (300);
|
|
|
|
|
#endif
|
|
|
|
|
|
2009-10-30 14:21:08 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|