5b75138331
* engine-gpgsm.c (_gpgme_gpgsm_start): Move the code that sets the close notification for the status fd to ... (_gpgme_gpgsm_new): ... here. * wait.h: Include "sema.h". Remove prototypes of _gpgme_remove_proc_from_wait_queue and _gpgme_register_pipe_handler. Add prototypes of _gpgme_fd_table_init, _gpgme_fd_table_deinit, _gpgme_fd_table_put, _gpgme_add_io_cb, _gpgme_remove_io_cb, _gpgme_wait_event_cb and _gpgme_wait_one.. * wait.c: Remove global variables PROC_QUEUE, PROC_QUEUE_LOCK, FD_TABLE_SIZE, FD_TABLE, FD_TABLE_LOCK. New global variables FDT_GLOBAL, CTX_DONE_LIST, CTX_DONE_LIST_SIZE, CTX_DONE_LIST_LENGTH and CTX_DONE_LIST_LOCK. Remove struct proc_s. Replace struct wait_item_s. (_gpgme_fd_table_init): New function. (_gpgme_fd_table_deinit): Likewise. (_gpgme_fd_table_put): Likewise. (set_process_done): Remove function. (do_select): Take argument FDT. Use that to decide which fds to select on. (_gpgme_remove_proc_from_wait_queue): Remove function. (_gpgme_wait_event_cb): New function. (_gpgme_wait_one): Likewise. (_gpgme_register_pipe_hanldler): Remove function. (_gpgme_add_io_cb): New function. (_gpgme_remove_io_cb): Likewise. (_gpgme_freeze_fd): Remove function. (_gpgme_thaw_fd): Remove function. * rungpg.c (struct fd_data_map_s): Add new member TAG. (struct gpg_object_s): Likewise for STATUS and COLON. Add member IDX to CMD. Add new member IO_CBS. (close_notify_handler): New variables POSSIBLY_DONE and NOT_DONE. For each I/O callback, check if it should be unregistered. If all callbacks have been unregistered, trigger GPGME_EVENT_DONE. Remove member RUNNING. (_gpgme_gpg_new): Initialize new members. (_gpgme_gpg_release): Check PID not RUNNING. Don't call _gpgme_remove_proc_from_wait_queue. Close GPG->CMD.FD if set. (build_argv): Store away the index instead the file descriptor for CMD. (_gpgme_gpg_add_io_cb): New function. (_gpgme_gpg_spawn): Use _gpgme_gpg_add_io_cb to register IO callbacks. (gpg_status_handler): Change return type to void, remove PID argument, close filedescriptor if EOF or error occurs. (read_status): Use _gpgme_gpg_add_io_cb instead _gpgme_thaw_fd. Use IO_CBS->remove instead _gpgme_freeze_fd. (gpg_colon_line_handler): Change return type to void, remove PID argument, close filedescriptor if EOF or error occurs. (command_cb): Use IO_CBS->remove instead _gpgme_freeze_fd. (_gpgme_gpg_set_io_cbs): New function. * rungpg.h (_gpgme_gpg_set_io_cbs): Prototype for _gpgme_gpg_set_io_cbs. * gpgme.h (GpgmeIOCb): New type. (GpgmeRegisterIOCb): Likewise. (GpgmeRemoveIOCb): Likewise. (GpgmeEventIO): Likewise. (GpgmeEventIOCb): Likewise. (struct GpgmeIOCbs): New structure to hold I/O callbacks. (gpgme_set_op_io_cbs): New prototype. (gpgme_get_op_io_cbs): Likewise. * ops.h: New prototype for _gpgme_op_event_cb. Remove prototypes for _gpgme_freeze_fd and _gpgme_thaw_fd. Remove PID argument from _gpgme_data_inbound_handler and _gpgme_data_outbound_handler prototype. Add prototype for _gpgme_op_reset. Add synchronous argument to _gpgme_decrypt_start prototype. * io.h: Beautification. * gpgme.c: Include "wait.h". (gpgme_new): Initialize FDT. (gpgme_set_io_cbs): New function. (gpgme_get_io_cbs): Likewise. (_gpgme_op_event_cb): Likewise. * data.c (_gpgme_data_inbound_handler): Change return type to void. Drop PID argument. Close FD on error and EOF. (write_mem_data): Don't close FD here ... (write_cb_data): ... or here ... (_gpgme_data_outbound_handler): ... but here. Change return type to void. Drop PID argument. * context.h: Include "wait.h". (struct gpgme_context_s): New members FDT and IO_CBS. * op-support.c: New file. * Makefile.am (libgpgme_la_SOURCES): Add op-support.c. * ops.h: Add prototype for _gpgme_op_reset(). * decrypt.c (_gpgme_decrypt_start): New argument SYNCHRONOUS. Use _gpgme_op_reset. (gpgme_op_decrypt_start): Add synchronous argument. (gpgme_op_decrypt): Likewise. Use _gpgme_wait_one instead gpgme_wait. * delete.c (gpgme_op_delete_start): Rename to ... (_gpgme_op_delete_start): ... this. New argument SYNCHRONOUS. Use _gpgme_op_reset. Make function static. (gpgme_op_delete_start): Just a wrapper around _gpgme_op_delete_start now. (gpgme_op_delete): Add synchronous argument. Use _gpgme_wait_one instead gpgme_wait. * encrypt.c: Include "wait.h". (ggpgme_op_encrypt_start): Rename to ... (_gpgme_op_encrypt_start): ... this. New argument SYNCHRONOUS. Use _gpgme_op_reset. Make function static. (gpgme_op_encrypt_start): Just a wrapper around _gpgme_op_encrypt_start now. (gpgme_op_encrypt): Add synchronous argument. Use _gpgme_wait_one instead gpgme_wait. * encrypt_sign.c (gpgme_op_encrypt_sign_start): Rename to ... (_gpgme_op_encrypt_sign_start): ... this. New argument SYNCHRONOUS. Use _gpgme_op_reset. Make function static. (gpgme_op_encrypt_sign_start): Just a wrapper around _gpgme_op_encrypt_sign_start now. (gpgme_op_encrypt_sign): Add synchronous argument. Use _gpgme_wait_one instead gpgme_wait. * export.c (gpgme_op_export_start): Rename to ... (_gpgme_op_export_start): ... this. New argument SYNCHRONOUS. Use _gpgme_op_reset. Make function static. (gpgme_op_export_start): Just a wrapper around _gpgme_op_export_start now. (gpgme_op_export): Add synchronous argument. Use _gpgme_wait_one instead gpgme_wait. * genkey.c (gpgme_op_genkey_start): Rename to ... (_gpgme_op_genkey_start): ... this. New argument SYNCHRONOUS. Use _gpgme_op_reset. Make function static. (gpgme_op_genkey_start): Just a wrapper around _gpgme_op_genkey_start now. (gpgme_op_genkey): Add synchronous argument. Use _gpgme_wait_one instead gpgme_wait. * import.c (gpgme_op_import_start): Rename to ... (_gpgme_op_import_start): ... this. New argument SYNCHRONOUS. Use _gpgme_op_reset. Make function static. (gpgme_op_import_start): Just a wrapper around _gpgme_op_import_start now. (gpgme_op_import): Add synchronous argument. Use _gpgme_wait_one instead gpgme_wait. * keylist.c (gpgme_op_keylist_start): Use _gpgme_op_reset. (gpgme_op_keylist_ext_start): Likewise. * sign.c (gpgme_op_sign_start): Rename to ... (_gpgme_op_sign_start): ... this. New argument SYNCHRONOUS. Use _gpgme_op_reset. Make function static. (gpgme_op_sign_start): Just a wrapper around _gpgme_op_sign_start now. (gpgme_op_sign): Add synchronous argument. Use _gpgme_wait_one instead gpgme_wait. * trustlist.c (gpgme_op_trustlist_start): Use _gpgme_op_reset. * verify.c (gpgme_op_verify_start): Rename to ... (_gpgme_op_verify_start): ... this. New argument SYNCHRONOUS. Use _gpgme_op_reset. Make function static. (gpgme_op_verify_start): Just a wrapper around _gpgme_op_verify_start now. (gpgme_op_verify): Add synchronous argument. Use _gpgme_wait_one instead gpgme_wait. * engine-gpgsm.c (iocb_data_t): New type. (struct gpgsm_object_s): New member status_cb. Replace input_fd and input_data with input_cb. Replace output_fd and output_data with output_cb. Replace message_fd and message_data with message_cb. New member io_cbs. (_gpgme_gpgsm_new): Initialize all new members (and drop the old ones). (close_notify_handler): New variable POSSIBLY_DONE. For each I/O callback, check if it should be unregistered. If all callbacks have been unregistered, trigger GPGME_EVENT_DONE. (_gpgme_gpgsm_release): Remove variable PID. Use new variable names to close the file descriptors. (_gpgme_gpgsm_op_decrypt): Use new variable names, (_gpgme_gpgsm_op_encrypt): Likewise. (_gpgme_gpgsm_op_genkey): Likewise. (_gpgme_gpgsm_op_import): Likewise. (_gpgme_gpgsm_op_keylist): Likewise. (_gpgme_gpgsm_op_keylist_ext): Likewise. (_gpgme_gpgsm_op_sign): Likewise. (_gpgme_gpgsm_op_verify): Likewise. (gpgsm_status_handler): Drop argument PID. Change return type to void. Close status pipe before returning because of EOF or error. (_gpgme_gpgsm_add_io_cb): New function. (_gpgme_gpgsm_start): Use _gpgme_gpgsm_add_io_cb to register callback function. (_gpgme_gpgsm_set_io_cbs): New function. * engine-gpgsm.h: New prototype for _gpgme_gpgsm_set_io_cbs. * engine.c (_gpgme_engine_set_io_cbs): New function. * engine.h: New prototype for _gpgme_engine_set_io_cbs.
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, GpgStatusCode code, char *args)
|
|
{
|
|
_gpgme_progress_status_handler (ctx, code, args);
|
|
|
|
if (ctx->error)
|
|
return;
|
|
test_and_allocate_result (ctx, genkey);
|
|
|
|
switch (code)
|
|
{
|
|
case 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 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;
|
|
}
|