2011-01-10 14:30:17 +01:00
|
|
|
|
/* call-dirmngr.c - GPG operations to the Dirmngr.
|
|
|
|
|
* Copyright (C) 2011 Free Software Foundation, Inc.
|
2015-03-19 11:02:46 +01:00
|
|
|
|
* Copyright (C) 2015 g10 Code GmbH
|
2011-01-10 14:30:17 +01:00
|
|
|
|
*
|
|
|
|
|
* This file is part of GnuPG.
|
|
|
|
|
*
|
|
|
|
|
* GnuPG 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 3 of the License, or
|
|
|
|
|
* (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* GnuPG 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, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#include <errno.h>
|
2011-02-04 12:57:53 +01:00
|
|
|
|
#include <unistd.h>
|
2011-01-10 14:30:17 +01:00
|
|
|
|
#include <time.h>
|
|
|
|
|
#include <assert.h>
|
|
|
|
|
#ifdef HAVE_LOCALE_H
|
|
|
|
|
# include <locale.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#include "gpg.h"
|
|
|
|
|
#include <assuan.h>
|
|
|
|
|
#include "util.h"
|
|
|
|
|
#include "membuf.h"
|
|
|
|
|
#include "options.h"
|
|
|
|
|
#include "i18n.h"
|
|
|
|
|
#include "asshelp.h"
|
2011-01-18 12:51:16 +01:00
|
|
|
|
#include "keyserver.h"
|
2011-01-10 14:30:17 +01:00
|
|
|
|
#include "call-dirmngr.h"
|
|
|
|
|
|
|
|
|
|
|
2014-03-14 16:12:54 +01:00
|
|
|
|
/* Parameter structure used to gather status info. */
|
|
|
|
|
struct ks_status_parm_s
|
|
|
|
|
{
|
|
|
|
|
char *source;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2011-01-18 12:51:16 +01:00
|
|
|
|
/* Parameter structure used with the KS_SEARCH command. */
|
|
|
|
|
struct ks_search_parm_s
|
|
|
|
|
{
|
|
|
|
|
gpg_error_t lasterr; /* Last error code. */
|
|
|
|
|
membuf_t saveddata; /* Buffer to build complete lines. */
|
|
|
|
|
char *helpbuf; /* NULL or malloced buffer. */
|
|
|
|
|
size_t helpbufsize; /* Allocated size of HELPBUF. */
|
2014-03-14 16:12:54 +01:00
|
|
|
|
gpg_error_t (*data_cb)(void*, int, char*); /* Callback. */
|
2011-01-18 12:51:16 +01:00
|
|
|
|
void *data_cb_value; /* First argument for DATA_CB. */
|
2014-03-14 16:12:54 +01:00
|
|
|
|
struct ks_status_parm_s *stparm; /* Link to the status parameter. */
|
2011-01-18 12:51:16 +01:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Parameter structure used with the KS_GET command. */
|
|
|
|
|
struct ks_get_parm_s
|
|
|
|
|
{
|
|
|
|
|
estream_t memfp;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2011-01-20 14:12:53 +01:00
|
|
|
|
/* Parameter structure used with the KS_PUT command. */
|
|
|
|
|
struct ks_put_parm_s
|
|
|
|
|
{
|
|
|
|
|
assuan_context_t ctx;
|
|
|
|
|
kbnode_t keyblock; /* The optional keyblock. */
|
|
|
|
|
const void *data; /* The key in OpenPGP binary format. */
|
|
|
|
|
size_t datalen; /* The length of DATA. */
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2011-01-10 14:30:17 +01:00
|
|
|
|
/* Data used to associate an session with dirmngr contexts. We can't
|
|
|
|
|
use a simple one to one mapping because we sometimes need two
|
2014-03-12 14:27:50 +01:00
|
|
|
|
connections to the dirmngr; for example while doing a listing and
|
2011-01-10 14:30:17 +01:00
|
|
|
|
being in a data callback we may want to retrieve a key. The local
|
|
|
|
|
dirmngr data takes care of this. At the end of the session the
|
2014-03-12 14:27:50 +01:00
|
|
|
|
function dirmngr_deinit_session_data is called by gpg.c to cleanup
|
2011-01-10 14:30:17 +01:00
|
|
|
|
these resources. Note that gpg.h defines a typedef dirmngr_local_t
|
|
|
|
|
for this structure. */
|
2011-02-04 12:57:53 +01:00
|
|
|
|
struct dirmngr_local_s
|
2011-01-10 14:30:17 +01:00
|
|
|
|
{
|
|
|
|
|
/* Link to other contexts which are used simultaneously. */
|
|
|
|
|
struct dirmngr_local_s *next;
|
|
|
|
|
|
|
|
|
|
/* The active Assuan context. */
|
2011-01-18 12:51:16 +01:00
|
|
|
|
assuan_context_t ctx;
|
2011-01-10 14:30:17 +01:00
|
|
|
|
|
|
|
|
|
/* Flag set to true while an operation is running on CTX. */
|
|
|
|
|
int is_active;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Deinitialize all session data of dirmngr pertaining to CTRL. */
|
|
|
|
|
void
|
|
|
|
|
gpg_dirmngr_deinit_session_data (ctrl_t ctrl)
|
|
|
|
|
{
|
|
|
|
|
dirmngr_local_t dml;
|
|
|
|
|
|
|
|
|
|
while ((dml = ctrl->dirmngr_local))
|
|
|
|
|
{
|
|
|
|
|
ctrl->dirmngr_local = dml->next;
|
|
|
|
|
if (dml->is_active)
|
|
|
|
|
log_error ("oops: trying to cleanup an active dirmngr context\n");
|
|
|
|
|
else
|
|
|
|
|
assuan_release (dml->ctx);
|
|
|
|
|
xfree (dml);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2014-03-12 14:27:50 +01:00
|
|
|
|
/* Try to connect to the Dirmngr via a socket or spawn it if possible.
|
|
|
|
|
Handle the server's initial greeting and set global options. */
|
2011-01-10 14:30:17 +01:00
|
|
|
|
static gpg_error_t
|
|
|
|
|
create_context (ctrl_t ctrl, assuan_context_t *r_ctx)
|
|
|
|
|
{
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
assuan_context_t ctx;
|
|
|
|
|
|
|
|
|
|
*r_ctx = NULL;
|
|
|
|
|
err = start_new_dirmngr (&ctx,
|
|
|
|
|
GPG_ERR_SOURCE_DEFAULT,
|
|
|
|
|
opt.homedir,
|
2014-03-12 18:24:52 +01:00
|
|
|
|
opt.dirmngr_program,
|
2014-11-28 09:44:19 +01:00
|
|
|
|
opt.autostart, opt.verbose, DBG_ASSUAN,
|
2011-01-10 14:30:17 +01:00
|
|
|
|
NULL /*gpg_status2*/, ctrl);
|
2014-11-28 09:44:19 +01:00
|
|
|
|
if (!opt.autostart && gpg_err_code (err) == GPG_ERR_NO_DIRMNGR)
|
|
|
|
|
{
|
|
|
|
|
static int shown;
|
|
|
|
|
|
|
|
|
|
if (!shown)
|
|
|
|
|
{
|
|
|
|
|
shown = 1;
|
|
|
|
|
log_info (_("no dirmngr running in this session\n"));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (!err)
|
2011-01-10 14:30:17 +01:00
|
|
|
|
{
|
|
|
|
|
keyserver_spec_t ksi;
|
|
|
|
|
|
|
|
|
|
/* Tell the dirmngr that we want to collect audit event. */
|
|
|
|
|
/* err = assuan_transact (agent_ctx, "OPTION audit-events=1", */
|
|
|
|
|
/* NULL, NULL, NULL, NULL, NULL, NULL); */
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2011-01-10 14:30:17 +01:00
|
|
|
|
/* Set all configured keyservers. We clear existing keyservers
|
|
|
|
|
so that any keyserver configured in GPG overrides keyservers
|
2014-03-12 14:27:50 +01:00
|
|
|
|
possibly still configured in Dirmngr for the session (Note
|
|
|
|
|
that the keyserver list of a session in Dirmngr survives a
|
|
|
|
|
RESET. */
|
2011-01-18 12:51:16 +01:00
|
|
|
|
for (ksi = opt.keyserver; !err && ksi; ksi = ksi->next)
|
2011-01-10 14:30:17 +01:00
|
|
|
|
{
|
|
|
|
|
char *line;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2011-01-10 14:30:17 +01:00
|
|
|
|
line = xtryasprintf ("KEYSERVER%s %s",
|
2011-01-18 12:51:16 +01:00
|
|
|
|
ksi == opt.keyserver? " --clear":"", ksi->uri);
|
2011-01-10 14:30:17 +01:00
|
|
|
|
if (!line)
|
|
|
|
|
err = gpg_error_from_syserror ();
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
err = assuan_transact (ctx, line,
|
|
|
|
|
NULL, NULL, NULL, NULL, NULL, NULL);
|
|
|
|
|
xfree (line);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (err)
|
|
|
|
|
assuan_release (ctx);
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* audit_log_ok (ctrl->audit, AUDIT_DIRMNGR_READY, err); */
|
|
|
|
|
*r_ctx = ctx;
|
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2011-01-10 14:30:17 +01:00
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Get a context for accessing dirmngr. If no context is available a
|
2014-03-12 14:27:50 +01:00
|
|
|
|
new one is created and - if required - dirmngr started. On success
|
|
|
|
|
an assuan context is stored at R_CTX. This context may only be
|
2011-01-10 14:30:17 +01:00
|
|
|
|
released by means of close_context. Note that NULL is stored at
|
|
|
|
|
R_CTX on error. */
|
|
|
|
|
static gpg_error_t
|
|
|
|
|
open_context (ctrl_t ctrl, assuan_context_t *r_ctx)
|
|
|
|
|
{
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
dirmngr_local_t dml;
|
|
|
|
|
|
|
|
|
|
*r_ctx = NULL;
|
|
|
|
|
for (;;)
|
|
|
|
|
{
|
|
|
|
|
for (dml = ctrl->dirmngr_local; dml && dml->is_active; dml = dml->next)
|
|
|
|
|
;
|
|
|
|
|
if (dml)
|
|
|
|
|
{
|
|
|
|
|
/* Found an inactive local session - return that. */
|
|
|
|
|
assert (!dml->is_active);
|
|
|
|
|
dml->is_active = 1;
|
2011-01-18 12:51:16 +01:00
|
|
|
|
*r_ctx = dml->ctx;
|
|
|
|
|
return 0;
|
2011-01-10 14:30:17 +01:00
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2011-01-10 14:30:17 +01:00
|
|
|
|
dml = xtrycalloc (1, sizeof *dml);
|
|
|
|
|
if (!dml)
|
|
|
|
|
return gpg_error_from_syserror ();
|
|
|
|
|
err = create_context (ctrl, &dml->ctx);
|
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
xfree (dml);
|
|
|
|
|
return err;
|
|
|
|
|
}
|
2014-03-12 14:27:50 +01:00
|
|
|
|
/* To be on the nPth thread safe site we need to add it to a
|
2011-01-10 14:30:17 +01:00
|
|
|
|
list; this is far easier than to have a lock for this
|
|
|
|
|
function. It should not happen anyway but the code is free
|
|
|
|
|
because we need it for the is_active check above. */
|
|
|
|
|
dml->next = ctrl->dirmngr_local;
|
|
|
|
|
ctrl->dirmngr_local = dml;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Close the assuan context CTX or return it to a pool of unused
|
|
|
|
|
contexts. If CTX is NULL, the function does nothing. */
|
|
|
|
|
static void
|
|
|
|
|
close_context (ctrl_t ctrl, assuan_context_t ctx)
|
|
|
|
|
{
|
|
|
|
|
dirmngr_local_t dml;
|
|
|
|
|
|
|
|
|
|
if (!ctx)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
for (dml = ctrl->dirmngr_local; dml; dml = dml->next)
|
|
|
|
|
{
|
|
|
|
|
if (dml->ctx == ctx)
|
|
|
|
|
{
|
2011-01-18 12:51:16 +01:00
|
|
|
|
if (!dml->is_active)
|
2011-01-10 14:30:17 +01:00
|
|
|
|
log_fatal ("closing inactive dirmngr context %p\n", ctx);
|
2011-01-18 12:51:16 +01:00
|
|
|
|
dml->is_active = 0;
|
2011-01-10 14:30:17 +01:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
log_fatal ("closing unknown dirmngr ctx %p\n", ctx);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2014-03-14 16:12:54 +01:00
|
|
|
|
|
|
|
|
|
/* Status callback for ks_get and ks_search. */
|
|
|
|
|
static gpg_error_t
|
|
|
|
|
ks_status_cb (void *opaque, const char *line)
|
|
|
|
|
{
|
|
|
|
|
struct ks_status_parm_s *parm = opaque;
|
|
|
|
|
gpg_error_t err = 0;
|
|
|
|
|
const char *s;
|
|
|
|
|
|
|
|
|
|
if ((s = has_leading_keyword (line, "SOURCE")))
|
|
|
|
|
{
|
|
|
|
|
if (!parm->source)
|
|
|
|
|
{
|
|
|
|
|
parm->source = xtrystrdup (s);
|
|
|
|
|
if (!parm->source)
|
|
|
|
|
err = gpg_error_from_syserror ();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-01-10 14:30:17 +01:00
|
|
|
|
|
2011-01-18 12:51:16 +01:00
|
|
|
|
/* Data callback for the KS_SEARCH command. */
|
|
|
|
|
static gpg_error_t
|
|
|
|
|
ks_search_data_cb (void *opaque, const void *data, size_t datalen)
|
|
|
|
|
{
|
|
|
|
|
gpg_error_t err = 0;
|
|
|
|
|
struct ks_search_parm_s *parm = opaque;
|
|
|
|
|
const char *line, *s;
|
|
|
|
|
size_t rawlen, linelen;
|
|
|
|
|
char fixedbuf[256];
|
|
|
|
|
|
|
|
|
|
if (parm->lasterr)
|
|
|
|
|
return 0;
|
|
|
|
|
|
2014-03-14 16:12:54 +01:00
|
|
|
|
if (parm->stparm->source)
|
|
|
|
|
{
|
|
|
|
|
err = parm->data_cb (parm->data_cb_value, 1, parm->stparm->source);
|
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
parm->lasterr = err;
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
/* Clear it so that we won't get back here unless the server
|
|
|
|
|
accidentally sends a second source status line. Note that
|
|
|
|
|
will not see all accidentally sent source lines because it
|
|
|
|
|
depends on whether data lines have been send in between. */
|
|
|
|
|
xfree (parm->stparm->source);
|
|
|
|
|
parm->stparm->source = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-18 12:51:16 +01:00
|
|
|
|
if (!data)
|
|
|
|
|
return 0; /* Ignore END commands. */
|
2011-01-10 14:30:17 +01:00
|
|
|
|
|
2011-01-18 12:51:16 +01:00
|
|
|
|
put_membuf (&parm->saveddata, data, datalen);
|
|
|
|
|
|
|
|
|
|
again:
|
|
|
|
|
line = peek_membuf (&parm->saveddata, &rawlen);
|
|
|
|
|
if (!line)
|
|
|
|
|
{
|
|
|
|
|
parm->lasterr = gpg_error_from_syserror ();
|
|
|
|
|
return parm->lasterr; /* Tell the server about our problem. */
|
|
|
|
|
}
|
|
|
|
|
if ((s = memchr (line, '\n', rawlen)))
|
|
|
|
|
{
|
|
|
|
|
linelen = s - line; /* That is the length excluding the LF. */
|
|
|
|
|
if (linelen + 1 < sizeof fixedbuf)
|
|
|
|
|
{
|
|
|
|
|
/* We can use the static buffer. */
|
|
|
|
|
memcpy (fixedbuf, line, linelen);
|
|
|
|
|
fixedbuf[linelen] = 0;
|
|
|
|
|
if (linelen && fixedbuf[linelen-1] == '\r')
|
|
|
|
|
fixedbuf[linelen-1] = 0;
|
2014-03-14 16:12:54 +01:00
|
|
|
|
err = parm->data_cb (parm->data_cb_value, 0, fixedbuf);
|
2011-01-18 12:51:16 +01:00
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
else
|
2011-01-18 12:51:16 +01:00
|
|
|
|
{
|
|
|
|
|
if (linelen + 1 >= parm->helpbufsize)
|
|
|
|
|
{
|
|
|
|
|
xfree (parm->helpbuf);
|
|
|
|
|
parm->helpbufsize = linelen + 1 + 1024;
|
|
|
|
|
parm->helpbuf = xtrymalloc (parm->helpbufsize);
|
|
|
|
|
if (!parm->helpbuf)
|
|
|
|
|
{
|
|
|
|
|
parm->lasterr = gpg_error_from_syserror ();
|
|
|
|
|
return parm->lasterr;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
memcpy (parm->helpbuf, line, linelen);
|
|
|
|
|
parm->helpbuf[linelen] = 0;
|
|
|
|
|
if (linelen && parm->helpbuf[linelen-1] == '\r')
|
|
|
|
|
parm->helpbuf[linelen-1] = 0;
|
2014-03-14 16:12:54 +01:00
|
|
|
|
err = parm->data_cb (parm->data_cb_value, 0, parm->helpbuf);
|
2011-01-18 12:51:16 +01:00
|
|
|
|
}
|
|
|
|
|
if (err)
|
|
|
|
|
parm->lasterr = err;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
clear_membuf (&parm->saveddata, linelen+1);
|
|
|
|
|
goto again; /* There might be another complete line. */
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Run the KS_SEARCH command using the search string SEARCHSTR. All
|
|
|
|
|
data lines are passed to the CB function. That function is called
|
2014-03-14 16:12:54 +01:00
|
|
|
|
with CB_VALUE as its first argument, a 0 as second argument, and
|
|
|
|
|
the decoded data line as third argument. The callback function may
|
|
|
|
|
modify the data line and it is guaranteed that this data line is a
|
|
|
|
|
complete line with a terminating 0 character but without the
|
|
|
|
|
linefeed. NULL is passed to the callback to indicate EOF. */
|
2011-01-18 12:51:16 +01:00
|
|
|
|
gpg_error_t
|
|
|
|
|
gpg_dirmngr_ks_search (ctrl_t ctrl, const char *searchstr,
|
2014-03-14 16:12:54 +01:00
|
|
|
|
gpg_error_t (*cb)(void*, int, char *), void *cb_value)
|
2011-02-04 12:57:53 +01:00
|
|
|
|
{
|
2011-01-10 14:30:17 +01:00
|
|
|
|
gpg_error_t err;
|
|
|
|
|
assuan_context_t ctx;
|
2014-03-14 16:12:54 +01:00
|
|
|
|
struct ks_status_parm_s stparm;
|
2011-01-18 12:51:16 +01:00
|
|
|
|
struct ks_search_parm_s parm;
|
2011-01-10 14:30:17 +01:00
|
|
|
|
char line[ASSUAN_LINELENGTH];
|
|
|
|
|
|
|
|
|
|
err = open_context (ctrl, &ctx);
|
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
|
|
|
|
|
2011-01-18 12:51:16 +01:00
|
|
|
|
{
|
|
|
|
|
char *escsearchstr = percent_plus_escape (searchstr);
|
|
|
|
|
if (!escsearchstr)
|
|
|
|
|
{
|
|
|
|
|
err = gpg_error_from_syserror ();
|
|
|
|
|
close_context (ctrl, ctx);
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
snprintf (line, sizeof line, "KS_SEARCH -- %s", escsearchstr);
|
|
|
|
|
xfree (escsearchstr);
|
|
|
|
|
}
|
|
|
|
|
|
2014-03-14 16:12:54 +01:00
|
|
|
|
memset (&stparm, 0, sizeof stparm);
|
2011-01-18 12:51:16 +01:00
|
|
|
|
memset (&parm, 0, sizeof parm);
|
|
|
|
|
init_membuf (&parm.saveddata, 1024);
|
|
|
|
|
parm.data_cb = cb;
|
|
|
|
|
parm.data_cb_value = cb_value;
|
2014-03-14 16:12:54 +01:00
|
|
|
|
parm.stparm = &stparm;
|
2011-01-18 12:51:16 +01:00
|
|
|
|
|
|
|
|
|
err = assuan_transact (ctx, line, ks_search_data_cb, &parm,
|
2014-03-14 16:12:54 +01:00
|
|
|
|
NULL, NULL, ks_status_cb, &stparm);
|
2011-01-18 12:51:16 +01:00
|
|
|
|
if (!err)
|
2014-03-14 16:12:54 +01:00
|
|
|
|
err = cb (cb_value, 0, NULL); /* Send EOF. */
|
2011-01-18 12:51:16 +01:00
|
|
|
|
|
|
|
|
|
xfree (get_membuf (&parm.saveddata, NULL));
|
|
|
|
|
xfree (parm.helpbuf);
|
2014-03-14 16:12:54 +01:00
|
|
|
|
xfree (stparm.source);
|
2011-01-18 12:51:16 +01:00
|
|
|
|
|
|
|
|
|
close_context (ctrl, ctx);
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2011-02-08 21:11:19 +01:00
|
|
|
|
/* Data callback for the KS_GET and KS_FETCH commands. */
|
2011-01-18 12:51:16 +01:00
|
|
|
|
static gpg_error_t
|
|
|
|
|
ks_get_data_cb (void *opaque, const void *data, size_t datalen)
|
|
|
|
|
{
|
|
|
|
|
gpg_error_t err = 0;
|
|
|
|
|
struct ks_get_parm_s *parm = opaque;
|
|
|
|
|
size_t nwritten;
|
|
|
|
|
|
|
|
|
|
if (!data)
|
|
|
|
|
return 0; /* Ignore END commands. */
|
|
|
|
|
|
|
|
|
|
if (es_write (parm->memfp, data, datalen, &nwritten))
|
|
|
|
|
err = gpg_error_from_syserror ();
|
|
|
|
|
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Run the KS_GET command using the patterns in the array PATTERN. On
|
|
|
|
|
success an estream object is returned to retrieve the keys. On
|
|
|
|
|
error an error code is returned and NULL stored at R_FP.
|
|
|
|
|
|
|
|
|
|
The pattern may only use search specification which a keyserver can
|
2014-11-12 12:14:32 +01:00
|
|
|
|
use to retrieve keys. Because we know the format of the pattern we
|
2011-01-18 12:51:16 +01:00
|
|
|
|
don't need to escape the patterns before sending them to the
|
|
|
|
|
server.
|
|
|
|
|
|
2014-03-14 16:12:54 +01:00
|
|
|
|
If R_SOURCE is not NULL the source of the data is stored as a
|
|
|
|
|
malloced string there. If a source is not known NULL is stored.
|
|
|
|
|
|
2011-01-18 12:51:16 +01:00
|
|
|
|
If there are too many patterns the function returns an error. That
|
|
|
|
|
could be fixed by issuing several search commands or by
|
|
|
|
|
implementing a different interface. However with long keyids we
|
|
|
|
|
are able to ask for (1000-10-1)/(2+8+1) = 90 keys at once. */
|
|
|
|
|
gpg_error_t
|
2014-03-14 16:12:54 +01:00
|
|
|
|
gpg_dirmngr_ks_get (ctrl_t ctrl, char **pattern,
|
|
|
|
|
estream_t *r_fp, char **r_source)
|
2011-02-04 12:57:53 +01:00
|
|
|
|
{
|
2011-01-18 12:51:16 +01:00
|
|
|
|
gpg_error_t err;
|
|
|
|
|
assuan_context_t ctx;
|
2014-03-14 16:12:54 +01:00
|
|
|
|
struct ks_status_parm_s stparm;
|
2011-01-18 12:51:16 +01:00
|
|
|
|
struct ks_get_parm_s parm;
|
|
|
|
|
char *line = NULL;
|
|
|
|
|
size_t linelen;
|
|
|
|
|
membuf_t mb;
|
|
|
|
|
int idx;
|
|
|
|
|
|
2014-03-14 16:12:54 +01:00
|
|
|
|
memset (&stparm, 0, sizeof stparm);
|
2011-01-18 12:51:16 +01:00
|
|
|
|
memset (&parm, 0, sizeof parm);
|
|
|
|
|
|
|
|
|
|
*r_fp = NULL;
|
2014-03-14 16:12:54 +01:00
|
|
|
|
if (r_source)
|
|
|
|
|
*r_source = NULL;
|
2011-01-18 12:51:16 +01:00
|
|
|
|
|
|
|
|
|
err = open_context (ctrl, &ctx);
|
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
|
|
|
|
|
|
|
|
|
/* Lump all patterns into one string. */
|
|
|
|
|
init_membuf (&mb, 1024);
|
|
|
|
|
put_membuf_str (&mb, "KS_GET --");
|
|
|
|
|
for (idx=0; pattern[idx]; idx++)
|
2011-01-10 14:30:17 +01:00
|
|
|
|
{
|
2011-01-18 12:51:16 +01:00
|
|
|
|
put_membuf (&mb, " ", 1); /* Append Delimiter. */
|
|
|
|
|
put_membuf_str (&mb, pattern[idx]);
|
|
|
|
|
}
|
|
|
|
|
put_membuf (&mb, "", 1); /* Append Nul. */
|
|
|
|
|
line = get_membuf (&mb, &linelen);
|
|
|
|
|
if (!line)
|
|
|
|
|
{
|
|
|
|
|
err = gpg_error_from_syserror ();
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
if (linelen + 2 >= ASSUAN_LINELENGTH)
|
|
|
|
|
{
|
|
|
|
|
err = gpg_error (GPG_ERR_TOO_MANY);
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
2011-01-10 14:30:17 +01:00
|
|
|
|
|
2011-01-18 12:51:16 +01:00
|
|
|
|
parm.memfp = es_fopenmem (0, "rwb");
|
|
|
|
|
if (!parm.memfp)
|
|
|
|
|
{
|
|
|
|
|
err = gpg_error_from_syserror ();
|
|
|
|
|
goto leave;
|
2011-01-10 14:30:17 +01:00
|
|
|
|
}
|
2011-01-18 12:51:16 +01:00
|
|
|
|
err = assuan_transact (ctx, line, ks_get_data_cb, &parm,
|
2014-03-14 16:12:54 +01:00
|
|
|
|
NULL, NULL, ks_status_cb, &stparm);
|
2011-01-18 12:51:16 +01:00
|
|
|
|
if (err)
|
|
|
|
|
goto leave;
|
2011-01-10 14:30:17 +01:00
|
|
|
|
|
2011-01-18 12:51:16 +01:00
|
|
|
|
es_rewind (parm.memfp);
|
|
|
|
|
*r_fp = parm.memfp;
|
|
|
|
|
parm.memfp = NULL;
|
2011-01-10 14:30:17 +01:00
|
|
|
|
|
2014-03-14 16:12:54 +01:00
|
|
|
|
if (r_source)
|
|
|
|
|
{
|
|
|
|
|
*r_source = stparm.source;
|
|
|
|
|
stparm.source = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-18 12:51:16 +01:00
|
|
|
|
leave:
|
|
|
|
|
es_fclose (parm.memfp);
|
2014-03-14 16:12:54 +01:00
|
|
|
|
xfree (stparm.source);
|
2011-01-18 12:51:16 +01:00
|
|
|
|
xfree (line);
|
2011-01-10 14:30:17 +01:00
|
|
|
|
close_context (ctrl, ctx);
|
2011-02-08 21:11:19 +01:00
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Run the KS_FETCH and pass URL as argument. On success an estream
|
|
|
|
|
object is returned to retrieve the keys. On error an error code is
|
|
|
|
|
returned and NULL stored at R_FP.
|
|
|
|
|
|
|
|
|
|
The url is expected to point to a small set of keys; in many cases
|
|
|
|
|
only to one key. However, schemes like finger may return several
|
|
|
|
|
keys. Note that the configured keyservers are ignored by the
|
|
|
|
|
KS_FETCH command. */
|
|
|
|
|
gpg_error_t
|
|
|
|
|
gpg_dirmngr_ks_fetch (ctrl_t ctrl, const char *url, estream_t *r_fp)
|
|
|
|
|
{
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
assuan_context_t ctx;
|
|
|
|
|
struct ks_get_parm_s parm;
|
|
|
|
|
char *line = NULL;
|
|
|
|
|
|
|
|
|
|
memset (&parm, 0, sizeof parm);
|
|
|
|
|
|
|
|
|
|
*r_fp = NULL;
|
|
|
|
|
|
|
|
|
|
err = open_context (ctrl, &ctx);
|
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
|
|
|
|
|
|
|
|
|
line = strconcat ("KS_FETCH -- ", url, NULL);
|
|
|
|
|
if (!line)
|
|
|
|
|
{
|
|
|
|
|
err = gpg_error_from_syserror ();
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
if (strlen (line) + 2 >= ASSUAN_LINELENGTH)
|
|
|
|
|
{
|
|
|
|
|
err = gpg_error (GPG_ERR_TOO_LARGE);
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
parm.memfp = es_fopenmem (0, "rwb");
|
|
|
|
|
if (!parm.memfp)
|
|
|
|
|
{
|
|
|
|
|
err = gpg_error_from_syserror ();
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
err = assuan_transact (ctx, line, ks_get_data_cb, &parm,
|
|
|
|
|
NULL, NULL, NULL, NULL);
|
|
|
|
|
if (err)
|
|
|
|
|
goto leave;
|
|
|
|
|
|
|
|
|
|
es_rewind (parm.memfp);
|
|
|
|
|
*r_fp = parm.memfp;
|
|
|
|
|
parm.memfp = NULL;
|
|
|
|
|
|
|
|
|
|
leave:
|
|
|
|
|
es_fclose (parm.memfp);
|
|
|
|
|
xfree (line);
|
|
|
|
|
close_context (ctrl, ctx);
|
2011-01-18 12:51:16 +01:00
|
|
|
|
return err;
|
2011-01-10 14:30:17 +01:00
|
|
|
|
}
|
2011-01-20 14:12:53 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2015-03-19 11:02:46 +01:00
|
|
|
|
static void
|
|
|
|
|
record_output (estream_t output,
|
|
|
|
|
pkttype_t type,
|
|
|
|
|
const char *validity,
|
|
|
|
|
/* The public key length or -1. */
|
|
|
|
|
int pub_key_length,
|
|
|
|
|
/* The public key algo or -1. */
|
|
|
|
|
int pub_key_algo,
|
|
|
|
|
/* 2 ulongs or NULL. */
|
|
|
|
|
const u32 *keyid,
|
|
|
|
|
/* The creation / expiration date or 0. */
|
|
|
|
|
u32 creation_date,
|
|
|
|
|
u32 expiration_date,
|
|
|
|
|
const char *userid)
|
|
|
|
|
{
|
|
|
|
|
const char *type_str = NULL;
|
|
|
|
|
char *pub_key_length_str = NULL;
|
|
|
|
|
char *pub_key_algo_str = NULL;
|
|
|
|
|
char *keyid_str = NULL;
|
|
|
|
|
char *creation_date_str = NULL;
|
|
|
|
|
char *expiration_date_str = NULL;
|
|
|
|
|
char *userid_escaped = NULL;
|
|
|
|
|
|
|
|
|
|
switch (type)
|
|
|
|
|
{
|
|
|
|
|
case PKT_PUBLIC_KEY:
|
|
|
|
|
type_str = "pub";
|
|
|
|
|
break;
|
|
|
|
|
case PKT_PUBLIC_SUBKEY:
|
|
|
|
|
type_str = "sub";
|
|
|
|
|
break;
|
|
|
|
|
case PKT_USER_ID:
|
|
|
|
|
type_str = "uid";
|
|
|
|
|
break;
|
|
|
|
|
case PKT_SIGNATURE:
|
|
|
|
|
type_str = "sig";
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
assert (! "Unhandled type.");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (pub_key_length > 0)
|
|
|
|
|
pub_key_length_str = xasprintf ("%d", pub_key_length);
|
|
|
|
|
|
|
|
|
|
if (pub_key_algo != -1)
|
|
|
|
|
pub_key_algo_str = xasprintf ("%d", pub_key_algo);
|
|
|
|
|
|
|
|
|
|
if (keyid)
|
|
|
|
|
keyid_str = xasprintf ("%08lX%08lX", (ulong) keyid[0], (ulong) keyid[1]);
|
|
|
|
|
|
|
|
|
|
if (creation_date)
|
|
|
|
|
creation_date_str = xstrdup (colon_strtime (creation_date));
|
|
|
|
|
|
|
|
|
|
if (expiration_date)
|
|
|
|
|
expiration_date_str = xstrdup (colon_strtime (expiration_date));
|
|
|
|
|
|
|
|
|
|
/* Quote ':', '%', and any 8-bit characters. */
|
|
|
|
|
if (userid)
|
|
|
|
|
{
|
|
|
|
|
int r;
|
|
|
|
|
int w = 0;
|
|
|
|
|
|
|
|
|
|
int len = strlen (userid);
|
|
|
|
|
/* A 100k character limit on the uid should be way more than
|
|
|
|
|
enough. */
|
|
|
|
|
if (len > 100 * 1024)
|
|
|
|
|
len = 100 * 1024;
|
|
|
|
|
|
|
|
|
|
/* The minimum amount of space that we need. */
|
|
|
|
|
userid_escaped = xmalloc (len * 3 + 1);
|
|
|
|
|
|
|
|
|
|
for (r = 0; r < len; r++)
|
|
|
|
|
{
|
|
|
|
|
if (userid[r] == ':' || userid[r]== '%' || (userid[r] & 0x80))
|
|
|
|
|
{
|
|
|
|
|
sprintf (&userid_escaped[w], "%%%02X", (byte) userid[r]);
|
|
|
|
|
w += 3;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
userid_escaped[w ++] = userid[r];
|
|
|
|
|
}
|
|
|
|
|
userid_escaped[w] = '\0';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
es_fprintf (output, "%s:%s:%s:%s:%s:%s:%s:%s:%s:%s:%s:%s:%s:%s:%s:%s:%s\n",
|
|
|
|
|
type_str,
|
|
|
|
|
validity ?: "",
|
|
|
|
|
pub_key_length_str ?: "",
|
|
|
|
|
pub_key_algo_str ?: "",
|
|
|
|
|
keyid_str ?: "",
|
|
|
|
|
creation_date_str ?: "",
|
|
|
|
|
expiration_date_str ?: "",
|
|
|
|
|
"" /* Certificate S/N */,
|
|
|
|
|
"" /* Ownertrust. */,
|
|
|
|
|
userid_escaped ?: "",
|
|
|
|
|
"" /* Signature class. */,
|
|
|
|
|
"" /* Key capabilities. */,
|
|
|
|
|
"" /* Issuer certificate fingerprint. */,
|
|
|
|
|
"" /* Flag field. */,
|
|
|
|
|
"" /* S/N of a token. */,
|
|
|
|
|
"" /* Hash algo. */,
|
|
|
|
|
"" /* Curve name. */);
|
|
|
|
|
|
|
|
|
|
xfree (userid_escaped);
|
|
|
|
|
xfree (expiration_date_str);
|
|
|
|
|
xfree (creation_date_str);
|
|
|
|
|
xfree (keyid_str);
|
|
|
|
|
xfree (pub_key_algo_str);
|
|
|
|
|
xfree (pub_key_length_str);
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-20 14:12:53 +01:00
|
|
|
|
/* Handle the KS_PUT inquiries. */
|
|
|
|
|
static gpg_error_t
|
|
|
|
|
ks_put_inq_cb (void *opaque, const char *line)
|
|
|
|
|
{
|
|
|
|
|
struct ks_put_parm_s *parm = opaque;
|
|
|
|
|
gpg_error_t err = 0;
|
|
|
|
|
|
Use has_leading_keyword in the assuan callbacks.
* agent/call-pinentry.c (inq_quality): Use has_leading_keyword.
* agent/call-scd.c (inq_needpin, inq_writekey_parms): Ditto.
* g10/call-agent.c (inq_writecert_parms, keyinfo_status_cb): Ditto.
(inq_genkey_parms, inq_ciphertext_cb, inq_import_key_parms): Ditto.
* g10/call-dirmngr.c (ks_put_inq_cb): Ditto.
* sm/call-agent.c (default_inq_cb, inq_ciphertext_cb): Ditto.
(inq_genkey_parms, istrusted_status_cb, learn_status_cb): Ditto.
(keyinfo_status_cb, inq_import_key_parms): Ditto.
* sm/call-dirmngr.c (inq_certificate, isvalid_status_cb): Ditto.
(lookup_status_cb, run_command_inq_cb, run_command_status_cb): Ditto.
2013-02-22 10:56:13 +01:00
|
|
|
|
if (has_leading_keyword (line, "KEYBLOCK"))
|
2011-01-20 14:12:53 +01:00
|
|
|
|
{
|
|
|
|
|
if (parm->data)
|
|
|
|
|
err = assuan_send_data (parm->ctx, parm->data, parm->datalen);
|
|
|
|
|
}
|
Use has_leading_keyword in the assuan callbacks.
* agent/call-pinentry.c (inq_quality): Use has_leading_keyword.
* agent/call-scd.c (inq_needpin, inq_writekey_parms): Ditto.
* g10/call-agent.c (inq_writecert_parms, keyinfo_status_cb): Ditto.
(inq_genkey_parms, inq_ciphertext_cb, inq_import_key_parms): Ditto.
* g10/call-dirmngr.c (ks_put_inq_cb): Ditto.
* sm/call-agent.c (default_inq_cb, inq_ciphertext_cb): Ditto.
(inq_genkey_parms, istrusted_status_cb, learn_status_cb): Ditto.
(keyinfo_status_cb, inq_import_key_parms): Ditto.
* sm/call-dirmngr.c (inq_certificate, isvalid_status_cb): Ditto.
(lookup_status_cb, run_command_inq_cb, run_command_status_cb): Ditto.
2013-02-22 10:56:13 +01:00
|
|
|
|
else if (has_leading_keyword (line, "KEYBLOCK_INFO"))
|
2011-01-20 14:12:53 +01:00
|
|
|
|
{
|
|
|
|
|
kbnode_t node;
|
|
|
|
|
estream_t fp;
|
|
|
|
|
|
|
|
|
|
/* Parse the keyblock and send info lines back to the server. */
|
2014-05-06 09:49:26 +02:00
|
|
|
|
fp = es_fopenmem (0, "rw,samethread");
|
2011-01-20 14:12:53 +01:00
|
|
|
|
if (!fp)
|
|
|
|
|
err = gpg_error_from_syserror ();
|
|
|
|
|
|
2015-03-19 11:02:46 +01:00
|
|
|
|
/* Note: the output format for the INFO block follows the colon
|
|
|
|
|
format as described in doc/DETAILS. We don't actually reuse
|
|
|
|
|
the functionality from g10/keylist.c to produce the output,
|
|
|
|
|
because we don't need all of it and some of it is quite
|
|
|
|
|
expensive to generate.
|
|
|
|
|
|
|
|
|
|
The fields are (the starred fields are the ones we need):
|
|
|
|
|
|
|
|
|
|
* Field 1 - Type of record
|
|
|
|
|
* Field 2 - Validity
|
|
|
|
|
* Field 3 - Key length
|
|
|
|
|
* Field 4 - Public key algorithm
|
|
|
|
|
* Field 5 - KeyID
|
|
|
|
|
* Field 6 - Creation date
|
|
|
|
|
* Field 7 - Expiration date
|
|
|
|
|
Field 8 - Certificate S/N, UID hash, trust signature info
|
|
|
|
|
Field 9 - Ownertrust
|
|
|
|
|
* Field 10 - User-ID
|
|
|
|
|
Field 11 - Signature class
|
|
|
|
|
Field 12 - Key capabilities
|
|
|
|
|
Field 13 - Issuer certificate fingerprint or other info
|
|
|
|
|
Field 14 - Flag field
|
|
|
|
|
Field 15 - S/N of a token
|
|
|
|
|
Field 16 - Hash algorithm
|
|
|
|
|
Field 17 - Curve name
|
|
|
|
|
*/
|
2011-01-20 14:12:53 +01:00
|
|
|
|
for (node = parm->keyblock; !err && node; node=node->next)
|
|
|
|
|
{
|
2015-03-19 11:02:46 +01:00
|
|
|
|
switch (node->pkt->pkttype)
|
2011-01-20 14:12:53 +01:00
|
|
|
|
{
|
|
|
|
|
case PKT_PUBLIC_KEY:
|
|
|
|
|
case PKT_PUBLIC_SUBKEY:
|
|
|
|
|
{
|
|
|
|
|
PKT_public_key *pk = node->pkt->pkt.public_key;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2015-03-19 11:02:46 +01:00
|
|
|
|
char validity[3];
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
i = 0;
|
|
|
|
|
if (pk->flags.revoked)
|
|
|
|
|
validity[i ++] = 'r';
|
|
|
|
|
if (pk->has_expired)
|
|
|
|
|
validity[i ++] = 'e';
|
|
|
|
|
validity[i] = '\0';
|
|
|
|
|
|
2011-01-20 14:12:53 +01:00
|
|
|
|
keyid_from_pk (pk, NULL);
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2015-03-19 11:02:46 +01:00
|
|
|
|
record_output (fp, node->pkt->pkttype, validity,
|
|
|
|
|
nbits_from_pk (pk), pk->pubkey_algo,
|
|
|
|
|
pk->keyid, pk->timestamp, pk->expiredate,
|
|
|
|
|
NULL);
|
2011-01-20 14:12:53 +01:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case PKT_USER_ID:
|
|
|
|
|
{
|
|
|
|
|
PKT_user_id *uid = node->pkt->pkt.user_id;
|
|
|
|
|
|
|
|
|
|
if (!uid->attrib_data)
|
|
|
|
|
{
|
2015-03-19 11:02:46 +01:00
|
|
|
|
char validity[3];
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
i = 0;
|
|
|
|
|
if (uid->is_revoked)
|
|
|
|
|
validity[i ++] = 'r';
|
|
|
|
|
if (uid->is_expired)
|
|
|
|
|
validity[i ++] = 'e';
|
|
|
|
|
validity[i] = '\0';
|
|
|
|
|
|
|
|
|
|
record_output (fp, node->pkt->pkttype, validity,
|
|
|
|
|
-1, -1, NULL,
|
|
|
|
|
uid->created, uid->expiredate,
|
|
|
|
|
uid->name);
|
2011-01-20 14:12:53 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
/* This bit is really for the benefit of people who
|
|
|
|
|
store their keys in LDAP servers. It makes it easy
|
|
|
|
|
to do queries for things like "all keys signed by
|
|
|
|
|
Isabella". */
|
|
|
|
|
case PKT_SIGNATURE:
|
|
|
|
|
{
|
|
|
|
|
PKT_signature *sig = node->pkt->pkt.signature;
|
|
|
|
|
|
|
|
|
|
if (IS_UID_SIG (sig))
|
2015-03-19 11:02:46 +01:00
|
|
|
|
record_output (fp, node->pkt->pkttype, NULL,
|
|
|
|
|
-1, -1, sig->keyid,
|
|
|
|
|
sig->timestamp, sig->expiredate, NULL);
|
2011-01-20 14:12:53 +01:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
/* Given that the last operation was an es_fprintf we should
|
|
|
|
|
get the correct ERRNO if ferror indicates an error. */
|
|
|
|
|
if (es_ferror (fp))
|
|
|
|
|
err = gpg_error_from_syserror ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Without an error and if we have an keyblock at all, send the
|
|
|
|
|
data back. */
|
|
|
|
|
if (!err && parm->keyblock)
|
|
|
|
|
{
|
|
|
|
|
int rc;
|
|
|
|
|
char buffer[512];
|
|
|
|
|
size_t nread;
|
|
|
|
|
|
|
|
|
|
es_rewind (fp);
|
|
|
|
|
while (!(rc=es_read (fp, buffer, sizeof buffer, &nread)) && nread)
|
|
|
|
|
{
|
|
|
|
|
err = assuan_send_data (parm->ctx, buffer, nread);
|
|
|
|
|
if (err)
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if (!err && rc)
|
|
|
|
|
err = gpg_error_from_syserror ();
|
|
|
|
|
}
|
|
|
|
|
es_fclose (fp);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
return gpg_error (GPG_ERR_ASS_UNKNOWN_INQUIRE);
|
|
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
|
return err;
|
2011-01-20 14:12:53 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Send a key to the configured server. {DATA,DATLEN} contains the
|
|
|
|
|
key in OpenPGP binary transport format. If KEYBLOCK is not NULL it
|
|
|
|
|
has the internal representaion of that key; this is for example
|
|
|
|
|
used to convey meta data to LDAP keyservers. */
|
|
|
|
|
gpg_error_t
|
|
|
|
|
gpg_dirmngr_ks_put (ctrl_t ctrl, void *data, size_t datalen, kbnode_t keyblock)
|
2011-02-04 12:57:53 +01:00
|
|
|
|
{
|
2011-01-20 14:12:53 +01:00
|
|
|
|
gpg_error_t err;
|
|
|
|
|
assuan_context_t ctx;
|
|
|
|
|
struct ks_put_parm_s parm;
|
|
|
|
|
|
|
|
|
|
memset (&parm, 0, sizeof parm);
|
|
|
|
|
|
|
|
|
|
/* We are going to parse the keyblock, thus we better make sure the
|
|
|
|
|
all information is readily available. */
|
|
|
|
|
if (keyblock)
|
|
|
|
|
merge_keys_and_selfsig (keyblock);
|
|
|
|
|
|
|
|
|
|
err = open_context (ctrl, &ctx);
|
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
|
|
|
|
|
|
|
|
|
parm.ctx = ctx;
|
|
|
|
|
parm.keyblock = keyblock;
|
|
|
|
|
parm.data = data;
|
|
|
|
|
parm.datalen = datalen;
|
|
|
|
|
|
|
|
|
|
err = assuan_transact (ctx, "KS_PUT", NULL, NULL,
|
|
|
|
|
ks_put_inq_cb, &parm, NULL, NULL);
|
|
|
|
|
|
|
|
|
|
close_context (ctrl, ctx);
|
|
|
|
|
return err;
|
|
|
|
|
}
|