2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Support gpgconf.
gpgme/
2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (gpgconf_components): New variable.
(main_sources): Add gpgconf.c.
* gpgme.h (gpgme_protocol_t): New protocol GPGME_PROTOCOL_GPGCONF.
(gpgme_conf_level_t, gpgme_conf_type_t, gpgme_conf_arg_t)
(gpgme_conf_opt_t, gpgme_conf_comp_t, gpgme_conf_arg_new)
(gpgme_conf_arg_release, gpgme_conf_opt_change)
(gpgme_conf_release, gpgme_op_conf_load, gpgme_op_conf_save): New
types.
* gpgconf.c, engine-gpgconf.c: New files.
* engine.h: (_gpgme_engine_op_conf_load,
(_gpgme_engine_op_conf_save): New prototypes.
* op-support.c (_gpgme_op_reset): Ignore not implemented locale
function.
* posix-util.c (_gpgme_get_gpgconf_path): New function.
* w32-util.c (_gpgme_get_gpgconf_path): New function.
* engine-gpgsm.c:
(_gpgme_engine_ops_gpgsm): Add stubs for conf_load and conf_save.
* rungpg.c:
(_gpgme_engine_ops_gpg): Add stubs for conf_load and conf_save.
* gpgme.def: Add new gpgconf related interfaces.
* libgpgme.vers: Likewise.
* util.h (_gpgme_get_gpgconf_path): New prototype.
* gpgme.h (gpgme_protocol_t): Add GPGME_PROTOCOL_GPGCONF.
* engine-backend.h (_gpgme_engine_ops_gpgconf): New prototype.
(struct engine_ops): Add members for conf_load and conf_save.
* engine.c (engine_ops): Add _gpgme_engine_ops_gpgconf.
(_gpgme_engine_op_conf_load,
(_gpgme_engine_op_conf_save): New functions.
(gpgme_get_engine_info): Allow protocol GPGME_PROTOCOL_GPGCONF.
tests/
2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (TESTS_ENVIRONMENT): Use absolute path for
GNUPGHOME.
* gpg/Makefile.am (TESTS_ENVIRONMENT): Use absolute path for
GNUPGHOME.
* gpgsm/Makefile.am (TESTS_ENVIRONMENT): Use absolute path for
GNUPGHOME.
* gpg/Makefile.am (TESTS): Add t-gpgconf.
t-gpgconf.c: New file.
2008-01-04 14:31:15 +00:00
|
|
|
|
/* gpgconf.c - GnuPG Made Easy.
|
|
|
|
|
Copyright (C) 2007 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 Lesser General Public License as
|
|
|
|
|
published by the Free Software Foundation; either version 2.1 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
|
|
|
|
|
Lesser General Public License for more details.
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU Lesser 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. */
|
|
|
|
|
|
|
|
|
|
#if HAVE_CONFIG_H
|
|
|
|
|
#include <config.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#include "gpgme.h"
|
|
|
|
|
|
|
|
|
|
#include "ops.h"
|
|
|
|
|
#include "engine.h"
|
|
|
|
|
|
|
|
|
|
#ifdef ENABLE_GPGCONF
|
|
|
|
|
/* engine-gpgconf.c. */
|
|
|
|
|
gpgme_error_t _gpgme_conf_arg_new (gpgme_conf_arg_t *arg_p,
|
|
|
|
|
gpgme_conf_type_t type, void *value);
|
|
|
|
|
void _gpgme_conf_arg_release (gpgme_conf_arg_t arg, gpgme_conf_type_t type);
|
|
|
|
|
gpgme_error_t _gpgme_conf_opt_change (gpgme_conf_opt_t opt, int reset,
|
|
|
|
|
gpgme_conf_arg_t arg);
|
|
|
|
|
void _gpgme_conf_release (gpgme_conf_comp_t conf);
|
|
|
|
|
gpgme_error_t _gpgme_conf_load (void *engine, gpgme_conf_comp_t *conf_p);
|
|
|
|
|
gpgme_error_t gpgme_op_conf_save (gpgme_ctx_t ctx, gpgme_conf_comp_t comp);
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Allocate a new gpgme_conf_arg_t. */
|
|
|
|
|
gpgme_error_t
|
|
|
|
|
gpgme_conf_arg_new (gpgme_conf_arg_t *arg_p,
|
|
|
|
|
gpgme_conf_type_t type, void *value)
|
|
|
|
|
{
|
|
|
|
|
#ifdef ENABLE_GPGCONF
|
|
|
|
|
return _gpgme_conf_arg_new (arg_p, type, value);
|
|
|
|
|
#else
|
|
|
|
|
return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* This also releases all chained argument structures! */
|
|
|
|
|
void
|
|
|
|
|
gpgme_conf_arg_release (gpgme_conf_arg_t arg, gpgme_conf_type_t type)
|
|
|
|
|
{
|
|
|
|
|
#ifdef ENABLE_GPGCONF
|
2009-12-02 09:49:56 +00:00
|
|
|
|
_gpgme_conf_arg_release (arg, type);
|
2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Support gpgconf.
gpgme/
2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (gpgconf_components): New variable.
(main_sources): Add gpgconf.c.
* gpgme.h (gpgme_protocol_t): New protocol GPGME_PROTOCOL_GPGCONF.
(gpgme_conf_level_t, gpgme_conf_type_t, gpgme_conf_arg_t)
(gpgme_conf_opt_t, gpgme_conf_comp_t, gpgme_conf_arg_new)
(gpgme_conf_arg_release, gpgme_conf_opt_change)
(gpgme_conf_release, gpgme_op_conf_load, gpgme_op_conf_save): New
types.
* gpgconf.c, engine-gpgconf.c: New files.
* engine.h: (_gpgme_engine_op_conf_load,
(_gpgme_engine_op_conf_save): New prototypes.
* op-support.c (_gpgme_op_reset): Ignore not implemented locale
function.
* posix-util.c (_gpgme_get_gpgconf_path): New function.
* w32-util.c (_gpgme_get_gpgconf_path): New function.
* engine-gpgsm.c:
(_gpgme_engine_ops_gpgsm): Add stubs for conf_load and conf_save.
* rungpg.c:
(_gpgme_engine_ops_gpg): Add stubs for conf_load and conf_save.
* gpgme.def: Add new gpgconf related interfaces.
* libgpgme.vers: Likewise.
* util.h (_gpgme_get_gpgconf_path): New prototype.
* gpgme.h (gpgme_protocol_t): Add GPGME_PROTOCOL_GPGCONF.
* engine-backend.h (_gpgme_engine_ops_gpgconf): New prototype.
(struct engine_ops): Add members for conf_load and conf_save.
* engine.c (engine_ops): Add _gpgme_engine_ops_gpgconf.
(_gpgme_engine_op_conf_load,
(_gpgme_engine_op_conf_save): New functions.
(gpgme_get_engine_info): Allow protocol GPGME_PROTOCOL_GPGCONF.
tests/
2008-01-04 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (TESTS_ENVIRONMENT): Use absolute path for
GNUPGHOME.
* gpg/Makefile.am (TESTS_ENVIRONMENT): Use absolute path for
GNUPGHOME.
* gpgsm/Makefile.am (TESTS_ENVIRONMENT): Use absolute path for
GNUPGHOME.
* gpg/Makefile.am (TESTS): Add t-gpgconf.
t-gpgconf.c: New file.
2008-01-04 14:31:15 +00:00
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Register a change for the value of OPT to ARG. */
|
|
|
|
|
gpgme_error_t
|
|
|
|
|
gpgme_conf_opt_change (gpgme_conf_opt_t opt, int reset, gpgme_conf_arg_t arg)
|
|
|
|
|
{
|
|
|
|
|
#ifdef ENABLE_GPGCONF
|
|
|
|
|
return _gpgme_conf_opt_change (opt, reset, arg);
|
|
|
|
|
#else
|
|
|
|
|
return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Public function to release a gpgme_conf_comp list. */
|
|
|
|
|
void
|
|
|
|
|
gpgme_conf_release (gpgme_conf_comp_t conf)
|
|
|
|
|
{
|
|
|
|
|
#ifdef ENABLE_GPGCONF
|
|
|
|
|
_gpgme_conf_release (conf);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Public function to release load a configuration list. No
|
|
|
|
|
asynchronous interface for now. */
|
|
|
|
|
gpgme_error_t
|
|
|
|
|
gpgme_op_conf_load (gpgme_ctx_t ctx, gpgme_conf_comp_t *conf_p)
|
|
|
|
|
{
|
|
|
|
|
#ifdef ENABLE_GPGCONF
|
|
|
|
|
gpgme_error_t err;
|
|
|
|
|
gpgme_protocol_t proto = ctx->protocol;
|
|
|
|
|
|
|
|
|
|
ctx->protocol = GPGME_PROTOCOL_GPGCONF;
|
|
|
|
|
err = _gpgme_op_reset (ctx, 1);
|
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
|
|
|
|
|
|
|
|
|
err = _gpgme_engine_op_conf_load (ctx->engine, conf_p);
|
|
|
|
|
ctx->protocol = proto;
|
|
|
|
|
return err;
|
|
|
|
|
#else
|
|
|
|
|
return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* This function does not follow chained components! */
|
|
|
|
|
gpgme_error_t
|
|
|
|
|
gpgme_op_conf_save (gpgme_ctx_t ctx, gpgme_conf_comp_t comp)
|
|
|
|
|
{
|
|
|
|
|
#ifdef ENABLE_GPGCONF
|
|
|
|
|
gpgme_error_t err;
|
|
|
|
|
gpgme_protocol_t proto = ctx->protocol;
|
|
|
|
|
|
|
|
|
|
ctx->protocol = GPGME_PROTOCOL_GPGCONF;
|
|
|
|
|
err = _gpgme_op_reset (ctx, 1);
|
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
|
|
|
|
|
|
|
|
|
err = _gpgme_engine_op_conf_save (ctx->engine, comp);
|
|
|
|
|
ctx->protocol = proto;
|
|
|
|
|
return err;
|
|
|
|
|
#else
|
|
|
|
|
return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|