c22974f99f
2002-02-26 Marcus Brinkmann <marcus@g10code.de> * gpgme.texi (Encrypting a Plaintext): Document gpgme_op_encrypt_sign and gpgme_op_encrypt_sign_start. gpgme/ 2002-02-25 Marcus Brinkmann <marcus@g10code.de> * engine.c (_gpgme_engine_op_encrypt_sign): New function. * engine.h (_gpgme_engine_op_encrypt_sign): New prototype. * rungpg.c (_gpgme_append_gpg_args_from_signers): New function. (_gpgme_gpg_op_sign): Use that new function. (_gpgme_gpg_op_encrypt_sign): New function. * rungpg.h (_gpgme_gpg_op_encrypt_sign): New prototype. * gpgme.h (gpgme_op_encrypt_sign_start): New prototype. (gpgme_op_encrypt_sign): Likewise. * Makefile.am (libgpgme_la_SOURCES): Add encrypt-sign.c. * ops.h (_gpgme_encrypt_status_handler): Add prototype. (_gpgme_sign_status_handler): Add prototype. * sign.c (sign_status_handler): Rename to ... (_gpgme_sign_status_handler): ... this and make non-static. * encrypt.c (encrypt_status_handler): Rename to ... (_gpgme_encrypt_status_handler): ... this and make non-static. * encrypt.c (gpgme_op_encrypt_start): Use new status handler name. * sign.c (gpgme_op_sign_start): Likewise. tests/ 2002-02-26 Marcus Brinkmann <marcus@g10code.de> * gpg/t-encrypt-sign.c: New file. * gpg/Makefile.am (TESTS): Add t-encrypt-sign.
620 lines
14 KiB
C
620 lines
14 KiB
C
/* engine.c
|
|
* Copyright (C) 2000 Werner Koch (dd9jn)
|
|
* Copyright (C) 2001 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
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include <config.h>
|
|
#endif
|
|
#include <time.h>
|
|
#include <sys/types.h>
|
|
#include <string.h>
|
|
#include <assert.h>
|
|
|
|
#include "gpgme.h"
|
|
#include "util.h"
|
|
#include "sema.h"
|
|
#include "io.h"
|
|
|
|
#include "engine.h"
|
|
#include "rungpg.h"
|
|
#include "engine-gpgsm.h"
|
|
|
|
struct engine_object_s
|
|
{
|
|
GpgmeProtocol protocol;
|
|
|
|
const char *path;
|
|
const char *version;
|
|
|
|
union
|
|
{
|
|
GpgObject gpg;
|
|
GpgsmObject gpgsm;
|
|
} engine;
|
|
};
|
|
|
|
struct reap_s
|
|
{
|
|
struct reap_s *next;
|
|
int pid;
|
|
time_t entered;
|
|
int term_send;
|
|
};
|
|
|
|
static struct reap_s *reap_list;
|
|
DEFINE_STATIC_LOCK (reap_list_lock);
|
|
|
|
/* Get the path of the engine for PROTOCOL. */
|
|
const char *
|
|
_gpgme_engine_get_path (GpgmeProtocol proto)
|
|
{
|
|
switch (proto)
|
|
{
|
|
case GPGME_PROTOCOL_OpenPGP:
|
|
return _gpgme_get_gpg_path ();
|
|
case GPGME_PROTOCOL_CMS:
|
|
return _gpgme_get_gpgsm_path ();
|
|
default:
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
/* Get the version number of the engine for PROTOCOL. */
|
|
const char *
|
|
_gpgme_engine_get_version (GpgmeProtocol proto)
|
|
{
|
|
switch (proto)
|
|
{
|
|
case GPGME_PROTOCOL_OpenPGP:
|
|
return _gpgme_gpg_get_version ();
|
|
case GPGME_PROTOCOL_CMS:
|
|
return _gpgme_gpgsm_get_version ();
|
|
default:
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
GpgmeError
|
|
gpgme_engine_check_version (GpgmeProtocol proto)
|
|
{
|
|
switch (proto)
|
|
{
|
|
case GPGME_PROTOCOL_OpenPGP:
|
|
return _gpgme_gpg_check_version ();
|
|
case GPGME_PROTOCOL_CMS:
|
|
return _gpgme_gpgsm_check_version ();
|
|
default:
|
|
return mk_error (Invalid_Value);
|
|
}
|
|
}
|
|
|
|
const char *
|
|
_gpgme_engine_get_info (GpgmeProtocol proto)
|
|
{
|
|
static const char fmt[] = " <engine>\n"
|
|
" <protocol>%s</protocol>\n"
|
|
" <version>%s</version>\n"
|
|
" <path>%s</path>\n"
|
|
" </engine>\n";
|
|
static const char *const strproto[3] = { "OpenPGP", "CMS", NULL };
|
|
static const char *engine_info[3]; /* FIXME: MAX_PROTO + 1*/
|
|
const char *path;
|
|
const char *version;
|
|
char *info;
|
|
|
|
if (proto > 2 /* FIXME MAX_PROTO */ || !strproto[proto])
|
|
return NULL;
|
|
|
|
/* FIXME: Make sure that only one instance does run. */
|
|
if (engine_info[proto])
|
|
return engine_info[proto];
|
|
|
|
path = _gpgme_engine_get_path (proto);
|
|
version = _gpgme_engine_get_version (proto);
|
|
|
|
if (!path || !version)
|
|
return NULL;
|
|
|
|
info = xtrymalloc (strlen(fmt) + strlen(strproto[proto]) + strlen(path)
|
|
+ strlen (version) + 1);
|
|
if (!info)
|
|
info = " <engine>\n"
|
|
" <error>Out of core</error>\n"
|
|
" </engine>";
|
|
else
|
|
sprintf (info, fmt, strproto[proto], version, path);
|
|
engine_info[proto] = info;
|
|
|
|
return engine_info[proto];
|
|
}
|
|
|
|
GpgmeError
|
|
_gpgme_engine_new (GpgmeProtocol proto, EngineObject *r_engine)
|
|
{
|
|
EngineObject engine;
|
|
GpgmeError err = 0;
|
|
|
|
engine = xtrycalloc (1, sizeof *engine);
|
|
if (!engine)
|
|
{
|
|
err = mk_error (Out_Of_Core);
|
|
goto leave;
|
|
}
|
|
|
|
engine->protocol = proto;
|
|
switch (proto)
|
|
{
|
|
case GPGME_PROTOCOL_OpenPGP:
|
|
err =_gpgme_gpg_new (&engine->engine.gpg);
|
|
break;
|
|
case GPGME_PROTOCOL_CMS:
|
|
err = _gpgme_gpgsm_new (&engine->engine.gpgsm);
|
|
if (err)
|
|
goto leave;
|
|
break;
|
|
default:
|
|
err = mk_error (Invalid_Value);
|
|
}
|
|
if (err)
|
|
goto leave;
|
|
|
|
engine->path = _gpgme_engine_get_path (proto);
|
|
engine->version = _gpgme_engine_get_version (proto);
|
|
|
|
if (!engine->path || !engine->version)
|
|
{
|
|
err = mk_error (Invalid_Engine);
|
|
goto leave;
|
|
}
|
|
|
|
leave:
|
|
if (err)
|
|
_gpgme_engine_release (engine);
|
|
else
|
|
*r_engine = engine;
|
|
|
|
return err;
|
|
}
|
|
|
|
void
|
|
_gpgme_engine_release (EngineObject engine)
|
|
{
|
|
if (!engine)
|
|
return;
|
|
|
|
switch (engine->protocol)
|
|
{
|
|
case GPGME_PROTOCOL_OpenPGP:
|
|
_gpgme_gpg_release (engine->engine.gpg);
|
|
break;
|
|
case GPGME_PROTOCOL_CMS:
|
|
_gpgme_gpgsm_release (engine->engine.gpgsm);
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
xfree (engine);
|
|
}
|
|
|
|
|
|
void
|
|
_gpgme_engine_set_verbosity (EngineObject engine, int verbosity)
|
|
{
|
|
if (!engine)
|
|
return;
|
|
|
|
switch (engine->protocol)
|
|
{
|
|
case GPGME_PROTOCOL_OpenPGP:
|
|
while (verbosity-- > 0)
|
|
_gpgme_gpg_add_arg (engine->engine.gpg, "--verbose");
|
|
break;
|
|
case GPGME_PROTOCOL_CMS:
|
|
/* FIXME */
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
void
|
|
_gpgme_engine_set_status_handler (EngineObject engine,
|
|
GpgStatusHandler fnc, void *fnc_value)
|
|
{
|
|
if (!engine)
|
|
return;
|
|
|
|
switch (engine->protocol)
|
|
{
|
|
case GPGME_PROTOCOL_OpenPGP:
|
|
_gpgme_gpg_set_status_handler (engine->engine.gpg, fnc, fnc_value);
|
|
break;
|
|
case GPGME_PROTOCOL_CMS:
|
|
_gpgme_gpgsm_set_status_handler (engine->engine.gpgsm, fnc, fnc_value);
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
GpgmeError
|
|
_gpgme_engine_set_command_handler (EngineObject engine,
|
|
GpgCommandHandler fnc, void *fnc_value)
|
|
{
|
|
if (!engine)
|
|
return mk_error (Invalid_Value);
|
|
|
|
switch (engine->protocol)
|
|
{
|
|
case GPGME_PROTOCOL_OpenPGP:
|
|
return _gpgme_gpg_set_command_handler (engine->engine.gpg, fnc, fnc_value);
|
|
case GPGME_PROTOCOL_CMS:
|
|
/* FIXME */
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
GpgmeError _gpgme_engine_set_colon_line_handler (EngineObject engine,
|
|
GpgColonLineHandler fnc,
|
|
void *fnc_value)
|
|
{
|
|
if (!engine)
|
|
return mk_error (Invalid_Value);
|
|
|
|
switch (engine->protocol)
|
|
{
|
|
case GPGME_PROTOCOL_OpenPGP:
|
|
return _gpgme_gpg_set_colon_line_handler (engine->engine.gpg,
|
|
fnc, fnc_value);
|
|
case GPGME_PROTOCOL_CMS:
|
|
_gpgme_gpgsm_set_colon_line_handler (engine->engine.gpgsm,
|
|
fnc, fnc_value);
|
|
break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
GpgmeError
|
|
_gpgme_engine_op_decrypt (EngineObject engine, GpgmeData ciph, GpgmeData plain)
|
|
{
|
|
if (!engine)
|
|
return mk_error (Invalid_Value);
|
|
|
|
switch (engine->protocol)
|
|
{
|
|
case GPGME_PROTOCOL_OpenPGP:
|
|
return _gpgme_gpg_op_decrypt (engine->engine.gpg, ciph, plain);
|
|
case GPGME_PROTOCOL_CMS:
|
|
return _gpgme_gpgsm_op_decrypt (engine->engine.gpgsm, ciph, plain);
|
|
default:
|
|
break;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
GpgmeError
|
|
_gpgme_engine_op_delete (EngineObject engine, GpgmeKey key, int allow_secret)
|
|
{
|
|
if (!engine)
|
|
return mk_error (Invalid_Value);
|
|
|
|
switch (engine->protocol)
|
|
{
|
|
case GPGME_PROTOCOL_OpenPGP:
|
|
return _gpgme_gpg_op_delete (engine->engine.gpg, key, allow_secret);
|
|
case GPGME_PROTOCOL_CMS:
|
|
return _gpgme_gpgsm_op_delete (engine->engine.gpgsm, key, allow_secret);
|
|
default:
|
|
break;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
GpgmeError
|
|
_gpgme_engine_op_encrypt (EngineObject engine, GpgmeRecipients recp,
|
|
GpgmeData plain, GpgmeData ciph, int use_armor)
|
|
{
|
|
if (!engine)
|
|
return mk_error (Invalid_Value);
|
|
|
|
switch (engine->protocol)
|
|
{
|
|
case GPGME_PROTOCOL_OpenPGP:
|
|
return _gpgme_gpg_op_encrypt (engine->engine.gpg, recp, plain, ciph,
|
|
use_armor);
|
|
case GPGME_PROTOCOL_CMS:
|
|
return _gpgme_gpgsm_op_encrypt (engine->engine.gpgsm, recp, plain, ciph,
|
|
use_armor);
|
|
default:
|
|
break;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
GpgmeError
|
|
_gpgme_engine_op_encrypt_sign (EngineObject engine, GpgmeRecipients recp,
|
|
GpgmeData plain, GpgmeData ciph, int use_armor,
|
|
GpgmeCtx ctx /* FIXME */)
|
|
{
|
|
if (!engine)
|
|
return mk_error (Invalid_Value);
|
|
|
|
switch (engine->protocol)
|
|
{
|
|
case GPGME_PROTOCOL_OpenPGP:
|
|
return _gpgme_gpg_op_encrypt_sign (engine->engine.gpg, recp, plain, ciph,
|
|
use_armor, ctx);
|
|
case GPGME_PROTOCOL_CMS:
|
|
return mk_error (Not_Implemented);
|
|
default:
|
|
break;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
GpgmeError
|
|
_gpgme_engine_op_export (EngineObject engine, GpgmeRecipients recp,
|
|
GpgmeData keydata, int use_armor)
|
|
{
|
|
if (!engine)
|
|
return mk_error (Invalid_Value);
|
|
|
|
switch (engine->protocol)
|
|
{
|
|
case GPGME_PROTOCOL_OpenPGP:
|
|
return _gpgme_gpg_op_export (engine->engine.gpg, recp, keydata,
|
|
use_armor);
|
|
case GPGME_PROTOCOL_CMS:
|
|
return _gpgme_gpgsm_op_export (engine->engine.gpgsm, recp, keydata,
|
|
use_armor);
|
|
default:
|
|
break;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
GpgmeError
|
|
_gpgme_engine_op_genkey (EngineObject engine, GpgmeData help_data,
|
|
int use_armor, GpgmeData pubkey, GpgmeData seckey)
|
|
{
|
|
if (!engine)
|
|
return mk_error (Invalid_Value);
|
|
|
|
switch (engine->protocol)
|
|
{
|
|
case GPGME_PROTOCOL_OpenPGP:
|
|
return _gpgme_gpg_op_genkey (engine->engine.gpg, help_data, use_armor,
|
|
pubkey, seckey);
|
|
case GPGME_PROTOCOL_CMS:
|
|
return _gpgme_gpgsm_op_genkey (engine->engine.gpgsm, help_data, use_armor,
|
|
pubkey, seckey);
|
|
default:
|
|
break;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
GpgmeError
|
|
_gpgme_engine_op_import (EngineObject engine, GpgmeData keydata)
|
|
{
|
|
if (!engine)
|
|
return mk_error (Invalid_Value);
|
|
|
|
switch (engine->protocol)
|
|
{
|
|
case GPGME_PROTOCOL_OpenPGP:
|
|
return _gpgme_gpg_op_import (engine->engine.gpg, keydata);
|
|
case GPGME_PROTOCOL_CMS:
|
|
return _gpgme_gpgsm_op_import (engine->engine.gpgsm, keydata);
|
|
default:
|
|
break;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
GpgmeError
|
|
_gpgme_engine_op_keylist (EngineObject engine, const char *pattern, int secret_only,
|
|
int keylist_mode)
|
|
{
|
|
if (!engine)
|
|
return mk_error (Invalid_Value);
|
|
|
|
switch (engine->protocol)
|
|
{
|
|
case GPGME_PROTOCOL_OpenPGP:
|
|
return _gpgme_gpg_op_keylist (engine->engine.gpg, pattern, secret_only,
|
|
keylist_mode);
|
|
case GPGME_PROTOCOL_CMS:
|
|
return _gpgme_gpgsm_op_keylist (engine->engine.gpgsm, pattern, secret_only,
|
|
keylist_mode);
|
|
default:
|
|
break;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
GpgmeError
|
|
_gpgme_engine_op_sign (EngineObject engine, GpgmeData in, GpgmeData out,
|
|
GpgmeSigMode mode, int use_armor,
|
|
int use_textmode, int include_certs,
|
|
GpgmeCtx ctx /* FIXME */)
|
|
{
|
|
if (!engine)
|
|
return mk_error (Invalid_Value);
|
|
|
|
switch (engine->protocol)
|
|
{
|
|
case GPGME_PROTOCOL_OpenPGP:
|
|
return _gpgme_gpg_op_sign (engine->engine.gpg, in, out, mode, use_armor,
|
|
use_textmode, ctx);
|
|
case GPGME_PROTOCOL_CMS:
|
|
return _gpgme_gpgsm_op_sign (engine->engine.gpgsm, in, out, mode,
|
|
use_armor, use_textmode, include_certs, ctx);
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
GpgmeError
|
|
_gpgme_engine_op_trustlist (EngineObject engine, const char *pattern)
|
|
{
|
|
if (!engine)
|
|
return mk_error (Invalid_Value);
|
|
|
|
switch (engine->protocol)
|
|
{
|
|
case GPGME_PROTOCOL_OpenPGP:
|
|
return _gpgme_gpg_op_trustlist (engine->engine.gpg, pattern);
|
|
case GPGME_PROTOCOL_CMS:
|
|
return _gpgme_gpgsm_op_trustlist (engine->engine.gpgsm, pattern);
|
|
default:
|
|
break;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
GpgmeError
|
|
_gpgme_engine_op_verify (EngineObject engine, GpgmeData sig, GpgmeData text)
|
|
{
|
|
if (!engine)
|
|
return mk_error (Invalid_Value);
|
|
|
|
switch (engine->protocol)
|
|
{
|
|
case GPGME_PROTOCOL_OpenPGP:
|
|
return _gpgme_gpg_op_verify (engine->engine.gpg, sig, text);
|
|
case GPGME_PROTOCOL_CMS:
|
|
return _gpgme_gpgsm_op_verify (engine->engine.gpgsm, sig, text);
|
|
default:
|
|
break;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
GpgmeError
|
|
_gpgme_engine_start (EngineObject engine, void *opaque)
|
|
{
|
|
if (!engine)
|
|
return mk_error (Invalid_Value);
|
|
|
|
switch (engine->protocol)
|
|
{
|
|
case GPGME_PROTOCOL_OpenPGP:
|
|
return _gpgme_gpg_spawn (engine->engine.gpg, opaque);
|
|
case GPGME_PROTOCOL_CMS:
|
|
return _gpgme_gpgsm_start (engine->engine.gpgsm, opaque);
|
|
default:
|
|
break;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
void
|
|
_gpgme_engine_add_child_to_reap_list (void *buf, int buflen, pid_t pid)
|
|
{
|
|
/* Reuse the memory, so that we don't need to allocate another
|
|
memory block and to handle errors. */
|
|
struct reap_s *child = buf;
|
|
|
|
assert (buflen >= sizeof *child);
|
|
memset (child, 0, sizeof *child);
|
|
child->pid = pid;
|
|
child->entered = time (NULL);
|
|
LOCK(reap_list_lock);
|
|
child->next = reap_list;
|
|
reap_list = child;
|
|
UNLOCK(reap_list_lock);
|
|
}
|
|
|
|
static void
|
|
do_reaping (void)
|
|
{
|
|
struct reap_s *r, *rlast;
|
|
static time_t last_check;
|
|
time_t cur_time = time (NULL);
|
|
|
|
/* A race does not matter here. */
|
|
if (!last_check)
|
|
last_check = time (NULL);
|
|
|
|
if (last_check >= cur_time)
|
|
return; /* We check only every second. */
|
|
|
|
/* Fixme: it would be nice if to have a TRYLOCK here. */
|
|
LOCK (reap_list_lock);
|
|
for (r = reap_list, rlast = NULL; r; rlast = r, r = r ? r->next : NULL)
|
|
{
|
|
int dummy1, dummy2;
|
|
|
|
if (_gpgme_io_waitpid (r->pid, 0, &dummy1, &dummy2))
|
|
{
|
|
/* The process has terminated - remove it from the queue. */
|
|
void *p = r;
|
|
if (!rlast)
|
|
{
|
|
reap_list = r->next;
|
|
r = reap_list;
|
|
}
|
|
else
|
|
{
|
|
rlast->next = r->next;
|
|
r = rlast;
|
|
}
|
|
xfree (p);
|
|
}
|
|
else if (!r->term_send)
|
|
{
|
|
if (r->entered + 1 >= cur_time)
|
|
{
|
|
_gpgme_io_kill (r->pid, 0);
|
|
r->term_send = 1;
|
|
r->entered = cur_time;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
/* Give it 5 second before we are going to send the killer. */
|
|
if (r->entered + 5 >= cur_time)
|
|
{
|
|
_gpgme_io_kill (r->pid, 1);
|
|
r->entered = cur_time; /* Just in case we have to repeat it. */
|
|
}
|
|
}
|
|
}
|
|
UNLOCK (reap_list_lock);
|
|
}
|
|
|
|
void
|
|
_gpgme_engine_housecleaning (void)
|
|
{
|
|
do_reaping ();
|
|
}
|