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
|
|
|
|
/* t-gpgconf.c - Regression test.
|
|
|
|
|
Copyright (C) 2001, 2004, 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. */
|
|
|
|
|
|
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
|
#include <config.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#include <unistd.h>
|
|
|
|
|
#include <errno.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <locale.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
|
#include <windows.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#include <gpgme.h>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#define fail_if_err(err) \
|
|
|
|
|
do \
|
|
|
|
|
{ \
|
|
|
|
|
if (err) \
|
|
|
|
|
{ \
|
|
|
|
|
fprintf (stderr, "%s:%d: %s: %s\n", \
|
|
|
|
|
__FILE__, __LINE__, gpgme_strsource (err), \
|
|
|
|
|
gpgme_strerror (err)); \
|
|
|
|
|
exit (1); \
|
|
|
|
|
} \
|
|
|
|
|
} \
|
|
|
|
|
while (0)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
init_gpgme (gpgme_protocol_t proto)
|
|
|
|
|
{
|
|
|
|
|
gpgme_error_t err;
|
|
|
|
|
|
|
|
|
|
gpgme_check_version (NULL);
|
|
|
|
|
setlocale (LC_ALL, "");
|
|
|
|
|
gpgme_set_locale (NULL, LC_CTYPE, setlocale (LC_CTYPE, NULL));
|
|
|
|
|
#ifndef HAVE_W32_SYSTEM
|
|
|
|
|
gpgme_set_locale (NULL, LC_MESSAGES, setlocale (LC_MESSAGES, NULL));
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
err = gpgme_engine_check_version (proto);
|
|
|
|
|
fail_if_err (err);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static char *
|
|
|
|
|
spaces (char *str, int extra)
|
|
|
|
|
{
|
|
|
|
|
static char buf[80];
|
|
|
|
|
int len = str ? strlen (str) : 0;
|
|
|
|
|
int n;
|
|
|
|
|
|
|
|
|
|
#define TABSTOP 30
|
|
|
|
|
n = TABSTOP - len - extra;
|
|
|
|
|
|
|
|
|
|
memset (buf, ' ', sizeof (buf));
|
|
|
|
|
if (n < 1 || n > (sizeof (buf) - 1))
|
|
|
|
|
{
|
|
|
|
|
buf[0] = '\n';
|
|
|
|
|
n = TABSTOP + 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
buf[n] = '\0';
|
|
|
|
|
return buf;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
dump_arg (int type, gpgme_conf_arg_t arg)
|
|
|
|
|
{
|
|
|
|
|
if (!arg)
|
|
|
|
|
{
|
|
|
|
|
printf ("(none)");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
while (arg)
|
|
|
|
|
{
|
|
|
|
|
switch (type)
|
|
|
|
|
{
|
|
|
|
|
case GPGME_CONF_STRING:
|
|
|
|
|
case GPGME_CONF_PATHNAME:
|
|
|
|
|
case GPGME_CONF_LDAP_SERVER:
|
|
|
|
|
printf ("%s", arg->value.string);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case GPGME_CONF_UINT32:
|
|
|
|
|
printf ("%u", arg->value.uint32);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case GPGME_CONF_INT32:
|
|
|
|
|
printf ("%i", arg->value.int32);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case GPGME_CONF_NONE:
|
|
|
|
|
printf ("%i (times)", arg->value.count);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
printf ("(unknown type)");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
arg = arg->next;
|
|
|
|
|
if (arg)
|
|
|
|
|
printf (" ");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
dump_opt (gpgme_conf_opt_t opt)
|
|
|
|
|
{
|
|
|
|
|
char level;
|
|
|
|
|
char runtime = (opt->flags & GPGME_CONF_RUNTIME) ? 'r' : ' ';
|
|
|
|
|
|
|
|
|
|
switch (opt->level)
|
|
|
|
|
{
|
|
|
|
|
case GPGME_CONF_BASIC:
|
|
|
|
|
level = 'b';
|
|
|
|
|
break;
|
|
|
|
|
case GPGME_CONF_ADVANCED:
|
|
|
|
|
level = 'a';
|
|
|
|
|
break;
|
|
|
|
|
case GPGME_CONF_EXPERT:
|
|
|
|
|
level = 'e';
|
|
|
|
|
break;
|
|
|
|
|
case GPGME_CONF_INVISIBLE:
|
|
|
|
|
level = 'i';
|
|
|
|
|
break;
|
|
|
|
|
case GPGME_CONF_INTERNAL:
|
|
|
|
|
level = '#';
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
level = '?';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (opt->flags & GPGME_CONF_GROUP)
|
|
|
|
|
{
|
|
|
|
|
printf ("\n");
|
|
|
|
|
printf ("%c%c [%s]%s%s\n", level, runtime, opt->name, spaces (opt->name, 5),
|
|
|
|
|
opt->description
|
|
|
|
|
? opt->description : "");
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (opt->argname)
|
|
|
|
|
{
|
|
|
|
|
char *more = (opt->flags & GPGME_CONF_LIST) ? "..." : "";
|
|
|
|
|
|
|
|
|
|
if (opt->flags & GPGME_CONF_OPTIONAL)
|
|
|
|
|
{
|
|
|
|
|
printf ("%c%c --%s [%s%s] %s", level, runtime, opt->name, opt->argname, more,
|
|
|
|
|
spaces (opt->name, 9 + strlen (opt->argname) + strlen (more)));
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
printf ("%c%c --%s %s%s %s", level, runtime, opt->name, opt->argname, more,
|
|
|
|
|
spaces (opt->name, 7 + strlen (opt->argname) + strlen (more)));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
printf ("%c%c --%s%s", level, runtime, opt->name, spaces (opt->name, 5));
|
|
|
|
|
|
|
|
|
|
if (opt->description)
|
|
|
|
|
printf ("%s", opt->description);
|
|
|
|
|
printf ("\n");
|
|
|
|
|
|
|
|
|
|
if (opt->flags & GPGME_CONF_DEFAULT)
|
|
|
|
|
{
|
|
|
|
|
printf ("%s%s = ", spaces (NULL, 0), opt->argname ? opt->argname : "(default)");
|
|
|
|
|
dump_arg (opt->type, opt->default_value);
|
|
|
|
|
printf ("\n");
|
|
|
|
|
}
|
|
|
|
|
else if (opt->flags & GPGME_CONF_DEFAULT_DESC)
|
|
|
|
|
printf ("%s%s = %s\n", spaces (NULL, 0), opt->argname ? opt->argname : "(default)",
|
|
|
|
|
opt->default_description);
|
|
|
|
|
|
|
|
|
|
if (opt->no_arg_value)
|
|
|
|
|
{
|
|
|
|
|
printf ("%sNo Arg Def = ", spaces (NULL, 0));
|
|
|
|
|
dump_arg (opt->type, opt->no_arg_value);
|
|
|
|
|
printf ("\n");
|
|
|
|
|
}
|
|
|
|
|
if (opt->value)
|
|
|
|
|
{
|
|
|
|
|
printf ("%sCurrent = ", spaces (NULL, 0));
|
|
|
|
|
dump_arg (opt->type, opt->value);
|
|
|
|
|
printf ("\n");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
|
arg = comp->options;
|
|
|
|
|
while (opt)
|
|
|
|
|
{
|
|
|
|
|
dump_opt (opt);
|
|
|
|
|
opt = opt->next;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
dump_comp (gpgme_conf_comp_t comp)
|
|
|
|
|
{
|
|
|
|
|
gpgme_conf_opt_t opt;
|
|
|
|
|
|
|
|
|
|
printf ("COMPONENT\n");
|
|
|
|
|
printf ("=========\n");
|
|
|
|
|
printf (" Name: %s\n", comp->name);
|
|
|
|
|
if (comp->description)
|
|
|
|
|
printf (" Desc: %s\n", comp->description);
|
|
|
|
|
if (comp->program_name)
|
|
|
|
|
printf (" Path: %s\n", comp->program_name);
|
|
|
|
|
printf ("\n");
|
|
|
|
|
|
|
|
|
|
opt = comp->options;
|
|
|
|
|
while (opt)
|
|
|
|
|
{
|
|
|
|
|
dump_opt (opt);
|
|
|
|
|
opt = opt->next;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
main (int argc, char **argv)
|
|
|
|
|
{
|
|
|
|
|
gpgme_ctx_t ctx;
|
|
|
|
|
gpgme_error_t err;
|
|
|
|
|
gpgme_conf_comp_t conf;
|
|
|
|
|
gpgme_conf_comp_t comp;
|
|
|
|
|
int first;
|
2008-01-10 02:13:18 +00:00
|
|
|
|
|
|
|
|
|
#ifndef ENABLE_GPGCONF
|
|
|
|
|
return 0;
|
|
|
|
|
#endif
|
|
|
|
|
|
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
|
|
|
|
init_gpgme (GPGME_PROTOCOL_GPGCONF);
|
|
|
|
|
|
|
|
|
|
err = gpgme_new (&ctx);
|
|
|
|
|
fail_if_err (err);
|
|
|
|
|
|
|
|
|
|
err = gpgme_op_conf_load (ctx, &conf);
|
|
|
|
|
fail_if_err (err);
|
|
|
|
|
|
|
|
|
|
comp = conf;
|
|
|
|
|
first = 1;
|
|
|
|
|
while (comp)
|
|
|
|
|
{
|
|
|
|
|
if (!first)
|
|
|
|
|
printf ("\n");
|
|
|
|
|
else
|
|
|
|
|
first = 0;
|
|
|
|
|
dump_comp (comp);
|
|
|
|
|
comp = comp->next;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#if 1
|
|
|
|
|
/* Now change something. */
|
|
|
|
|
{
|
|
|
|
|
unsigned int count = 1;
|
|
|
|
|
gpgme_conf_arg_t arg;
|
|
|
|
|
gpgme_conf_opt_t opt;
|
|
|
|
|
|
|
|
|
|
err = gpgme_conf_arg_new (&arg, GPGME_CONF_NONE, &count);
|
|
|
|
|
fail_if_err (err);
|
|
|
|
|
|
|
|
|
|
comp = conf;
|
|
|
|
|
while (comp && strcmp (comp->name, "dirmngr"))
|
|
|
|
|
comp = comp->next;
|
|
|
|
|
|
2008-01-10 04:54:16 +00:00
|
|
|
|
if (comp)
|
|
|
|
|
{
|
|
|
|
|
opt = comp->options;
|
|
|
|
|
while (opt && strcmp (opt->name, "verbose"))
|
|
|
|
|
opt = opt->next;
|
|
|
|
|
|
|
|
|
|
/* Allow for the verbose option not to be there. */
|
|
|
|
|
if (opt)
|
|
|
|
|
{
|
|
|
|
|
err = gpgme_conf_opt_change (opt, 0, arg);
|
|
|
|
|
fail_if_err (err);
|
|
|
|
|
|
|
|
|
|
err = gpgme_op_conf_save (ctx, comp);
|
|
|
|
|
fail_if_err (err);
|
|
|
|
|
}
|
|
|
|
|
}
|
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
|
|
|
|
|
|
|
|
|
|
gpgme_conf_release (conf);
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|