
* 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.
226 lines
5.8 KiB
C
226 lines
5.8 KiB
C
/* genkey.c - key generation
|
|
* 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 genkey_result_s
|
|
{
|
|
int created_primary : 1;
|
|
int created_sub : 1;
|
|
};
|
|
|
|
|
|
void
|
|
_gpgme_release_genkey_result (GenKeyResult result)
|
|
{
|
|
if (!result)
|
|
return;
|
|
xfree (result);
|
|
}
|
|
|
|
static void
|
|
genkey_status_handler (GpgmeCtx ctx, GpgmeStatusCode code, char *args)
|
|
{
|
|
_gpgme_progress_status_handler (ctx, code, args);
|
|
|
|
if (ctx->error)
|
|
return;
|
|
test_and_allocate_result (ctx, genkey);
|
|
|
|
switch (code)
|
|
{
|
|
case GPGME_STATUS_KEY_CREATED:
|
|
if (args && *args)
|
|
{
|
|
if (*args == 'B' || *args == 'P')
|
|
ctx->result.genkey->created_primary = 1;
|
|
if (*args == 'B' || *args == 'S')
|
|
ctx->result.genkey->created_sub = 1;
|
|
}
|
|
break;
|
|
|
|
case GPGME_STATUS_EOF:
|
|
/* FIXME: Should return some more useful error value. */
|
|
if (!ctx->result.genkey->created_primary
|
|
&& !ctx->result.genkey->created_sub)
|
|
ctx->error = mk_error (General_Error);
|
|
break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
static GpgmeError
|
|
_gpgme_op_genkey_start (GpgmeCtx ctx, int synchronous, const char *parms,
|
|
GpgmeData pubkey, GpgmeData seckey)
|
|
{
|
|
int err = 0;
|
|
const char *s, *s2, *sx;
|
|
|
|
err = _gpgme_op_reset (ctx, synchronous);
|
|
if (err)
|
|
goto leave;
|
|
|
|
gpgme_data_release (ctx->help_data_1);
|
|
ctx->help_data_1 = NULL;
|
|
|
|
if (!pubkey && !seckey)
|
|
; /* okay: Add key to the keyrings */
|
|
else if (pubkey && gpgme_data_get_type (pubkey) != GPGME_DATA_TYPE_NONE)
|
|
{
|
|
err = mk_error (Invalid_Value);
|
|
goto leave;
|
|
}
|
|
else if (seckey && gpgme_data_get_type (seckey) != GPGME_DATA_TYPE_NONE)
|
|
{
|
|
err = mk_error (Invalid_Value);
|
|
goto leave;
|
|
}
|
|
|
|
if (pubkey)
|
|
/* FIXME: Need some more things here. */
|
|
_gpgme_data_set_mode (pubkey, GPGME_DATA_MODE_IN);
|
|
|
|
if (seckey)
|
|
/* FIXME: Need some more things here. */
|
|
_gpgme_data_set_mode (seckey, GPGME_DATA_MODE_IN);
|
|
|
|
if ((parms = strstr (parms, "<GnupgKeyParms "))
|
|
&& (s = strchr (parms, '>'))
|
|
&& (sx = strstr (parms, "format=\"internal\""))
|
|
&& sx < s
|
|
&& (s2 = strstr (s+1, "</GnupgKeyParms>")))
|
|
{
|
|
/* FIXME: Check that there are no control statements inside. */
|
|
s++; /* Skip '>'. */
|
|
while (*s == '\n')
|
|
s++;
|
|
err = gpgme_data_new_from_mem (&ctx->help_data_1, s, s2-s, 1);
|
|
}
|
|
else
|
|
err = mk_error (Invalid_Value);
|
|
|
|
if (err)
|
|
goto leave;
|
|
|
|
_gpgme_data_set_mode (ctx->help_data_1, GPGME_DATA_MODE_OUT);
|
|
|
|
_gpgme_engine_set_status_handler (ctx->engine, genkey_status_handler, ctx);
|
|
_gpgme_engine_set_verbosity (ctx->engine, ctx->verbosity);
|
|
|
|
err = _gpgme_engine_op_genkey (ctx->engine, ctx->help_data_1, ctx->use_armor,
|
|
pubkey, seckey);
|
|
|
|
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;
|
|
}
|
|
|
|
|
|
/**
|
|
* gpgme_op_genkey:
|
|
* @c: the context
|
|
* @parms: XML string with the key parameters
|
|
* @pubkey: Returns the public key
|
|
* @seckey: Returns the secret key
|
|
*
|
|
* Generate a new key and store the key in the default keyrings if
|
|
* both @pubkey and @seckey are NULL. If @pubkey and @seckey are
|
|
* given, the newly created key will be returned in these data
|
|
* objects. This function just starts the gheneration and does not
|
|
* wait for completion.
|
|
*
|
|
* Here is an example on how @parms should be formatted; for deatils
|
|
* see the file doc/DETAILS from the GnuPG distribution.
|
|
*
|
|
* <literal>
|
|
* <![CDATA[
|
|
* <GnupgKeyParms format="internal">
|
|
* Key-Type: DSA
|
|
* Key-Length: 1024
|
|
* Subkey-Type: ELG-E
|
|
* Subkey-Length: 1024
|
|
* Name-Real: Joe Tester
|
|
* Name-Comment: with stupid passphrase
|
|
* Name-Email: joe@foo.bar
|
|
* Expire-Date: 0
|
|
* Passphrase: abc
|
|
* </GnupgKeyParms>
|
|
* ]]>
|
|
* </literal>
|
|
*
|
|
* Strings should be given in UTF-8 encoding. The format we support
|
|
* for now is only "internal". The content of the
|
|
* <GnupgKeyParms> container is passed verbatim to GnuPG.
|
|
* Control statements are not allowed.
|
|
*
|
|
* Return value: 0 for success or an error code
|
|
**/
|
|
GpgmeError
|
|
gpgme_op_genkey_start (GpgmeCtx ctx, const char *parms,
|
|
GpgmeData pubkey, GpgmeData seckey)
|
|
{
|
|
return _gpgme_op_genkey_start (ctx, 0, parms, pubkey, seckey);
|
|
}
|
|
|
|
|
|
/**
|
|
* gpgme_op_genkey:
|
|
* @c: the context
|
|
* @parms: XML string with the key parameters
|
|
* @pubkey: Returns the public key
|
|
* @seckey: Returns the secret key
|
|
*
|
|
* Generate a new key and store the key in the default keyrings if both
|
|
* @pubkey and @seckey are NULL. If @pubkey and @seckey are given, the newly
|
|
* created key will be returned in these data objects.
|
|
* See gpgme_op_genkey_start() for a description of @parms.
|
|
*
|
|
* Return value: 0 for success or an error code
|
|
**/
|
|
GpgmeError
|
|
gpgme_op_genkey (GpgmeCtx ctx, const char *parms,
|
|
GpgmeData pubkey, GpgmeData seckey)
|
|
{
|
|
GpgmeError err = _gpgme_op_genkey_start (ctx, 1, parms, pubkey, seckey);
|
|
if (!err)
|
|
err = _gpgme_wait_one (ctx);
|
|
return err;
|
|
}
|