
* data.c (gpgme_data_read): For GPGME_DATA_TYPE_NONE, return EOF instead an error. The following changes make it possible to flush an inbound data pipe before invoking a command handler: * posix-io.c (_gpgme_io_select): Accept new argument NONBLOCK to _gpgme_io_select. Set timeout of 0 if this is set. * w32-io.c (_gpgme_io_select): Likewise. * io.h: Add new argument NONBLOCK to _gpgme_io_select prototype. * wait.c (do_select): Add new argument to _gpgme_io_select invocation. * rungpg.h (_gpgme_gpg_set_command_handler): Add new argument linked_data to prototype. * engine.h (_gpgme_engine_set_command_handler): Likewise. * engine.c (_gpgme_engine_set_command_handler): Likewise. * passphrase.c (_gpgme_passphrase_start): Pass NULL as linked_data argument to _gpgme_engine_set_command_handler. * rungpg.c (struct gpg_object_s): New members linked_data and linked_idx in CMD. (_gpgme_gpg_new): Initialize those new members. (_gpgme_gpg_set_command_handler): Accept new argument linked_data. (build_argv): Handle linked_data in the same hack as cb_data. (read_status): If linked_data is in use, flush the pipe before activating the command handler. * gpgme.h: Add prototypes for gpgme_op_edit_start and gpgme_op_edit. The next changes export the status codes to the user: * decrypt.c (_gpgme_decrypt_status_handler): Likewise, also prefix all STATUS_ with GPGME_. * delete.c (delete_status_handler): Likewise. * decrypt-verify.c (decrypt_verify_status_handler): Likewise. * encrypt.c (_gpgme_encrypt_status_handler): Likewise. (_gpgme_encrypt_sym_status_handler): Likewise. * encrypt-sign.c (encrypt_sign_status_handler): Likewise. * engine-gpgsm.c (parse_status): Likewise. (gpgsm_status_handler): Likewise. (gpgsm_set_recipients): Likewise. * export.c (export_status_handler): Likewise. * genkey.c (genkey_status_handler): Likewise. * import.c (append_xml_impinfo): Likewise. (import_status_handler): Likewise. * keylist.c (keylist_status_handler): Likewise. * passphrase.c (_gpgme_passphrase_status_handler): Likewise. (command_handler): Likewise. * progress.c (_gpgme_progress_status_handler): Likewise. * sign.c (_gpgme_sign_status_handler): Likewise. * trustlist.c (trustlist_status_handler): Likewise. * verify.c (_gpgme_verify_status_handler): Likewise. * gpgme.h (GpgmeEditCb): New type. * rungpg.h (GpgStatusCode): Rename and move to ... * gpgme.h (GpgmeStatusCode): ... this and here. * Makefile.am (status-table.h): Run mkstatus on gpgme.h, not rungpg.h. * mkstatus: Prefix STATUS with GPGME_. * rungpg.h (GpgStatusHandler, GpgCommandHandler): Change type accordingly. * ops.h (_gpgme_verify_status_handler, _gpgme_decrypt_status_handler, _gpgme_sign_status_handler, _gpgme_encrypt_status_handler, _gpgme_passphrase_status_handler, _gpgme_progress_status_handler): Likewise. * rungpg.c (struct gpg_object_s): Likewise for CMD.code. These changes add an edit operation to GPGME: * context.h (struct gpgme_context_s): New member RESULT.edit. * ops.h: Add prototype for _gpgme_release_edit_result and _gpgme_passphrase_command_handler. * passphrase.c (command_handler): Make non-static and rename to ... (_gpgme_passphrase_command_handler): ... this. (_gpgme_passphrase_start): Use new name for command handler. * types.h: Add EditResult type. * gpgme.c (_gpgme_release_result): Release EDIT result. * edit.c: New file. * Makefile.am (libgpgme_la_SOURCES): Add edit.c. (libgpgme_la_LDADD): Rename to libgpgme_la_LIBADD, and include assuan_libobjs. (assuan_libobjs): New variable, set this instead libgpgme_la_LIBADD. * engine.h (_gpgme_engine_op_edit): New prototype. * engine.c (_gpgme_engine_op_edit): New function. * rungpg.h (_gpgme_gpg_op_edit): New prototype. * rungpg.c (_gpgme_gpg_op_edit): New function.
236 lines
6.0 KiB
C
236 lines
6.0 KiB
C
/* import.c - encrypt functions
|
|
* Copyright (C) 2000 Werner Koch (dd9jn)
|
|
* Copyright (C) 2001, 2002 g10 Code GmbH
|
|
*
|
|
* This file is part of GPGME.
|
|
*
|
|
* GPGME is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* 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 General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
|
*/
|
|
|
|
#include <config.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <assert.h>
|
|
|
|
#include "util.h"
|
|
#include "context.h"
|
|
#include "ops.h"
|
|
|
|
|
|
struct import_result_s
|
|
{
|
|
int any_imported;
|
|
GpgmeData xmlinfo;
|
|
};
|
|
|
|
|
|
void
|
|
_gpgme_release_import_result (ImportResult result)
|
|
{
|
|
if (!result)
|
|
return;
|
|
gpgme_data_release (result->xmlinfo);
|
|
xfree (result);
|
|
}
|
|
|
|
|
|
/* Parse the args and append the information to the XML structure in
|
|
the data buffer. With args of NULL the xml structure is
|
|
closed. */
|
|
static void
|
|
append_xml_impinfo (GpgmeData *rdh, GpgmeStatusCode code, char *args)
|
|
{
|
|
#define MAX_IMPORTED_FIELDS 14
|
|
static const char *const imported_fields[MAX_IMPORTED_FIELDS]
|
|
= { "keyid", "username", 0 };
|
|
static const char *const imported_fields_x509[MAX_IMPORTED_FIELDS]
|
|
= { "fpr", 0 };
|
|
static const char *const import_res_fields[MAX_IMPORTED_FIELDS]
|
|
= { "count", "no_user_id", "imported", "imported_rsa",
|
|
"unchanged", "n_uids", "n_subk", "n_sigs", "s_sigsn_revoc",
|
|
"sec_read", "sec_imported", "sec_dups", "skipped_new", 0 };
|
|
const char *field[MAX_IMPORTED_FIELDS];
|
|
const char *const *field_name = 0;
|
|
GpgmeData dh;
|
|
int i;
|
|
|
|
/* Verify that we can use the args. */
|
|
if (code != GPGME_STATUS_EOF)
|
|
{
|
|
if (!args)
|
|
return;
|
|
|
|
if (code == GPGME_STATUS_IMPORTED)
|
|
field_name = imported_fields;
|
|
else if (code == GPGME_STATUS_IMPORT_RES)
|
|
field_name = import_res_fields;
|
|
else
|
|
return;
|
|
|
|
for (i = 0; field_name[i]; i++)
|
|
{
|
|
field[i] = args;
|
|
if (field_name[i + 1])
|
|
{
|
|
args = strchr (args, ' ');
|
|
if (!args)
|
|
return; /* Invalid line. */
|
|
*args++ = '\0';
|
|
}
|
|
}
|
|
|
|
/* gpgsm does not print a useful user ID and uses a fingerprint
|
|
instead of the key ID. */
|
|
if (code == GPGME_STATUS_IMPORTED && field[0] && strlen (field[0]) > 16)
|
|
field_name = imported_fields_x509;
|
|
}
|
|
|
|
/* Initialize the data buffer if necessary. */
|
|
if (!*rdh)
|
|
{
|
|
if (gpgme_data_new (rdh))
|
|
return; /* FIXME: We are ignoring out-of-core. */
|
|
dh = *rdh;
|
|
_gpgme_data_append_string (dh, "<GnupgOperationInfo>\n");
|
|
}
|
|
else
|
|
dh = *rdh;
|
|
|
|
if (code == GPGME_STATUS_EOF)
|
|
{
|
|
/* Just close the XML containter. */
|
|
_gpgme_data_append_string (dh, "</GnupgOperationInfo>\n");
|
|
}
|
|
else
|
|
{
|
|
if (code == GPGME_STATUS_IMPORTED)
|
|
_gpgme_data_append_string (dh, " <import>\n");
|
|
else if (code == GPGME_STATUS_IMPORT_RES)
|
|
_gpgme_data_append_string (dh, " <importResult>\n");
|
|
|
|
for (i = 0; field_name[i]; i++)
|
|
{
|
|
_gpgme_data_append_string (dh, " <");
|
|
_gpgme_data_append_string (dh, field_name[i]);
|
|
_gpgme_data_append_string (dh, ">");
|
|
_gpgme_data_append_string (dh, field[i]);
|
|
_gpgme_data_append_string (dh, "</");
|
|
_gpgme_data_append_string (dh, field_name[i]);
|
|
_gpgme_data_append_string (dh, ">\n");
|
|
}
|
|
|
|
if (code == GPGME_STATUS_IMPORTED)
|
|
_gpgme_data_append_string (dh, " </import>\n");
|
|
else if (code == GPGME_STATUS_IMPORT_RES)
|
|
_gpgme_data_append_string (dh, " </importResult>\n");
|
|
}
|
|
}
|
|
|
|
|
|
static void
|
|
import_status_handler (GpgmeCtx ctx, GpgmeStatusCode code, char *args)
|
|
{
|
|
if (ctx->error)
|
|
return;
|
|
test_and_allocate_result (ctx, import);
|
|
|
|
switch (code)
|
|
{
|
|
case GPGME_STATUS_EOF:
|
|
if (ctx->result.import->xmlinfo)
|
|
{
|
|
append_xml_impinfo (&ctx->result.import->xmlinfo, code, NULL);
|
|
_gpgme_set_op_info (ctx, ctx->result.import->xmlinfo);
|
|
ctx->result.import->xmlinfo = NULL;
|
|
}
|
|
/* XXX Calculate error value. */
|
|
break;
|
|
|
|
case GPGME_STATUS_IMPORTED:
|
|
ctx->result.import->any_imported = 1;
|
|
case GPGME_STATUS_IMPORT_RES:
|
|
append_xml_impinfo (&ctx->result.import->xmlinfo, code, args);
|
|
break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
|
|
static GpgmeError
|
|
_gpgme_op_import_start (GpgmeCtx ctx, int synchronous, GpgmeData keydata)
|
|
{
|
|
int err = 0;
|
|
|
|
err = _gpgme_op_reset (ctx, synchronous);
|
|
if (err)
|
|
goto leave;
|
|
|
|
/* Check the supplied data */
|
|
if (gpgme_data_get_type (keydata) == GPGME_DATA_TYPE_NONE)
|
|
{
|
|
err = mk_error (No_Data);
|
|
goto leave;
|
|
}
|
|
_gpgme_data_set_mode (keydata, GPGME_DATA_MODE_OUT);
|
|
|
|
_gpgme_engine_set_status_handler (ctx->engine, import_status_handler, ctx);
|
|
_gpgme_engine_set_verbosity (ctx->engine, ctx->verbosity);
|
|
|
|
_gpgme_engine_op_import (ctx->engine, keydata);
|
|
|
|
if (!err)
|
|
err = _gpgme_engine_start (ctx->engine, ctx);
|
|
|
|
leave:
|
|
if (err)
|
|
{
|
|
ctx->pending = 0;
|
|
_gpgme_engine_release (ctx->engine);
|
|
ctx->engine = NULL;
|
|
}
|
|
return err;
|
|
}
|
|
|
|
|
|
GpgmeError
|
|
gpgme_op_import_start (GpgmeCtx ctx, GpgmeData keydata)
|
|
{
|
|
return _gpgme_op_import_start (ctx, 0, keydata);
|
|
}
|
|
|
|
/**
|
|
* gpgme_op_import:
|
|
* @c: Context
|
|
* @keydata: Data object
|
|
*
|
|
* Import all key material from @keydata into the key database.
|
|
*
|
|
* Return value: 0 on success or an error code.
|
|
**/
|
|
GpgmeError
|
|
gpgme_op_import (GpgmeCtx ctx, GpgmeData keydata)
|
|
{
|
|
GpgmeError err = _gpgme_op_import_start (ctx, 1, keydata);
|
|
if (!err)
|
|
err = _gpgme_wait_one (ctx);
|
|
if (!err && (!ctx->result.import || !ctx->result.import->any_imported))
|
|
err = -1; /* Nothing at all imported. */
|
|
return err;
|
|
}
|
|
|