2002-06-29 13:46:34 +00:00
|
|
|
/* keyserver.c - generic keyserver code
|
2005-01-06 16:23:47 +00:00
|
|
|
* Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
|
2002-06-29 13:46:34 +00: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 2 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, write to the Free Software
|
|
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
#include <ctype.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <stdlib.h>
|
2002-07-09 19:40:18 +00:00
|
|
|
#include <assert.h>
|
2002-06-29 13:46:34 +00:00
|
|
|
#include "filter.h"
|
|
|
|
#include "keydb.h"
|
|
|
|
#include "status.h"
|
|
|
|
#include "exec.h"
|
|
|
|
#include "main.h"
|
|
|
|
#include "i18n.h"
|
|
|
|
#include "iobuf.h"
|
|
|
|
#include "memory.h"
|
2002-10-14 18:50:28 +00:00
|
|
|
#include "ttyio.h"
|
2002-06-29 13:46:34 +00:00
|
|
|
#include "options.h"
|
|
|
|
#include "packet.h"
|
|
|
|
#include "keyserver-internal.h"
|
|
|
|
#include "util.h"
|
|
|
|
|
|
|
|
#define GET 0
|
|
|
|
#define SEND 1
|
|
|
|
#define SEARCH 2
|
|
|
|
|
2002-10-14 18:50:28 +00:00
|
|
|
struct keyrec
|
|
|
|
{
|
|
|
|
KEYDB_SEARCH_DESC desc;
|
2004-05-10 21:46:00 +00:00
|
|
|
u32 createtime,expiretime;
|
2002-10-14 18:50:28 +00:00
|
|
|
int size,flags;
|
|
|
|
byte type;
|
|
|
|
IOBUF uidbuf;
|
2004-05-10 21:46:00 +00:00
|
|
|
unsigned int lines;
|
2002-10-14 18:50:28 +00:00
|
|
|
};
|
|
|
|
|
2004-04-15 18:16:17 +00:00
|
|
|
/* Tell remote processes about these options */
|
|
|
|
#define REMOTE_TELL (KEYSERVER_INCLUDE_REVOKED|KEYSERVER_INCLUDE_DISABLED|KEYSERVER_INCLUDE_SUBKEYS|KEYSERVER_TRY_DNS_SRV)
|
|
|
|
|
|
|
|
static struct parse_options keyserver_opts[]=
|
|
|
|
{
|
|
|
|
{"include-revoked",KEYSERVER_INCLUDE_REVOKED,NULL},
|
|
|
|
{"include-disabled",KEYSERVER_INCLUDE_DISABLED,NULL},
|
|
|
|
{"include-subkeys",KEYSERVER_INCLUDE_SUBKEYS,NULL},
|
|
|
|
{"keep-temp-files",KEYSERVER_KEEP_TEMP_FILES,NULL},
|
|
|
|
{"refresh-add-fake-v3-keyids",KEYSERVER_ADD_FAKE_V3,NULL},
|
|
|
|
{"auto-key-retrieve",KEYSERVER_AUTO_KEY_RETRIEVE,NULL},
|
|
|
|
{"try-dns-srv",KEYSERVER_TRY_DNS_SRV,NULL},
|
2004-04-19 16:02:11 +00:00
|
|
|
{"honor-keyserver-url",KEYSERVER_HONOR_KEYSERVER_URL,NULL},
|
2004-04-15 18:16:17 +00:00
|
|
|
{NULL,0,NULL}
|
|
|
|
};
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2004-04-19 16:02:11 +00:00
|
|
|
static int keyserver_work(int action,STRLIST list,KEYDB_SEARCH_DESC *desc,
|
|
|
|
int count,struct keyserver_spec *keyserver);
|
2002-10-14 18:50:28 +00:00
|
|
|
|
2004-04-16 15:19:35 +00:00
|
|
|
int
|
2002-06-29 13:46:34 +00:00
|
|
|
parse_keyserver_options(char *options)
|
|
|
|
{
|
2004-04-16 15:19:35 +00:00
|
|
|
int ret=1;
|
|
|
|
char *tok;
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2004-04-16 15:19:35 +00:00
|
|
|
while((tok=optsep(&options)))
|
2002-06-29 13:46:34 +00:00
|
|
|
{
|
2002-07-22 17:52:02 +00:00
|
|
|
if(tok[0]=='\0')
|
|
|
|
continue;
|
|
|
|
|
2004-04-15 18:16:17 +00:00
|
|
|
/* We accept quite a few possible options here - some options to
|
|
|
|
handle specially, the keyserver_options list, and import and
|
2004-04-19 16:02:11 +00:00
|
|
|
export options that pertain to keyserver operations. Note
|
|
|
|
that you must use strncasecmp here as there might be an
|
|
|
|
=argument attached which will foil the use of strcasecmp. */
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2004-04-19 16:02:11 +00:00
|
|
|
if(ascii_strncasecmp(tok,"verbose",7)==0)
|
2004-04-15 18:16:17 +00:00
|
|
|
opt.keyserver_options.verbose++;
|
2004-04-19 16:02:11 +00:00
|
|
|
else if(ascii_strncasecmp(tok,"no-verbose",10)==0)
|
2004-04-15 18:16:17 +00:00
|
|
|
opt.keyserver_options.verbose--;
|
2002-06-29 13:46:34 +00:00
|
|
|
#ifdef EXEC_TEMPFILE_ONLY
|
2004-04-19 16:02:11 +00:00
|
|
|
else if(ascii_strncasecmp(tok,"use-temp-files",14)==0 ||
|
|
|
|
ascii_strncasecmp(tok,"no-use-temp-files",17)==0)
|
2004-09-28 14:50:05 +00:00
|
|
|
log_info(_("WARNING: keyserver option `%s' is not used"
|
2004-09-03 22:06:36 +00:00
|
|
|
" on this platform\n"),tok);
|
2002-06-29 13:46:34 +00:00
|
|
|
#else
|
2004-04-19 16:02:11 +00:00
|
|
|
else if(ascii_strncasecmp(tok,"use-temp-files",14)==0)
|
2004-04-15 18:16:17 +00:00
|
|
|
opt.keyserver_options.options|=KEYSERVER_USE_TEMP_FILES;
|
2004-04-19 16:02:11 +00:00
|
|
|
else if(ascii_strncasecmp(tok,"no-use-temp-files",17)==0)
|
2004-04-15 18:16:17 +00:00
|
|
|
opt.keyserver_options.options&=~KEYSERVER_USE_TEMP_FILES;
|
2002-06-29 13:46:34 +00:00
|
|
|
#endif
|
2004-04-15 18:16:17 +00:00
|
|
|
else if(!parse_options(tok,&opt.keyserver_options.options,
|
|
|
|
keyserver_opts,0)
|
|
|
|
&& !parse_import_options(tok,
|
|
|
|
&opt.keyserver_options.import_options,0)
|
|
|
|
&& !parse_export_options(tok,
|
|
|
|
&opt.keyserver_options.export_options,0))
|
|
|
|
{
|
|
|
|
/* All of the standard options have failed, so the option is
|
|
|
|
destined for a keyserver plugin. */
|
2004-04-16 15:19:35 +00:00
|
|
|
char *arg=argsplit(tok);
|
2004-04-15 18:16:17 +00:00
|
|
|
|
|
|
|
if(arg)
|
|
|
|
{
|
|
|
|
char *joined;
|
|
|
|
|
|
|
|
joined=m_alloc(strlen(tok)+1+strlen(arg)+1);
|
|
|
|
/* Make a canonical name=value form with no
|
|
|
|
spaces */
|
|
|
|
strcpy(joined,tok);
|
|
|
|
strcat(joined,"=");
|
|
|
|
strcat(joined,arg);
|
|
|
|
add_to_strlist(&opt.keyserver_options.other,joined);
|
|
|
|
m_free(joined);
|
|
|
|
}
|
2002-07-22 22:26:14 +00:00
|
|
|
else
|
2004-04-15 18:16:17 +00:00
|
|
|
add_to_strlist(&opt.keyserver_options.other,tok);
|
2002-06-29 13:46:34 +00:00
|
|
|
}
|
|
|
|
}
|
2004-04-16 15:19:35 +00:00
|
|
|
|
|
|
|
return ret;
|
2002-06-29 13:46:34 +00:00
|
|
|
}
|
|
|
|
|
2004-05-08 13:51:14 +00:00
|
|
|
void
|
2004-04-19 16:02:11 +00:00
|
|
|
free_keyserver_spec(struct keyserver_spec *keyserver)
|
|
|
|
{
|
|
|
|
m_free(keyserver->uri);
|
2005-01-22 03:33:12 +00:00
|
|
|
m_free(keyserver->scheme);
|
|
|
|
m_free(keyserver->auth);
|
2004-04-19 16:02:11 +00:00
|
|
|
m_free(keyserver->host);
|
|
|
|
m_free(keyserver->port);
|
2004-05-11 19:36:44 +00:00
|
|
|
m_free(keyserver->path);
|
2004-04-19 16:02:11 +00:00
|
|
|
m_free(keyserver->opaque);
|
|
|
|
m_free(keyserver);
|
|
|
|
}
|
|
|
|
|
2004-04-14 21:33:45 +00:00
|
|
|
struct keyserver_spec *
|
2004-05-11 19:36:44 +00:00
|
|
|
parse_keyserver_uri(const char *uri,int require_scheme,
|
2004-05-08 13:51:14 +00:00
|
|
|
const char *configname,unsigned int configlineno)
|
2002-06-29 13:46:34 +00:00
|
|
|
{
|
2002-07-09 19:40:18 +00:00
|
|
|
int assume_hkp=0;
|
2004-04-14 21:33:45 +00:00
|
|
|
struct keyserver_spec *keyserver;
|
2004-05-11 19:36:44 +00:00
|
|
|
const char *idx;
|
|
|
|
int count;
|
2002-07-09 19:40:18 +00:00
|
|
|
|
|
|
|
assert(uri!=NULL);
|
|
|
|
|
2004-04-14 21:33:45 +00:00
|
|
|
keyserver=m_alloc_clear(sizeof(struct keyserver_spec));
|
|
|
|
|
|
|
|
keyserver->uri=m_strdup(uri);
|
2002-07-09 19:40:18 +00:00
|
|
|
|
2002-06-29 13:46:34 +00:00
|
|
|
/* Get the scheme */
|
|
|
|
|
2004-05-19 03:11:22 +00:00
|
|
|
for(idx=uri,count=0;*idx && *idx!=':';idx++)
|
2005-01-26 21:20:30 +00:00
|
|
|
{
|
|
|
|
count++;
|
|
|
|
|
|
|
|
/* Do we see the start of an RFC-2732 ipv6 address here? If so,
|
|
|
|
there clearly isn't a scheme so get out early. */
|
|
|
|
if(*idx=='[')
|
|
|
|
{
|
|
|
|
/* Was the '[' the first thing in the string? If not, we
|
|
|
|
have a mangled scheme with a [ in it so fail. */
|
|
|
|
if(count==1)
|
|
|
|
break;
|
|
|
|
else
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
}
|
2004-05-11 19:36:44 +00:00
|
|
|
|
|
|
|
if(count==0)
|
|
|
|
goto fail;
|
|
|
|
|
2005-01-26 21:20:30 +00:00
|
|
|
if(*idx=='\0' || *idx=='[')
|
2002-06-29 13:46:34 +00:00
|
|
|
{
|
2004-05-08 13:51:14 +00:00
|
|
|
if(require_scheme)
|
|
|
|
return NULL;
|
|
|
|
|
2002-07-09 19:40:18 +00:00
|
|
|
/* Assume HKP if there is no scheme */
|
|
|
|
assume_hkp=1;
|
2004-05-11 19:36:44 +00:00
|
|
|
keyserver->scheme=m_strdup("hkp");
|
2002-06-29 13:46:34 +00:00
|
|
|
}
|
2002-09-30 03:28:41 +00:00
|
|
|
else
|
|
|
|
{
|
2004-05-11 19:36:44 +00:00
|
|
|
int i;
|
|
|
|
|
|
|
|
keyserver->scheme=m_alloc(count+1);
|
|
|
|
|
2002-09-30 03:28:41 +00:00
|
|
|
/* Force to lowercase */
|
2004-05-11 19:36:44 +00:00
|
|
|
for(i=0;i<count;i++)
|
|
|
|
keyserver->scheme[i]=ascii_tolower(uri[i]);
|
|
|
|
|
|
|
|
keyserver->scheme[i]='\0';
|
2002-09-30 03:28:41 +00:00
|
|
|
|
2004-05-11 19:36:44 +00:00
|
|
|
/* Skip past the scheme and colon */
|
|
|
|
uri+=count+1;
|
2002-09-30 03:28:41 +00:00
|
|
|
}
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2004-05-11 19:36:44 +00:00
|
|
|
if(ascii_strcasecmp(keyserver->scheme,"x-broken-hkp")==0)
|
2002-06-29 13:46:34 +00:00
|
|
|
{
|
|
|
|
deprecated_warning(configname,configlineno,"x-broken-hkp",
|
|
|
|
"--keyserver-options ","broken-http-proxy");
|
2004-05-11 19:36:44 +00:00
|
|
|
m_free(keyserver->scheme);
|
|
|
|
keyserver->scheme=m_strdup("hkp");
|
2003-12-28 16:08:04 +00:00
|
|
|
add_to_strlist(&opt.keyserver_options.other,"broken-http-proxy");
|
2002-06-29 13:46:34 +00:00
|
|
|
}
|
2004-05-11 19:36:44 +00:00
|
|
|
else if(ascii_strcasecmp(keyserver->scheme,"x-hkp")==0)
|
2002-06-29 13:46:34 +00:00
|
|
|
{
|
|
|
|
/* Canonicalize this to "hkp" so it works with both the internal
|
|
|
|
and external keyserver interface. */
|
2004-05-11 19:36:44 +00:00
|
|
|
m_free(keyserver->scheme);
|
|
|
|
keyserver->scheme=m_strdup("hkp");
|
2002-06-29 13:46:34 +00:00
|
|
|
}
|
|
|
|
|
2002-07-09 19:40:18 +00:00
|
|
|
if(assume_hkp || (uri[0]=='/' && uri[1]=='/'))
|
2002-06-29 13:46:34 +00:00
|
|
|
{
|
2002-07-09 19:40:18 +00:00
|
|
|
/* Two slashes means network path. */
|
|
|
|
|
|
|
|
/* Skip over the "//", if any */
|
|
|
|
if(!assume_hkp)
|
|
|
|
uri+=2;
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2004-12-22 18:09:41 +00:00
|
|
|
/* Do we have userinfo auth data present? */
|
|
|
|
for(idx=uri,count=0;*idx && *idx!='@' && *idx!='/';idx++)
|
|
|
|
count++;
|
|
|
|
|
|
|
|
/* We found a @ before the slash, so that means everything
|
|
|
|
before the @ is auth data. */
|
|
|
|
if(*idx=='@')
|
|
|
|
{
|
|
|
|
if(count==0)
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
keyserver->auth=m_alloc(count+1);
|
|
|
|
strncpy(keyserver->auth,uri,count);
|
|
|
|
keyserver->auth[count]='\0';
|
|
|
|
uri+=count+1;
|
|
|
|
}
|
|
|
|
|
2005-01-26 21:20:30 +00:00
|
|
|
/* Is it an RFC-2732 ipv6 [literal address] ? */
|
|
|
|
if(*uri=='[')
|
|
|
|
{
|
|
|
|
for(idx=uri+1,count=1;*idx
|
|
|
|
&& (isxdigit(*idx) || *idx==':' || *idx=='.');idx++)
|
|
|
|
count++;
|
|
|
|
|
|
|
|
/* Is the ipv6 literal address terminated? */
|
|
|
|
if(*idx==']')
|
|
|
|
count++;
|
|
|
|
else
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
for(idx=uri,count=0;*idx && *idx!=':' && *idx!='/';idx++)
|
|
|
|
count++;
|
2004-05-11 19:36:44 +00:00
|
|
|
|
|
|
|
if(count==0)
|
2004-04-14 21:33:45 +00:00
|
|
|
goto fail;
|
|
|
|
|
2004-05-11 19:36:44 +00:00
|
|
|
keyserver->host=m_alloc(count+1);
|
|
|
|
strncpy(keyserver->host,uri,count);
|
|
|
|
keyserver->host[count]='\0';
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2004-05-11 19:36:44 +00:00
|
|
|
/* Skip past the host */
|
|
|
|
uri+=count;
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2004-05-11 19:36:44 +00:00
|
|
|
if(*uri==':')
|
|
|
|
{
|
|
|
|
/* It would seem to be reasonable to limit the range of the
|
|
|
|
ports to values between 1-65535, but RFC 1738 and 1808
|
|
|
|
imply there is no limit. Of course, the real world has
|
|
|
|
limits. */
|
2002-07-09 19:40:18 +00:00
|
|
|
|
2004-05-19 03:11:22 +00:00
|
|
|
for(idx=uri+1,count=0;*idx && *idx!='/';idx++)
|
2002-07-09 19:40:18 +00:00
|
|
|
{
|
2004-05-11 19:36:44 +00:00
|
|
|
count++;
|
2002-07-09 19:40:18 +00:00
|
|
|
|
2004-05-11 19:36:44 +00:00
|
|
|
/* Ports are digits only */
|
|
|
|
if(!digitp(idx))
|
|
|
|
goto fail;
|
2002-07-09 19:40:18 +00:00
|
|
|
}
|
* packet.h, build-packet.c (build_sig_subpkt), export.c
(do_export_stream), import.c (remove_bad_stuff, import), parse-packet.c
(dump_sig_subpkt, parse_one_sig_subpkt): Remove vestigal code for the old
sig cache subpacket. This wasn't completely harmless as it caused
subpacket 101 to disappear on import and export.
* options.h, armor.c, cipher.c, g10.c, keyedit.c, pkclist.c, sign.c,
encode.c, getkey.c, revoke.c: The current flags for different levels of
PGP-ness are massively complex. This is step one in simplifying them. No
functional change yet, just use a macro to check for compliance level.
* sign.c (sign_file): Fix bug that causes spurious compression preference
warning.
* sign.c (clearsign_file): Fix bug that prevents proper warning message
from appearing when clearsigning in --pgp2 mode with a non-v3 RSA key.
* main.h, misc.c (compliance_option_string, compliance_string,
compliance_failure), pkclist.c (build_pk_list), sign.c (sign_file,
clearsign_file), encode.c (encode_crypt, write_pubkey_enc_from_list): New
functions to put the "this message may not be usable...." warning in one
place.
* options.h, g10.c (main): Part two of the simplification. Use a single
enum to indicate what we are compliant to (1991, 2440, PGPx, etc.)
* g10.c (main): Show errors for failure in export, send-keys, recv-keys,
and refresh-keys.
* options.h, g10.c (main): Give algorithm warnings for algorithms chosen
against the --pgpX and --openpgp rules.
* keydb.h, pkclist.c (algo_available): Make TIGER192 invalid in --openpgp
mode.
* sign.c (sign_file), pkclist.c (algo_available): Allow passing a hint of
0.
2003-05-03 04:07:45 +00:00
|
|
|
|
2004-05-11 19:36:44 +00:00
|
|
|
keyserver->port=m_alloc(count+1);
|
|
|
|
strncpy(keyserver->port,uri+1,count);
|
|
|
|
keyserver->port[count]='\0';
|
2004-04-14 21:33:45 +00:00
|
|
|
|
2004-05-11 19:36:44 +00:00
|
|
|
/* Skip past the colon and port number */
|
|
|
|
uri+=1+count;
|
2002-06-29 13:46:34 +00:00
|
|
|
}
|
|
|
|
|
2004-05-11 19:36:44 +00:00
|
|
|
/* Everything else is the path */
|
|
|
|
if(*uri)
|
|
|
|
keyserver->path=m_strdup(uri);
|
|
|
|
else
|
|
|
|
keyserver->path=m_strdup("/");
|
2002-07-09 19:40:18 +00:00
|
|
|
}
|
|
|
|
else if(uri[0]!='/')
|
|
|
|
{
|
|
|
|
/* No slash means opaque. Just record the opaque blob and get
|
|
|
|
out. */
|
2004-04-14 21:33:45 +00:00
|
|
|
keyserver->opaque=m_strdup(uri);
|
2002-07-09 19:40:18 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* One slash means absolute path. We don't need to support that
|
|
|
|
yet. */
|
2004-04-14 21:33:45 +00:00
|
|
|
goto fail;
|
2002-06-29 13:46:34 +00:00
|
|
|
}
|
|
|
|
|
2004-04-14 21:33:45 +00:00
|
|
|
return keyserver;
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2004-04-14 21:33:45 +00:00
|
|
|
fail:
|
2004-04-19 16:02:11 +00:00
|
|
|
free_keyserver_spec(keyserver);
|
2004-04-14 21:33:45 +00:00
|
|
|
|
|
|
|
return NULL;
|
2002-06-29 13:46:34 +00:00
|
|
|
}
|
|
|
|
|
2004-05-22 03:50:20 +00:00
|
|
|
struct keyserver_spec *
|
|
|
|
parse_preferred_keyserver(PKT_signature *sig)
|
|
|
|
{
|
|
|
|
struct keyserver_spec *spec=NULL;
|
|
|
|
const byte *p;
|
|
|
|
size_t plen;
|
|
|
|
|
|
|
|
p=parse_sig_subpkt(sig->hashed,SIGSUBPKT_PREF_KS,&plen);
|
|
|
|
if(p && plen)
|
|
|
|
{
|
|
|
|
byte *dupe=m_alloc(plen+1);
|
|
|
|
|
|
|
|
memcpy(dupe,p,plen);
|
|
|
|
dupe[plen]='\0';
|
2004-12-12 05:10:22 +00:00
|
|
|
spec=parse_keyserver_uri(dupe,1,NULL,0);
|
2004-05-22 03:50:20 +00:00
|
|
|
m_free(dupe);
|
|
|
|
}
|
|
|
|
|
|
|
|
return spec;
|
|
|
|
}
|
|
|
|
|
2002-10-14 18:50:28 +00:00
|
|
|
static void
|
|
|
|
print_keyrec(int number,struct keyrec *keyrec)
|
2002-06-29 13:46:34 +00:00
|
|
|
{
|
2002-10-14 18:50:28 +00:00
|
|
|
int i;
|
|
|
|
|
|
|
|
iobuf_writebyte(keyrec->uidbuf,0);
|
|
|
|
iobuf_flush_temp(keyrec->uidbuf);
|
|
|
|
printf("(%d)\t%s ",number,iobuf_get_temp_buffer(keyrec->uidbuf));
|
|
|
|
|
|
|
|
if(keyrec->size>0)
|
|
|
|
printf("%d bit ",keyrec->size);
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2002-10-14 18:50:28 +00:00
|
|
|
if(keyrec->type)
|
2002-06-29 13:46:34 +00:00
|
|
|
{
|
2002-10-14 18:50:28 +00:00
|
|
|
const char *str=pubkey_algo_to_string(keyrec->type);
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2002-10-14 18:50:28 +00:00
|
|
|
if(str)
|
|
|
|
printf("%s ",str);
|
2002-06-29 13:46:34 +00:00
|
|
|
else
|
2002-10-14 18:50:28 +00:00
|
|
|
printf("unknown ");
|
|
|
|
}
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2002-10-14 18:50:28 +00:00
|
|
|
switch(keyrec->desc.mode)
|
|
|
|
{
|
2004-03-05 00:01:25 +00:00
|
|
|
/* If the keyserver helper gave us a short keyid, we have no
|
|
|
|
choice but to use it. Do check --keyid-format to add a 0x if
|
|
|
|
needed. */
|
2002-10-14 18:50:28 +00:00
|
|
|
case KEYDB_SEARCH_MODE_SHORT_KID:
|
2004-03-05 00:01:25 +00:00
|
|
|
printf("key %s%08lX",
|
|
|
|
(opt.keyid_format==KF_0xSHORT
|
|
|
|
|| opt.keyid_format==KF_0xLONG)?"0x":"",
|
|
|
|
(ulong)keyrec->desc.u.kid[1]);
|
2002-10-14 18:50:28 +00:00
|
|
|
break;
|
|
|
|
|
2004-03-05 00:01:25 +00:00
|
|
|
/* However, if it gave us a long keyid, we can honor
|
|
|
|
--keyid-format */
|
2002-10-14 18:50:28 +00:00
|
|
|
case KEYDB_SEARCH_MODE_LONG_KID:
|
2004-03-05 00:01:25 +00:00
|
|
|
printf("key %s",keystr(keyrec->desc.u.kid));
|
2002-10-14 18:50:28 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case KEYDB_SEARCH_MODE_FPR16:
|
|
|
|
printf("key ");
|
|
|
|
for(i=0;i<16;i++)
|
2004-09-21 22:24:47 +00:00
|
|
|
printf("%02X",keyrec->desc.u.fpr[i]);
|
2002-10-14 18:50:28 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case KEYDB_SEARCH_MODE_FPR20:
|
|
|
|
printf("key ");
|
|
|
|
for(i=0;i<20;i++)
|
2004-09-21 22:24:47 +00:00
|
|
|
printf("%02X",keyrec->desc.u.fpr[i]);
|
2002-10-14 18:50:28 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
BUG();
|
|
|
|
break;
|
2002-06-29 13:46:34 +00:00
|
|
|
}
|
2002-10-14 18:50:28 +00:00
|
|
|
|
|
|
|
if(keyrec->createtime>0)
|
2004-09-29 17:41:58 +00:00
|
|
|
{
|
|
|
|
printf(", ");
|
|
|
|
printf(_("created: %s"),strtimestamp(keyrec->createtime));
|
|
|
|
}
|
2002-10-14 18:50:28 +00:00
|
|
|
|
|
|
|
if(keyrec->expiretime>0)
|
2004-10-06 19:51:45 +00:00
|
|
|
{
|
|
|
|
printf(", ");
|
|
|
|
printf(_("expires: %s"),strtimestamp(keyrec->expiretime));
|
|
|
|
}
|
2002-10-14 18:50:28 +00:00
|
|
|
|
|
|
|
if(keyrec->flags&1)
|
2004-09-29 17:41:58 +00:00
|
|
|
printf(" (%s)",_("revoked"));
|
2002-10-14 18:50:28 +00:00
|
|
|
if(keyrec->flags&2)
|
2004-09-29 17:41:58 +00:00
|
|
|
printf(" (%s)",_("disabled"));
|
2002-10-14 18:50:28 +00:00
|
|
|
if(keyrec->flags&4)
|
2004-09-29 17:41:58 +00:00
|
|
|
printf(" (%s)",_("expired"));
|
2002-10-14 18:50:28 +00:00
|
|
|
|
|
|
|
printf("\n");
|
2002-06-29 13:46:34 +00:00
|
|
|
}
|
|
|
|
|
2002-10-14 18:50:28 +00:00
|
|
|
/* Returns a keyrec (which must be freed) once a key is complete, and
|
|
|
|
NULL otherwise. Call with a NULL keystring once key parsing is
|
|
|
|
complete to return any unfinished keys. */
|
|
|
|
static struct keyrec *
|
|
|
|
parse_keyrec(char *keystring)
|
2002-06-29 13:46:34 +00:00
|
|
|
{
|
2002-10-14 18:50:28 +00:00
|
|
|
static struct keyrec *work=NULL;
|
|
|
|
struct keyrec *ret=NULL;
|
2002-11-01 16:15:45 +00:00
|
|
|
char *record;
|
2002-10-14 18:50:28 +00:00
|
|
|
int i;
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2002-10-14 18:50:28 +00:00
|
|
|
if(keystring==NULL)
|
|
|
|
{
|
|
|
|
if(work==NULL)
|
|
|
|
return NULL;
|
|
|
|
else if(work->desc.mode==KEYDB_SEARCH_MODE_NONE)
|
|
|
|
{
|
|
|
|
m_free(work);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ret=work;
|
|
|
|
work=NULL;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
}
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2002-10-14 18:50:28 +00:00
|
|
|
if(work==NULL)
|
|
|
|
{
|
|
|
|
work=m_alloc_clear(sizeof(struct keyrec));
|
|
|
|
work->uidbuf=iobuf_temp();
|
|
|
|
}
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2002-10-14 18:50:28 +00:00
|
|
|
/* Remove trailing whitespace */
|
|
|
|
for(i=strlen(keystring);i>0;i--)
|
* parse-packet.c (parse_signature): No need to reserve 8 bytes for the
unhashed signature cache any longer.
* misc.c (pct_expando): Add two new expandos - signer's fingerprint (%g),
and signer's primary fingerprint (%p).
* Makefile.am: Include W32LIBS where appropriate.
* g10.c (main): Add --rfc2440 alias for --openpgp since in a few months,
they won't be the same thing.
* keyserver.c (parse_keyserver_uri): Accept "http" as an alias for "hkp",
since it is occasionally written that way. (keyserver_spawn): Use
ascii_isspace to avoid locale issues.
* keygen.c (ask_user_id): Make --allow-freeform-uid apply to the email
field as well as the name field, and allow mixing fields when it is set.
* options.skel: Use subkeys.pgp.net as the default keyserver.
* trustdb.c (validate_one_keyblock): Certifications on revoked or expired
uids do not count in the web of trust.
* signal.c (init_one_signal, pause_on_sigusr, do_block): Only use
sigprocmask() if we have sigset_t, and only use sigaction() if we have
struct sigaction. This is for Forte c89 on Solaris which seems to define
only the function call half of the two pairs by default.
(pause_on_sigusr): Typo. (do_block): If we can't use sigprocmask() and
sigset_t, try to get the number of signals from NSIG as well as MAXSIG,
and if we can't, fail with an explanation.
* signal.c, tdbio.c: Comment out the transaction code. It was not used in
this version, and was causing some build problems on quasi-posix platforms
(Solaris and Forte c89).
* keylist.c (list_keyblock_colon): Don't include validity values when
listing secret keys since they can be incorrect and/or misleading. This
is a temporary kludge, and will be handled properly in 1.9/2.0.
* mainproc.c (check_sig_and_print): Only show the "key available from"
preferred keyserver line if the key is not currently present.
* keyedit.c (sign_uids): Do not sign expired uids without --expert (same
behavior as revoked uids). Do not allow signing a user ID without a
self-signature. --expert overrides. Add additional prompt to the
signature level question. (menu_expire): When changing expiration dates,
don't replace selfsigs on revoked uids since this would effectively
unrevoke them. There is also no point in replacing expired selfsigs.
This is bug #181
* g10.c (add_notation_data): Make sure that only ascii is passed to
iscntrl. Noted by Christian Biere.
* getkey.c (classify_user_id2): Replaced isspace by spacep
* keygen.c (ask_user_id): Ditto. (get_parameter_algo): Ditto.
* keyedit.c (keyedit_menu): Ditto.
* tdbdump.c (import_ownertrust): Ditto. s/isxdigit/hexdigitp/.
* revoke.c (ask_revocation_reason):
* keyserver.c (keyserver_spawn): Dito.
2003-07-10 14:30:07 +00:00
|
|
|
if(ascii_isspace(keystring[i-1]))
|
2002-10-14 18:50:28 +00:00
|
|
|
keystring[i-1]='\0';
|
|
|
|
else
|
|
|
|
break;
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2002-10-14 18:50:28 +00:00
|
|
|
if((record=strsep(&keystring,":"))==NULL)
|
|
|
|
return ret;
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2002-10-14 18:50:28 +00:00
|
|
|
if(ascii_strcasecmp("pub",record)==0)
|
|
|
|
{
|
2002-11-01 16:15:45 +00:00
|
|
|
char *tok;
|
|
|
|
|
2002-10-14 18:50:28 +00:00
|
|
|
if(work->desc.mode)
|
|
|
|
{
|
|
|
|
ret=work;
|
|
|
|
work=m_alloc_clear(sizeof(struct keyrec));
|
|
|
|
work->uidbuf=iobuf_temp();
|
|
|
|
}
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2002-10-14 18:50:28 +00:00
|
|
|
if((tok=strsep(&keystring,":"))==NULL)
|
|
|
|
return ret;
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2002-10-14 18:50:28 +00:00
|
|
|
classify_user_id(tok,&work->desc);
|
|
|
|
if(work->desc.mode!=KEYDB_SEARCH_MODE_SHORT_KID
|
|
|
|
&& work->desc.mode!=KEYDB_SEARCH_MODE_LONG_KID
|
|
|
|
&& work->desc.mode!=KEYDB_SEARCH_MODE_FPR16
|
|
|
|
&& work->desc.mode!=KEYDB_SEARCH_MODE_FPR20)
|
|
|
|
{
|
|
|
|
work->desc.mode=KEYDB_SEARCH_MODE_NONE;
|
|
|
|
return ret;
|
|
|
|
}
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2002-10-14 18:50:28 +00:00
|
|
|
/* Note all items after this are optional. This allows us to
|
|
|
|
have a pub line as simple as pub:keyid and nothing else. */
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2002-10-14 18:50:28 +00:00
|
|
|
work->lines++;
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2002-10-14 18:50:28 +00:00
|
|
|
if((tok=strsep(&keystring,":"))==NULL)
|
|
|
|
return ret;
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2002-10-14 18:50:28 +00:00
|
|
|
work->type=atoi(tok);
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2002-10-14 18:50:28 +00:00
|
|
|
if((tok=strsep(&keystring,":"))==NULL)
|
|
|
|
return ret;
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2002-10-14 18:50:28 +00:00
|
|
|
work->size=atoi(tok);
|
|
|
|
|
|
|
|
if((tok=strsep(&keystring,":"))==NULL)
|
|
|
|
return ret;
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2004-09-28 14:50:05 +00:00
|
|
|
if(atoi(tok)<=0)
|
2004-05-10 21:46:00 +00:00
|
|
|
work->createtime=0;
|
|
|
|
else
|
|
|
|
work->createtime=atoi(tok);
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2002-10-14 18:50:28 +00:00
|
|
|
if((tok=strsep(&keystring,":"))==NULL)
|
|
|
|
return ret;
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2004-09-28 14:50:05 +00:00
|
|
|
if(atoi(tok)<=0)
|
2004-05-10 21:46:00 +00:00
|
|
|
work->expiretime=0;
|
|
|
|
else
|
2004-09-03 22:06:36 +00:00
|
|
|
{
|
|
|
|
work->expiretime=atoi(tok);
|
|
|
|
/* Force the 'e' flag on if this key is expired. */
|
|
|
|
if(work->expiretime<=make_timestamp())
|
|
|
|
work->flags|=4;
|
|
|
|
}
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2002-10-14 18:50:28 +00:00
|
|
|
if((tok=strsep(&keystring,":"))==NULL)
|
|
|
|
return ret;
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2002-10-14 18:50:28 +00:00
|
|
|
while(*tok)
|
|
|
|
switch(*tok++)
|
|
|
|
{
|
|
|
|
case 'r':
|
|
|
|
case 'R':
|
|
|
|
work->flags|=1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'd':
|
|
|
|
case 'D':
|
|
|
|
work->flags|=2;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'e':
|
|
|
|
case 'E':
|
|
|
|
work->flags|=4;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if(ascii_strcasecmp("uid",record)==0 && work->desc.mode)
|
|
|
|
{
|
|
|
|
char *userid,*tok,*decoded;
|
2002-08-28 19:34:58 +00:00
|
|
|
|
2002-10-14 18:50:28 +00:00
|
|
|
if((tok=strsep(&keystring,":"))==NULL)
|
|
|
|
return ret;
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2002-10-14 18:50:28 +00:00
|
|
|
if(strlen(tok)==0)
|
|
|
|
return ret;
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2002-10-14 18:50:28 +00:00
|
|
|
userid=tok;
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2002-10-14 18:50:28 +00:00
|
|
|
/* By definition, de-%-encoding is always smaller than the
|
|
|
|
original string so we can decode in place. */
|
|
|
|
|
2002-11-01 16:15:45 +00:00
|
|
|
i=0;
|
|
|
|
|
2002-10-14 18:50:28 +00:00
|
|
|
while(*tok)
|
|
|
|
if(tok[0]=='%' && tok[1] && tok[2])
|
|
|
|
{
|
|
|
|
if((userid[i]=hextobyte(&tok[1]))==-1)
|
|
|
|
userid[i]='?';
|
|
|
|
|
|
|
|
i++;
|
|
|
|
tok+=3;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
userid[i++]=*tok++;
|
|
|
|
|
|
|
|
/* We don't care about the other info provided in the uid: line
|
|
|
|
since no keyserver supports marking userids with timestamps
|
|
|
|
or revoked/expired/disabled yet. */
|
|
|
|
|
|
|
|
/* No need to check for control characters, as utf8_to_native
|
|
|
|
does this for us. */
|
|
|
|
|
|
|
|
decoded=utf8_to_native(userid,i,0);
|
2004-01-24 00:47:45 +00:00
|
|
|
if(strlen(decoded)>opt.screen_columns-10)
|
|
|
|
decoded[opt.screen_columns-10]='\0';
|
2002-10-14 18:50:28 +00:00
|
|
|
iobuf_writestr(work->uidbuf,decoded);
|
|
|
|
m_free(decoded);
|
|
|
|
iobuf_writestr(work->uidbuf,"\n\t");
|
|
|
|
work->lines++;
|
|
|
|
}
|
2004-02-22 00:36:34 +00:00
|
|
|
|
2002-10-14 18:50:28 +00:00
|
|
|
/* Ignore any records other than "pri" and "uid" for easy future
|
|
|
|
growth. */
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* TODO: do this as a list sent to keyserver_work rather than calling
|
|
|
|
it once for each key to get the correct counts after the import
|
|
|
|
(cosmetics, really) and to better take advantage of the keyservers
|
|
|
|
that can do multiple fetches in one go (LDAP). */
|
|
|
|
static int
|
|
|
|
show_prompt(KEYDB_SEARCH_DESC *desc,int numdesc,int count,const char *search)
|
|
|
|
{
|
|
|
|
char *answer;
|
|
|
|
|
2002-11-05 04:28:40 +00:00
|
|
|
if(count && opt.command_fd==-1)
|
2002-10-14 18:50:28 +00:00
|
|
|
{
|
|
|
|
static int from=1;
|
|
|
|
tty_printf("Keys %d-%d of %d for \"%s\". ",from,numdesc,count,search);
|
|
|
|
from=numdesc+1;
|
|
|
|
}
|
|
|
|
|
|
|
|
answer=cpr_get_no_help("keysearch.prompt",
|
|
|
|
_("Enter number(s), N)ext, or Q)uit > "));
|
|
|
|
/* control-d */
|
|
|
|
if(answer[0]=='\x04')
|
|
|
|
{
|
|
|
|
printf("Q\n");
|
|
|
|
answer[0]='q';
|
|
|
|
}
|
|
|
|
|
|
|
|
if(answer[0]=='q' || answer[0]=='Q')
|
|
|
|
{
|
|
|
|
m_free(answer);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
else if(atoi(answer)>=1 && atoi(answer)<=numdesc)
|
|
|
|
{
|
|
|
|
char *split=answer,*num;
|
|
|
|
|
|
|
|
while((num=strsep(&split," ,"))!=NULL)
|
|
|
|
if(atoi(num)>=1 && atoi(num)<=numdesc)
|
2004-04-19 16:02:11 +00:00
|
|
|
keyserver_work(GET,NULL,&desc[atoi(num)-1],1,opt.keyserver);
|
2002-10-14 18:50:28 +00:00
|
|
|
|
|
|
|
m_free(answer);
|
|
|
|
return 1;
|
|
|
|
}
|
2002-06-29 13:46:34 +00:00
|
|
|
|
|
|
|
return 0;
|
2002-10-14 18:50:28 +00:00
|
|
|
}
|
2002-09-10 08:40:12 +00:00
|
|
|
|
2002-10-14 18:50:28 +00:00
|
|
|
/* Count and searchstr are just for cosmetics. If the count is too
|
|
|
|
small, it will grow safely. If negative it disables the "Key x-y
|
2004-08-23 14:39:48 +00:00
|
|
|
of z" messages. searchstr should be UTF-8 (rather than native). */
|
2002-10-14 18:50:28 +00:00
|
|
|
static void
|
|
|
|
keyserver_search_prompt(IOBUF buffer,const char *searchstr)
|
|
|
|
{
|
2004-05-10 21:46:00 +00:00
|
|
|
int i=0,validcount=0,started=0,header=0,count=1;
|
|
|
|
unsigned int maxlen,buflen,numlines=0;
|
2002-10-14 18:50:28 +00:00
|
|
|
KEYDB_SEARCH_DESC *desc;
|
|
|
|
byte *line=NULL;
|
2004-08-23 14:39:48 +00:00
|
|
|
char *localstr=NULL;
|
|
|
|
|
|
|
|
if(searchstr)
|
|
|
|
localstr=utf8_to_native(searchstr,strlen(searchstr),0);
|
2002-10-14 18:50:28 +00:00
|
|
|
|
|
|
|
desc=m_alloc(count*sizeof(KEYDB_SEARCH_DESC));
|
|
|
|
|
|
|
|
for(;;)
|
|
|
|
{
|
|
|
|
struct keyrec *keyrec;
|
|
|
|
int rl;
|
|
|
|
|
|
|
|
maxlen=1024;
|
|
|
|
rl=iobuf_read_line(buffer,&line,&buflen,&maxlen);
|
|
|
|
|
2002-11-05 04:28:40 +00:00
|
|
|
if(opt.with_colons)
|
|
|
|
{
|
|
|
|
if(!header && ascii_strncasecmp("SEARCH ",line,7)==0
|
|
|
|
&& ascii_strncasecmp(" BEGIN",&line[strlen(line)-7],6)==0)
|
|
|
|
{
|
|
|
|
header=1;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
else if(ascii_strncasecmp("SEARCH ",line,7)==0
|
|
|
|
&& ascii_strncasecmp(" END",&line[strlen(line)-5],4)==0)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
printf("%s",line);
|
|
|
|
}
|
|
|
|
|
2002-10-14 18:50:28 +00:00
|
|
|
/* Look for an info: line. The only current info: values
|
|
|
|
defined are the version and key count. */
|
|
|
|
if(!started && rl>0 && ascii_strncasecmp("info:",line,5)==0)
|
|
|
|
{
|
|
|
|
char *tok,*str=&line[5];
|
|
|
|
|
|
|
|
if((tok=strsep(&str,":"))!=NULL)
|
|
|
|
{
|
|
|
|
int version;
|
|
|
|
|
|
|
|
if(sscanf(tok,"%d",&version)!=1)
|
|
|
|
version=1;
|
|
|
|
|
|
|
|
if(version!=1)
|
|
|
|
{
|
|
|
|
log_error(_("invalid keyserver protocol "
|
|
|
|
"(us %d!=handler %d)\n"),1,version);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if((tok=strsep(&str,":"))!=NULL && sscanf(tok,"%d",&count)==1)
|
|
|
|
{
|
|
|
|
if(count==0)
|
|
|
|
goto notfound;
|
|
|
|
else if(count<0)
|
|
|
|
count=10;
|
|
|
|
else
|
|
|
|
validcount=1;
|
|
|
|
|
|
|
|
desc=m_realloc(desc,count*sizeof(KEYDB_SEARCH_DESC));
|
|
|
|
}
|
|
|
|
|
|
|
|
started=1;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(rl==0)
|
|
|
|
{
|
|
|
|
keyrec=parse_keyrec(NULL);
|
|
|
|
|
|
|
|
if(keyrec==NULL)
|
|
|
|
{
|
|
|
|
if(i==0)
|
|
|
|
{
|
|
|
|
count=0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(i!=count)
|
|
|
|
validcount=0;
|
|
|
|
|
|
|
|
for(;;)
|
|
|
|
{
|
2004-08-23 14:39:48 +00:00
|
|
|
if(show_prompt(desc,i,validcount?count:0,localstr))
|
2002-10-14 18:50:28 +00:00
|
|
|
break;
|
|
|
|
validcount=0;
|
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
keyrec=parse_keyrec(line);
|
|
|
|
|
|
|
|
if(i==count)
|
|
|
|
{
|
|
|
|
/* keyserver helper sent more keys than they claimed in the
|
|
|
|
info: line. */
|
|
|
|
count+=10;
|
|
|
|
desc=m_realloc(desc,count*sizeof(KEYDB_SEARCH_DESC));
|
|
|
|
validcount=0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(keyrec)
|
|
|
|
{
|
|
|
|
desc[i]=keyrec->desc;
|
|
|
|
|
2002-11-05 16:11:04 +00:00
|
|
|
if(!opt.with_colons)
|
2002-10-14 18:50:28 +00:00
|
|
|
{
|
2004-01-24 00:47:45 +00:00
|
|
|
/* screen_lines - 1 for the prompt. */
|
|
|
|
if(numlines+keyrec->lines>opt.screen_lines-1)
|
2002-11-05 16:11:04 +00:00
|
|
|
{
|
2004-08-23 14:39:48 +00:00
|
|
|
if(show_prompt(desc,i,validcount?count:0,localstr))
|
2002-11-05 16:11:04 +00:00
|
|
|
break;
|
|
|
|
else
|
|
|
|
numlines=0;
|
|
|
|
}
|
2002-10-14 18:50:28 +00:00
|
|
|
|
2002-11-05 16:11:04 +00:00
|
|
|
print_keyrec(i+1,keyrec);
|
|
|
|
}
|
2002-11-05 04:28:40 +00:00
|
|
|
|
2002-10-14 18:50:28 +00:00
|
|
|
numlines+=keyrec->lines;
|
|
|
|
iobuf_close(keyrec->uidbuf);
|
|
|
|
m_free(keyrec);
|
|
|
|
|
|
|
|
started=1;
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
notfound:
|
|
|
|
if(count==0)
|
|
|
|
{
|
2004-08-23 14:39:48 +00:00
|
|
|
if(localstr)
|
|
|
|
log_info(_("key \"%s\" not found on keyserver\n"),localstr);
|
2002-10-14 18:50:28 +00:00
|
|
|
else
|
|
|
|
log_info(_("key not found on keyserver\n"));
|
|
|
|
}
|
2004-08-23 14:39:48 +00:00
|
|
|
|
|
|
|
m_free(localstr);
|
|
|
|
m_free(desc);
|
|
|
|
m_free(line);
|
2002-06-29 13:46:34 +00:00
|
|
|
}
|
|
|
|
|
2004-12-22 17:49:44 +00:00
|
|
|
/* We sometimes want to use a different gpgkeys_xxx for a given
|
|
|
|
protocol (for example, ldaps is handled by gpgkeys_ldap). Map
|
|
|
|
these here. */
|
|
|
|
static const char *
|
|
|
|
keyserver_typemap(const char *type)
|
|
|
|
{
|
|
|
|
if(strcmp(type,"ldaps")==0)
|
|
|
|
return "ldap";
|
2004-12-24 19:51:02 +00:00
|
|
|
#ifdef FTP_VIA_LIBCURL
|
2004-12-22 17:49:44 +00:00
|
|
|
else if(strcmp(type,"ftp")==0)
|
|
|
|
return "curl";
|
2004-12-24 19:51:02 +00:00
|
|
|
#endif
|
2005-01-26 21:20:30 +00:00
|
|
|
#ifdef FTPS_VIA_LIBCURL
|
|
|
|
else if(strcmp(type,"ftps")==0)
|
|
|
|
return "curl";
|
|
|
|
#endif
|
2004-12-24 19:51:02 +00:00
|
|
|
#ifdef HTTP_VIA_LIBCURL
|
2004-12-22 17:49:44 +00:00
|
|
|
else if(strcmp(type,"http")==0)
|
|
|
|
return "curl";
|
2005-01-22 03:33:12 +00:00
|
|
|
#endif
|
|
|
|
#ifdef HTTPS_VIA_LIBCURL
|
|
|
|
else if(strcmp(type,"https")==0)
|
|
|
|
return "curl";
|
2004-12-24 19:51:02 +00:00
|
|
|
#endif
|
2004-12-22 17:49:44 +00:00
|
|
|
else
|
|
|
|
return type;
|
|
|
|
}
|
|
|
|
|
2002-06-29 13:46:34 +00:00
|
|
|
#define KEYSERVER_ARGS_KEEP " -o \"%O\" \"%I\""
|
|
|
|
#define KEYSERVER_ARGS_NOKEEP " -o \"%o\" \"%i\""
|
|
|
|
|
|
|
|
static int
|
2004-04-19 16:02:11 +00:00
|
|
|
keyserver_spawn(int action,STRLIST list,KEYDB_SEARCH_DESC *desc,
|
|
|
|
int count,int *prog,struct keyserver_spec *keyserver)
|
2002-06-29 13:46:34 +00:00
|
|
|
{
|
|
|
|
int ret=0,i,gotversion=0,outofband=0;
|
|
|
|
STRLIST temp;
|
2002-09-19 17:13:03 +00:00
|
|
|
unsigned int maxlen,buflen;
|
2002-06-29 13:46:34 +00:00
|
|
|
char *command=NULL,*searchstr=NULL;
|
|
|
|
byte *line=NULL;
|
2004-04-15 18:16:17 +00:00
|
|
|
struct parse_options *kopts;
|
2002-06-29 13:46:34 +00:00
|
|
|
struct exec_info *spawn;
|
2004-12-22 17:49:44 +00:00
|
|
|
const char *scheme;
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2004-04-19 16:02:11 +00:00
|
|
|
assert(keyserver);
|
2004-04-14 21:33:45 +00:00
|
|
|
|
2004-04-29 03:42:54 +00:00
|
|
|
#ifdef EXEC_TEMPFILE_ONLY
|
2004-05-21 12:29:53 +00:00
|
|
|
opt.keyserver_options.options|=KEYSERVER_USE_TEMP_FILES;
|
2004-04-29 03:42:54 +00:00
|
|
|
#endif
|
|
|
|
|
2002-07-30 16:48:21 +00:00
|
|
|
/* Push the libexecdir into path. If DISABLE_KEYSERVER_PATH is set,
|
|
|
|
use the 0 arg to replace the path. */
|
|
|
|
#ifdef DISABLE_KEYSERVER_PATH
|
|
|
|
set_exec_path(GNUPG_LIBEXECDIR,0);
|
|
|
|
#else
|
2002-07-24 19:24:08 +00:00
|
|
|
set_exec_path(GNUPG_LIBEXECDIR,opt.exec_path_set);
|
|
|
|
#endif
|
|
|
|
|
2002-07-30 16:48:21 +00:00
|
|
|
/* Build the filename for the helper to execute */
|
2004-12-22 17:49:44 +00:00
|
|
|
scheme=keyserver_typemap(keyserver->scheme);
|
|
|
|
command=m_alloc(strlen("gpgkeys_")+strlen(scheme)+1);
|
2004-12-14 07:49:27 +00:00
|
|
|
strcpy(command,"gpgkeys_");
|
2004-12-22 17:49:44 +00:00
|
|
|
strcat(command,scheme);
|
2004-12-14 07:49:27 +00:00
|
|
|
|
2004-04-15 18:16:17 +00:00
|
|
|
if(opt.keyserver_options.options&KEYSERVER_USE_TEMP_FILES)
|
2002-06-29 13:46:34 +00:00
|
|
|
{
|
2004-04-15 18:16:17 +00:00
|
|
|
if(opt.keyserver_options.options&KEYSERVER_KEEP_TEMP_FILES)
|
2002-06-29 13:46:34 +00:00
|
|
|
{
|
|
|
|
command=m_realloc(command,strlen(command)+
|
|
|
|
strlen(KEYSERVER_ARGS_KEEP)+1);
|
|
|
|
strcat(command,KEYSERVER_ARGS_KEEP);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
command=m_realloc(command,strlen(command)+
|
|
|
|
strlen(KEYSERVER_ARGS_NOKEEP)+1);
|
|
|
|
strcat(command,KEYSERVER_ARGS_NOKEEP);
|
|
|
|
}
|
|
|
|
|
|
|
|
ret=exec_write(&spawn,NULL,command,NULL,0,0);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
ret=exec_write(&spawn,command,NULL,NULL,0,0);
|
|
|
|
|
|
|
|
if(ret)
|
|
|
|
return ret;
|
|
|
|
|
2004-09-03 22:06:36 +00:00
|
|
|
fprintf(spawn->tochild,
|
|
|
|
"# This is a GnuPG %s keyserver communications file\n",VERSION);
|
2002-06-29 13:46:34 +00:00
|
|
|
fprintf(spawn->tochild,"VERSION %d\n",KEYSERVER_PROTO_VERSION);
|
|
|
|
fprintf(spawn->tochild,"PROGRAM %s\n",VERSION);
|
2004-04-19 16:02:11 +00:00
|
|
|
fprintf(spawn->tochild,"SCHEME %s\n",keyserver->scheme);
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2004-04-19 16:02:11 +00:00
|
|
|
if(keyserver->opaque)
|
|
|
|
fprintf(spawn->tochild,"OPAQUE %s\n",keyserver->opaque);
|
2002-07-09 19:40:18 +00:00
|
|
|
else
|
|
|
|
{
|
2004-12-22 18:09:41 +00:00
|
|
|
if(keyserver->auth)
|
|
|
|
fprintf(spawn->tochild,"AUTH %s\n",keyserver->auth);
|
|
|
|
|
2004-04-19 16:02:11 +00:00
|
|
|
if(keyserver->host)
|
|
|
|
fprintf(spawn->tochild,"HOST %s\n",keyserver->host);
|
2002-07-09 19:40:18 +00:00
|
|
|
|
2004-04-19 16:02:11 +00:00
|
|
|
if(keyserver->port)
|
|
|
|
fprintf(spawn->tochild,"PORT %s\n",keyserver->port);
|
2004-05-11 19:36:44 +00:00
|
|
|
|
|
|
|
if(keyserver->path)
|
|
|
|
fprintf(spawn->tochild,"PATH %s\n",keyserver->path);
|
2002-07-09 19:40:18 +00:00
|
|
|
}
|
2002-06-29 13:46:34 +00:00
|
|
|
|
|
|
|
/* Write options */
|
|
|
|
|
|
|
|
for(i=0,kopts=keyserver_opts;kopts[i].name;i++)
|
2004-04-15 18:16:17 +00:00
|
|
|
if(opt.keyserver_options.options & kopts[i].bit & REMOTE_TELL)
|
2002-06-29 13:46:34 +00:00
|
|
|
fprintf(spawn->tochild,"OPTION %s\n",kopts[i].name);
|
|
|
|
|
|
|
|
for(i=0;i<opt.keyserver_options.verbose;i++)
|
|
|
|
fprintf(spawn->tochild,"OPTION verbose\n");
|
|
|
|
|
2004-04-15 18:16:17 +00:00
|
|
|
for(temp=opt.keyserver_options.other;temp;temp=temp->next)
|
2002-06-29 13:46:34 +00:00
|
|
|
fprintf(spawn->tochild,"OPTION %s\n",temp->d);
|
|
|
|
|
|
|
|
switch(action)
|
|
|
|
{
|
|
|
|
case GET:
|
|
|
|
{
|
|
|
|
fprintf(spawn->tochild,"COMMAND GET\n\n");
|
|
|
|
|
|
|
|
/* Which keys do we want? */
|
|
|
|
|
|
|
|
for(i=0;i<count;i++)
|
|
|
|
{
|
|
|
|
if(desc[i].mode==KEYDB_SEARCH_MODE_FPR20)
|
|
|
|
{
|
|
|
|
int f;
|
|
|
|
|
|
|
|
fprintf(spawn->tochild,"0x");
|
|
|
|
|
|
|
|
for(f=0;f<MAX_FINGERPRINT_LEN;f++)
|
2004-09-21 22:24:47 +00:00
|
|
|
fprintf(spawn->tochild,"%02X",desc[i].u.fpr[f]);
|
2002-06-29 13:46:34 +00:00
|
|
|
|
|
|
|
fprintf(spawn->tochild,"\n");
|
|
|
|
}
|
|
|
|
else if(desc[i].mode==KEYDB_SEARCH_MODE_FPR16)
|
|
|
|
{
|
|
|
|
int f;
|
|
|
|
|
|
|
|
fprintf(spawn->tochild,"0x");
|
|
|
|
|
|
|
|
for(f=0;f<16;f++)
|
2004-09-21 22:24:47 +00:00
|
|
|
fprintf(spawn->tochild,"%02X",desc[i].u.fpr[f]);
|
2002-06-29 13:46:34 +00:00
|
|
|
|
|
|
|
fprintf(spawn->tochild,"\n");
|
|
|
|
}
|
|
|
|
else if(desc[i].mode==KEYDB_SEARCH_MODE_LONG_KID)
|
|
|
|
fprintf(spawn->tochild,"0x%08lX%08lX\n",
|
|
|
|
(ulong)desc[i].u.kid[0],
|
|
|
|
(ulong)desc[i].u.kid[1]);
|
2004-05-21 17:32:30 +00:00
|
|
|
else if(desc[i].mode==KEYDB_SEARCH_MODE_SHORT_KID)
|
2002-06-29 13:46:34 +00:00
|
|
|
fprintf(spawn->tochild,"0x%08lX\n",
|
|
|
|
(ulong)desc[i].u.kid[1]);
|
2004-10-05 14:33:02 +00:00
|
|
|
else if(desc[i].mode==KEYDB_SEARCH_MODE_NONE)
|
|
|
|
continue;
|
|
|
|
else
|
|
|
|
BUG();
|
2004-08-23 19:20:17 +00:00
|
|
|
|
2004-10-11 21:08:37 +00:00
|
|
|
if(keyserver->host)
|
|
|
|
log_info(_("requesting key %s from %s server %s\n"),
|
|
|
|
keystr_from_desc(&desc[i]),
|
|
|
|
keyserver->scheme,keyserver->host);
|
|
|
|
else
|
|
|
|
log_info(_("requesting key %s from %s\n"),
|
|
|
|
keystr_from_desc(&desc[i]),keyserver->uri);
|
2002-06-29 13:46:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
fprintf(spawn->tochild,"\n");
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case SEND:
|
|
|
|
{
|
|
|
|
STRLIST key;
|
|
|
|
|
|
|
|
/* Note the extra \n here to send an empty keylist block */
|
|
|
|
fprintf(spawn->tochild,"COMMAND SEND\n\n\n");
|
|
|
|
|
|
|
|
for(key=list;key!=NULL;key=key->next)
|
|
|
|
{
|
|
|
|
armor_filter_context_t afx;
|
|
|
|
IOBUF buffer=iobuf_temp();
|
2003-02-26 17:11:24 +00:00
|
|
|
KBNODE block;
|
2002-06-29 13:46:34 +00:00
|
|
|
|
|
|
|
temp=NULL;
|
|
|
|
add_to_strlist(&temp,key->d);
|
|
|
|
|
|
|
|
memset(&afx,0,sizeof(afx));
|
|
|
|
afx.what=1;
|
2005-01-06 16:23:47 +00:00
|
|
|
/* Tell the armor filter to use Unix-style \n line
|
|
|
|
endings, since we're going to fprintf this to a file
|
|
|
|
that (on Win32) is open in text mode. The win32 stdio
|
|
|
|
will transform the \n to \r\n and we'll end up with the
|
|
|
|
proper line endings on win32. This is a no-op on
|
|
|
|
Unix. */
|
|
|
|
afx.eol[0]='\n';
|
2002-06-29 13:46:34 +00:00
|
|
|
iobuf_push_filter(buffer,armor_filter,&afx);
|
|
|
|
|
2004-02-22 00:36:34 +00:00
|
|
|
/* TODO: Remove Comment: lines from keys exported this
|
|
|
|
way? */
|
2003-02-26 17:11:24 +00:00
|
|
|
|
|
|
|
if(export_pubkeys_stream(buffer,temp,&block,
|
* options.h, main.h, export.c (parse_export_options, do_export_stream),
g10.c (main): add new --export-options option. Current flags are
"include-non-rfc", "include-local-sigs", "include-attributes", and
"include-sensitive-revkeys".
* options.h, hkp.c (hkp_export), keyserver.c (parse_keyserver_options,
keyserver_spawn): try passing unknown keyserver options to export options,
and if successful, use them when doing a keyserver --send-key.
* build-packet.c (build_sig_subpkt): We do not generate
SIGSUBPKT_PRIV_VERIFY_CACHE anymore.
2002-07-22 19:07:21 +00:00
|
|
|
opt.keyserver_options.export_options)==-1)
|
2002-06-29 13:46:34 +00:00
|
|
|
iobuf_close(buffer);
|
|
|
|
else
|
|
|
|
{
|
2003-02-26 17:11:24 +00:00
|
|
|
KBNODE node;
|
|
|
|
|
2002-06-29 13:46:34 +00:00
|
|
|
iobuf_flush_temp(buffer);
|
|
|
|
|
2003-02-26 17:11:24 +00:00
|
|
|
merge_keys_and_selfsig(block);
|
|
|
|
|
2004-02-22 00:36:34 +00:00
|
|
|
fprintf(spawn->tochild,"INFO %08lX%08lX BEGIN\n",
|
|
|
|
(ulong)block->pkt->pkt.public_key->keyid[0],
|
|
|
|
(ulong)block->pkt->pkt.public_key->keyid[1]);
|
2003-02-26 17:11:24 +00:00
|
|
|
|
|
|
|
for(node=block;node;node=node->next)
|
|
|
|
{
|
|
|
|
switch(node->pkt->pkttype)
|
|
|
|
{
|
|
|
|
default:
|
|
|
|
continue;
|
|
|
|
|
|
|
|
case PKT_PUBLIC_KEY:
|
|
|
|
case PKT_PUBLIC_SUBKEY:
|
|
|
|
{
|
|
|
|
PKT_public_key *pk=node->pkt->pkt.public_key;
|
|
|
|
|
|
|
|
keyid_from_pk(pk,NULL);
|
|
|
|
|
|
|
|
fprintf(spawn->tochild,"%sb:%08lX%08lX:%u:%u:%u:%u:",
|
|
|
|
node->pkt->pkttype==PKT_PUBLIC_KEY?"pu":"su",
|
|
|
|
(ulong)pk->keyid[0],(ulong)pk->keyid[1],
|
|
|
|
pk->pubkey_algo,
|
|
|
|
nbits_from_pk(pk),
|
|
|
|
pk->timestamp,
|
|
|
|
pk->expiredate);
|
|
|
|
|
|
|
|
if(pk->is_revoked)
|
|
|
|
fprintf(spawn->tochild,"r");
|
|
|
|
if(pk->has_expired)
|
|
|
|
fprintf(spawn->tochild,"e");
|
|
|
|
|
|
|
|
fprintf(spawn->tochild,"\n");
|
|
|
|
}
|
2004-02-22 00:36:34 +00:00
|
|
|
break;
|
2003-02-26 17:11:24 +00:00
|
|
|
|
|
|
|
case PKT_USER_ID:
|
|
|
|
{
|
|
|
|
PKT_user_id *uid=node->pkt->pkt.user_id;
|
2003-03-04 15:24:12 +00:00
|
|
|
int r;
|
2003-02-26 17:11:24 +00:00
|
|
|
|
|
|
|
if(uid->attrib_data)
|
|
|
|
continue;
|
|
|
|
|
2003-03-04 15:24:12 +00:00
|
|
|
fprintf(spawn->tochild,"uid:");
|
|
|
|
|
|
|
|
/* Quote ':', '%', and any 8-bit
|
|
|
|
characters */
|
|
|
|
for(r=0;r<uid->len;r++)
|
|
|
|
{
|
|
|
|
if(uid->name[r]==':' || uid->name[r]=='%'
|
|
|
|
|| uid->name[r]&0x80)
|
2004-02-20 20:18:49 +00:00
|
|
|
fprintf(spawn->tochild,"%%%02X",
|
|
|
|
(byte)uid->name[r]);
|
2003-03-04 15:24:12 +00:00
|
|
|
else
|
|
|
|
fprintf(spawn->tochild,"%c",uid->name[r]);
|
|
|
|
}
|
|
|
|
|
|
|
|
fprintf(spawn->tochild,":%u:%u:",
|
|
|
|
uid->created,uid->expiredate);
|
2003-02-26 17:11:24 +00:00
|
|
|
|
|
|
|
if(uid->is_revoked)
|
|
|
|
fprintf(spawn->tochild,"r");
|
|
|
|
if(uid->is_expired)
|
|
|
|
fprintf(spawn->tochild,"e");
|
|
|
|
|
|
|
|
fprintf(spawn->tochild,"\n");
|
|
|
|
}
|
2004-02-22 00:36:34 +00: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))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
fprintf(spawn->tochild,"sig:%08lX%08lX:%X:%u:%u\n",
|
|
|
|
(ulong)sig->keyid[0],(ulong)sig->keyid[1],
|
|
|
|
sig->sig_class,sig->timestamp,
|
|
|
|
sig->expiredate);
|
|
|
|
}
|
|
|
|
break;
|
2003-02-26 17:11:24 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-02-22 00:36:34 +00:00
|
|
|
fprintf(spawn->tochild,"INFO %08lX%08lX END\n",
|
|
|
|
(ulong)block->pkt->pkt.public_key->keyid[0],
|
|
|
|
(ulong)block->pkt->pkt.public_key->keyid[1]);
|
2003-02-26 17:11:24 +00:00
|
|
|
|
2002-06-29 13:46:34 +00:00
|
|
|
fprintf(spawn->tochild,"KEY %s BEGIN\n",key->d);
|
|
|
|
fwrite(iobuf_get_temp_buffer(buffer),
|
|
|
|
iobuf_get_temp_length(buffer),1,spawn->tochild);
|
|
|
|
fprintf(spawn->tochild,"KEY %s END\n",key->d);
|
|
|
|
|
|
|
|
iobuf_close(buffer);
|
2004-08-23 19:20:17 +00:00
|
|
|
|
2004-10-11 21:08:37 +00:00
|
|
|
if(keyserver->host)
|
|
|
|
log_info(_("sending key %s to %s server %s\n"),
|
|
|
|
keystr(block->pkt->pkt.public_key->keyid),
|
|
|
|
keyserver->scheme,keyserver->host);
|
|
|
|
else
|
|
|
|
log_info(_("sending key %s to %s\n"),
|
|
|
|
keystr(block->pkt->pkt.public_key->keyid),
|
|
|
|
keyserver->uri);
|
2004-08-23 19:20:17 +00:00
|
|
|
|
2003-02-26 17:11:24 +00:00
|
|
|
release_kbnode(block);
|
2002-06-29 13:46:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
free_strlist(temp);
|
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case SEARCH:
|
|
|
|
{
|
|
|
|
STRLIST key;
|
|
|
|
|
|
|
|
fprintf(spawn->tochild,"COMMAND SEARCH\n\n");
|
|
|
|
|
|
|
|
/* Which keys do we want? Remember that the gpgkeys_ program
|
|
|
|
is going to lump these together into a search string. */
|
|
|
|
|
|
|
|
for(key=list;key!=NULL;key=key->next)
|
|
|
|
{
|
|
|
|
fprintf(spawn->tochild,"%s\n",key->d);
|
|
|
|
if(key!=list)
|
|
|
|
{
|
|
|
|
searchstr=m_realloc(searchstr,
|
|
|
|
strlen(searchstr)+strlen(key->d)+2);
|
|
|
|
strcat(searchstr," ");
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
searchstr=m_alloc(strlen(key->d)+1);
|
|
|
|
searchstr[0]='\0';
|
|
|
|
}
|
|
|
|
|
|
|
|
strcat(searchstr,key->d);
|
|
|
|
}
|
|
|
|
|
|
|
|
fprintf(spawn->tochild,"\n");
|
|
|
|
|
2004-10-11 21:08:37 +00:00
|
|
|
if(keyserver->host)
|
|
|
|
log_info(_("searching for \"%s\" from %s server %s\n"),
|
|
|
|
searchstr,keyserver->scheme,keyserver->host);
|
|
|
|
else
|
|
|
|
log_info(_("searching for \"%s\" from %s\n"),
|
|
|
|
searchstr,keyserver->uri);
|
2004-08-23 19:20:17 +00:00
|
|
|
|
2002-06-29 13:46:34 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
default:
|
|
|
|
log_fatal(_("no keyserver action!\n"));
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Done sending, so start reading. */
|
|
|
|
ret=exec_read(spawn);
|
|
|
|
if(ret)
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
/* Now handle the response */
|
|
|
|
|
|
|
|
for(;;)
|
|
|
|
{
|
2002-09-12 12:10:04 +00:00
|
|
|
int plen;
|
2002-10-14 18:50:28 +00:00
|
|
|
char *ptr;
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2002-09-19 17:13:03 +00:00
|
|
|
maxlen=1024;
|
2002-06-29 13:46:34 +00:00
|
|
|
if(iobuf_read_line(spawn->fromchild,&line,&buflen,&maxlen)==0)
|
|
|
|
{
|
|
|
|
ret=G10ERR_READ_FILE;
|
|
|
|
goto fail; /* i.e. EOF */
|
|
|
|
}
|
|
|
|
|
|
|
|
ptr=line;
|
|
|
|
|
2002-09-12 12:10:04 +00:00
|
|
|
/* remove trailing whitespace */
|
|
|
|
plen=strlen(ptr);
|
* parse-packet.c (parse_signature): No need to reserve 8 bytes for the
unhashed signature cache any longer.
* misc.c (pct_expando): Add two new expandos - signer's fingerprint (%g),
and signer's primary fingerprint (%p).
* Makefile.am: Include W32LIBS where appropriate.
* g10.c (main): Add --rfc2440 alias for --openpgp since in a few months,
they won't be the same thing.
* keyserver.c (parse_keyserver_uri): Accept "http" as an alias for "hkp",
since it is occasionally written that way. (keyserver_spawn): Use
ascii_isspace to avoid locale issues.
* keygen.c (ask_user_id): Make --allow-freeform-uid apply to the email
field as well as the name field, and allow mixing fields when it is set.
* options.skel: Use subkeys.pgp.net as the default keyserver.
* trustdb.c (validate_one_keyblock): Certifications on revoked or expired
uids do not count in the web of trust.
* signal.c (init_one_signal, pause_on_sigusr, do_block): Only use
sigprocmask() if we have sigset_t, and only use sigaction() if we have
struct sigaction. This is for Forte c89 on Solaris which seems to define
only the function call half of the two pairs by default.
(pause_on_sigusr): Typo. (do_block): If we can't use sigprocmask() and
sigset_t, try to get the number of signals from NSIG as well as MAXSIG,
and if we can't, fail with an explanation.
* signal.c, tdbio.c: Comment out the transaction code. It was not used in
this version, and was causing some build problems on quasi-posix platforms
(Solaris and Forte c89).
* keylist.c (list_keyblock_colon): Don't include validity values when
listing secret keys since they can be incorrect and/or misleading. This
is a temporary kludge, and will be handled properly in 1.9/2.0.
* mainproc.c (check_sig_and_print): Only show the "key available from"
preferred keyserver line if the key is not currently present.
* keyedit.c (sign_uids): Do not sign expired uids without --expert (same
behavior as revoked uids). Do not allow signing a user ID without a
self-signature. --expert overrides. Add additional prompt to the
signature level question. (menu_expire): When changing expiration dates,
don't replace selfsigs on revoked uids since this would effectively
unrevoke them. There is also no point in replacing expired selfsigs.
This is bug #181
* g10.c (add_notation_data): Make sure that only ascii is passed to
iscntrl. Noted by Christian Biere.
* getkey.c (classify_user_id2): Replaced isspace by spacep
* keygen.c (ask_user_id): Ditto. (get_parameter_algo): Ditto.
* keyedit.c (keyedit_menu): Ditto.
* tdbdump.c (import_ownertrust): Ditto. s/isxdigit/hexdigitp/.
* revoke.c (ask_revocation_reason):
* keyserver.c (keyserver_spawn): Dito.
2003-07-10 14:30:07 +00:00
|
|
|
while(plen>0 && ascii_isspace(ptr[plen-1]))
|
2002-09-12 12:10:04 +00:00
|
|
|
plen--;
|
|
|
|
plen[ptr]='\0';
|
2002-06-29 13:46:34 +00:00
|
|
|
|
|
|
|
if(*ptr=='\0')
|
|
|
|
break;
|
|
|
|
|
2002-09-10 08:40:12 +00:00
|
|
|
if(ascii_strncasecmp(ptr,"VERSION ",8)==0)
|
2002-06-29 13:46:34 +00:00
|
|
|
{
|
|
|
|
gotversion=1;
|
|
|
|
|
|
|
|
if(atoi(&ptr[8])!=KEYSERVER_PROTO_VERSION)
|
|
|
|
{
|
|
|
|
log_error(_("invalid keyserver protocol (us %d!=handler %d)\n"),
|
|
|
|
KEYSERVER_PROTO_VERSION,atoi(&ptr[8]));
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
}
|
2002-09-10 08:40:12 +00:00
|
|
|
else if(ascii_strncasecmp(ptr,"PROGRAM ",8)==0)
|
2002-06-29 13:46:34 +00:00
|
|
|
{
|
2002-09-10 08:40:12 +00:00
|
|
|
if(ascii_strncasecmp(&ptr[8],VERSION,strlen(VERSION))!=0)
|
2004-09-03 22:06:36 +00:00
|
|
|
log_info(_("WARNING: keyserver handler from a different"
|
|
|
|
" version of GnuPG (%s)\n"),&ptr[8]);
|
2002-06-29 13:46:34 +00:00
|
|
|
}
|
2002-09-10 08:40:12 +00:00
|
|
|
else if(ascii_strncasecmp(ptr,"OPTION OUTOFBAND",16)==0)
|
2002-06-29 13:46:34 +00:00
|
|
|
outofband=1; /* Currently the only OPTION */
|
|
|
|
}
|
|
|
|
|
|
|
|
if(!gotversion)
|
|
|
|
{
|
|
|
|
log_error(_("keyserver did not send VERSION\n"));
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(!outofband)
|
|
|
|
switch(action)
|
|
|
|
{
|
|
|
|
case GET:
|
|
|
|
{
|
|
|
|
void *stats_handle;
|
|
|
|
|
|
|
|
stats_handle=import_new_stats_handle();
|
|
|
|
|
2002-09-19 17:13:03 +00:00
|
|
|
/* Slurp up all the key data. In the future, it might be
|
|
|
|
nice to look for KEY foo OUTOFBAND and FAILED indicators.
|
|
|
|
It's harmless to ignore them, but ignoring them does make
|
|
|
|
gpg complain about "no valid OpenPGP data found". One
|
|
|
|
way to do this could be to continue parsing this
|
|
|
|
line-by-line and make a temp iobuf for each key. */
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2002-09-23 13:03:52 +00:00
|
|
|
import_keys_stream(spawn->fromchild,stats_handle,
|
* main.h, import.c (parse_import_options, fix_hkp_corruption, import_one,
delete_inv_parts), g10.c (main): New import-option
"repair-hkp-subkey-bug", which repairs as much as possible the HKP
mangling multiple subkeys bug. It is on by default for keyserver
receives, and off by default for regular --import.
* main.h, import.c (import, import_one, delete_inv_parts), hkp.c
(hkp_ask_import), keyserver.c (keyserver_spawn): Use keyserver import
options when doing keyserver receives.
2002-07-24 21:17:19 +00:00
|
|
|
opt.keyserver_options.import_options);
|
2002-06-29 13:46:34 +00:00
|
|
|
|
|
|
|
import_print_stats(stats_handle);
|
|
|
|
import_release_stats_handle(stats_handle);
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Nothing to do here */
|
|
|
|
case SEND:
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SEARCH:
|
2004-08-23 19:20:17 +00:00
|
|
|
keyserver_search_prompt(spawn->fromchild,searchstr);
|
|
|
|
break;
|
2002-06-29 13:46:34 +00:00
|
|
|
|
|
|
|
default:
|
|
|
|
log_fatal(_("no keyserver action!\n"));
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
fail:
|
2002-09-19 17:13:03 +00:00
|
|
|
m_free(line);
|
2004-08-23 19:20:17 +00:00
|
|
|
m_free(searchstr);
|
2002-09-19 17:13:03 +00:00
|
|
|
|
2002-06-29 13:46:34 +00:00
|
|
|
*prog=exec_finish(spawn);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2004-04-19 16:02:11 +00:00
|
|
|
keyserver_work(int action,STRLIST list,KEYDB_SEARCH_DESC *desc,
|
|
|
|
int count,struct keyserver_spec *keyserver)
|
2002-06-29 13:46:34 +00:00
|
|
|
{
|
|
|
|
int rc=0,ret=0;
|
|
|
|
|
2004-05-20 20:42:01 +00:00
|
|
|
if(!keyserver)
|
2002-06-29 13:46:34 +00:00
|
|
|
{
|
|
|
|
log_error(_("no keyserver known (use option --keyserver)\n"));
|
|
|
|
return G10ERR_BAD_URI;
|
|
|
|
}
|
|
|
|
|
2002-07-04 16:06:38 +00:00
|
|
|
#ifdef DISABLE_KEYSERVER_HELPERS
|
2002-09-12 12:45:58 +00:00
|
|
|
|
2002-07-04 16:06:38 +00:00
|
|
|
log_error(_("external keyserver calls are not supported in this build\n"));
|
|
|
|
return G10ERR_KEYSERVER;
|
|
|
|
|
2002-09-12 12:45:58 +00:00
|
|
|
#else
|
|
|
|
/* Spawn a handler */
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2004-04-19 16:02:11 +00:00
|
|
|
rc=keyserver_spawn(action,list,desc,count,&ret,keyserver);
|
2002-06-29 13:46:34 +00:00
|
|
|
if(ret)
|
|
|
|
{
|
|
|
|
switch(ret)
|
|
|
|
{
|
|
|
|
case KEYSERVER_SCHEME_NOT_FOUND:
|
2004-09-03 22:06:36 +00:00
|
|
|
log_error(_("no handler for keyserver scheme `%s'\n"),
|
2004-05-22 03:50:20 +00:00
|
|
|
keyserver->scheme);
|
2002-06-29 13:46:34 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case KEYSERVER_NOT_SUPPORTED:
|
2004-09-03 22:06:36 +00:00
|
|
|
log_error(_("action `%s' not supported with keyserver "
|
|
|
|
"scheme `%s'\n"),
|
2002-06-29 13:46:34 +00:00
|
|
|
action==GET?"get":action==SEND?"send":
|
|
|
|
action==SEARCH?"search":"unknown",
|
2004-05-22 03:50:20 +00:00
|
|
|
keyserver->scheme);
|
2002-10-14 18:50:28 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case KEYSERVER_VERSION_ERROR:
|
|
|
|
log_error(_("gpgkeys_%s does not support handler version %d\n"),
|
2004-12-22 17:49:44 +00:00
|
|
|
keyserver_typemap(keyserver->scheme),
|
|
|
|
KEYSERVER_PROTO_VERSION);
|
2002-10-14 18:50:28 +00:00
|
|
|
break;
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2004-10-13 18:40:13 +00:00
|
|
|
case KEYSERVER_TIMEOUT:
|
|
|
|
log_error(_("keyserver timed out\n"));
|
|
|
|
break;
|
|
|
|
|
2002-06-29 13:46:34 +00:00
|
|
|
case KEYSERVER_INTERNAL_ERROR:
|
|
|
|
default:
|
|
|
|
log_error(_("keyserver internal error\n"));
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return G10ERR_KEYSERVER;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(rc)
|
|
|
|
{
|
|
|
|
log_error(_("keyserver communications error: %s\n"),g10_errstr(rc));
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
2002-09-10 08:40:12 +00:00
|
|
|
#endif /* ! DISABLE_KEYSERVER_HELPERS*/
|
2002-06-29 13:46:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
keyserver_export(STRLIST users)
|
|
|
|
{
|
2004-02-20 20:18:49 +00:00
|
|
|
STRLIST sl=NULL;
|
|
|
|
KEYDB_SEARCH_DESC desc;
|
|
|
|
int rc=0;
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2004-02-20 20:18:49 +00:00
|
|
|
/* Weed out descriptors that we don't support sending */
|
|
|
|
for(;users;users=users->next)
|
|
|
|
{
|
|
|
|
classify_user_id (users->d, &desc);
|
|
|
|
if(desc.mode!=KEYDB_SEARCH_MODE_SHORT_KID &&
|
|
|
|
desc.mode!=KEYDB_SEARCH_MODE_LONG_KID &&
|
|
|
|
desc.mode!=KEYDB_SEARCH_MODE_FPR16 &&
|
|
|
|
desc.mode!=KEYDB_SEARCH_MODE_FPR20)
|
|
|
|
{
|
|
|
|
log_error(_("\"%s\" not a key ID: skipping\n"),users->d);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
append_to_strlist(&sl,users->d);
|
|
|
|
}
|
|
|
|
|
|
|
|
if(sl)
|
|
|
|
{
|
2004-04-19 16:02:11 +00:00
|
|
|
rc=keyserver_work(SEND,sl,NULL,0,opt.keyserver);
|
2004-02-20 20:18:49 +00:00
|
|
|
free_strlist(sl);
|
|
|
|
}
|
|
|
|
|
|
|
|
return rc;
|
2002-06-29 13:46:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
keyserver_import(STRLIST users)
|
|
|
|
{
|
|
|
|
KEYDB_SEARCH_DESC *desc;
|
|
|
|
int num=100,count=0;
|
|
|
|
int rc=0;
|
|
|
|
|
|
|
|
/* Build a list of key ids */
|
|
|
|
desc=m_alloc(sizeof(KEYDB_SEARCH_DESC)*num);
|
|
|
|
|
|
|
|
for(;users;users=users->next)
|
|
|
|
{
|
|
|
|
classify_user_id (users->d, &desc[count]);
|
|
|
|
if(desc[count].mode!=KEYDB_SEARCH_MODE_SHORT_KID &&
|
|
|
|
desc[count].mode!=KEYDB_SEARCH_MODE_LONG_KID &&
|
|
|
|
desc[count].mode!=KEYDB_SEARCH_MODE_FPR16 &&
|
|
|
|
desc[count].mode!=KEYDB_SEARCH_MODE_FPR20)
|
|
|
|
{
|
2004-02-20 20:18:49 +00:00
|
|
|
log_error(_("\"%s\" not a key ID: skipping\n"),users->d);
|
2002-06-29 13:46:34 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
count++;
|
|
|
|
if(count==num)
|
|
|
|
{
|
|
|
|
num+=100;
|
|
|
|
desc=m_realloc(desc,sizeof(KEYDB_SEARCH_DESC)*num);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if(count>0)
|
2004-04-19 16:02:11 +00:00
|
|
|
rc=keyserver_work(GET,NULL,desc,count,opt.keyserver);
|
2002-06-29 13:46:34 +00:00
|
|
|
|
|
|
|
m_free(desc);
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2004-09-11 15:42:19 +00:00
|
|
|
keyserver_import_fprint(const byte *fprint,size_t fprint_len,
|
|
|
|
struct keyserver_spec *keyserver)
|
2002-06-29 13:46:34 +00:00
|
|
|
{
|
|
|
|
KEYDB_SEARCH_DESC desc;
|
|
|
|
|
|
|
|
memset(&desc,0,sizeof(desc));
|
|
|
|
|
|
|
|
if(fprint_len==16)
|
|
|
|
desc.mode=KEYDB_SEARCH_MODE_FPR16;
|
|
|
|
else if(fprint_len==20)
|
|
|
|
desc.mode=KEYDB_SEARCH_MODE_FPR20;
|
|
|
|
else
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
memcpy(desc.u.fpr,fprint,fprint_len);
|
|
|
|
|
2004-09-11 15:42:19 +00:00
|
|
|
return keyserver_work(GET,NULL,&desc,1,keyserver);
|
2002-06-29 13:46:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2004-05-22 03:50:20 +00:00
|
|
|
keyserver_import_keyid(u32 *keyid,struct keyserver_spec *keyserver)
|
2002-06-29 13:46:34 +00:00
|
|
|
{
|
|
|
|
KEYDB_SEARCH_DESC desc;
|
|
|
|
|
|
|
|
memset(&desc,0,sizeof(desc));
|
|
|
|
|
|
|
|
desc.mode=KEYDB_SEARCH_MODE_LONG_KID;
|
|
|
|
desc.u.kid[0]=keyid[0];
|
|
|
|
desc.u.kid[1]=keyid[1];
|
|
|
|
|
2004-05-22 03:50:20 +00:00
|
|
|
return keyserver_work(GET,NULL,&desc,1,keyserver);
|
2004-04-19 16:02:11 +00:00
|
|
|
}
|
|
|
|
|
2004-05-21 17:32:30 +00:00
|
|
|
/* code mostly stolen from do_export_stream */
|
2002-06-29 13:46:34 +00:00
|
|
|
static int
|
|
|
|
keyidlist(STRLIST users,KEYDB_SEARCH_DESC **klist,int *count,int fakev3)
|
|
|
|
{
|
2004-05-21 17:32:30 +00:00
|
|
|
int rc=0,ndesc,num=100;
|
2002-06-29 13:46:34 +00:00
|
|
|
KBNODE keyblock=NULL,node;
|
2004-05-21 17:32:30 +00:00
|
|
|
KEYDB_HANDLE kdbhd;
|
|
|
|
KEYDB_SEARCH_DESC *desc;
|
|
|
|
STRLIST sl;
|
2002-06-29 13:46:34 +00:00
|
|
|
|
|
|
|
*count=0;
|
|
|
|
|
2004-05-21 17:32:30 +00:00
|
|
|
*klist=m_alloc(sizeof(KEYDB_SEARCH_DESC)*num);
|
|
|
|
|
|
|
|
kdbhd=keydb_new(0);
|
|
|
|
|
|
|
|
if(!users)
|
2002-06-29 13:46:34 +00:00
|
|
|
{
|
2004-05-21 17:32:30 +00:00
|
|
|
ndesc = 1;
|
|
|
|
desc = m_alloc_clear ( ndesc * sizeof *desc);
|
|
|
|
desc[0].mode = KEYDB_SEARCH_MODE_FIRST;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
for (ndesc=0, sl=users; sl; sl = sl->next, ndesc++)
|
|
|
|
;
|
|
|
|
desc = m_alloc ( ndesc * sizeof *desc);
|
|
|
|
|
|
|
|
for (ndesc=0, sl=users; sl; sl = sl->next)
|
|
|
|
{
|
|
|
|
if(classify_user_id (sl->d, desc+ndesc))
|
|
|
|
ndesc++;
|
|
|
|
else
|
2004-09-03 22:06:36 +00:00
|
|
|
log_error (_("key \"%s\" not found: %s\n"),
|
2004-05-21 17:32:30 +00:00
|
|
|
sl->d, g10_errstr (G10ERR_INV_USER_ID));
|
|
|
|
}
|
2002-06-29 13:46:34 +00:00
|
|
|
}
|
2004-04-19 16:02:11 +00:00
|
|
|
|
2004-05-21 17:32:30 +00:00
|
|
|
while (!(rc = keydb_search (kdbhd, desc, ndesc)))
|
2002-06-29 13:46:34 +00:00
|
|
|
{
|
2004-05-21 17:32:30 +00:00
|
|
|
if (!users)
|
|
|
|
desc[0].mode = KEYDB_SEARCH_MODE_NEXT;
|
|
|
|
|
|
|
|
/* read the keyblock */
|
|
|
|
rc = keydb_get_keyblock (kdbhd, &keyblock );
|
|
|
|
if( rc )
|
|
|
|
{
|
|
|
|
log_error (_("error reading keyblock: %s\n"), g10_errstr(rc) );
|
|
|
|
goto leave;
|
|
|
|
}
|
|
|
|
|
2004-04-19 16:02:11 +00:00
|
|
|
if((node=find_kbnode(keyblock,PKT_PUBLIC_KEY)))
|
2002-06-29 13:46:34 +00:00
|
|
|
{
|
2004-05-21 17:32:30 +00:00
|
|
|
/* This is to work around a bug in some keyservers (pksd and
|
|
|
|
OKS) that calculate v4 RSA keyids as if they were v3 RSA.
|
|
|
|
The answer is to refresh both the correct v4 keyid
|
|
|
|
(e.g. 99242560) and the fake v3 keyid (e.g. 68FDDBC7).
|
|
|
|
This only happens for key refresh using the HKP scheme
|
|
|
|
and if the refresh-add-fake-v3-keyids keyserver option is
|
|
|
|
set. */
|
|
|
|
if(fakev3 && is_RSA(node->pkt->pkt.public_key->pubkey_algo) &&
|
|
|
|
node->pkt->pkt.public_key->version>=4)
|
|
|
|
{
|
|
|
|
(*klist)[*count].mode=KEYDB_SEARCH_MODE_LONG_KID;
|
|
|
|
mpi_get_keyid(node->pkt->pkt.public_key->pkey[0],
|
|
|
|
(*klist)[*count].u.kid);
|
|
|
|
(*count)++;
|
|
|
|
|
|
|
|
if(*count==num)
|
|
|
|
{
|
|
|
|
num+=100;
|
|
|
|
*klist=m_realloc(*klist,sizeof(KEYDB_SEARCH_DESC)*num);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* v4 keys get full fingerprints. v3 keys get long keyids.
|
|
|
|
This is because it's easy to calculate any sort of keyid
|
|
|
|
from a v4 fingerprint, but not a v3 fingerprint. */
|
|
|
|
|
|
|
|
if(node->pkt->pkt.public_key->version<4)
|
|
|
|
{
|
|
|
|
(*klist)[*count].mode=KEYDB_SEARCH_MODE_LONG_KID;
|
|
|
|
keyid_from_pk(node->pkt->pkt.public_key,
|
|
|
|
(*klist)[*count].u.kid);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
size_t dummy;
|
|
|
|
|
|
|
|
(*klist)[*count].mode=KEYDB_SEARCH_MODE_FPR20;
|
|
|
|
fingerprint_from_pk(node->pkt->pkt.public_key,
|
|
|
|
(*klist)[*count].u.fpr,&dummy);
|
|
|
|
}
|
|
|
|
|
2004-08-23 14:39:48 +00:00
|
|
|
/* This is a little hackish, using the skipfncvalue as a
|
|
|
|
void* pointer to the keyserver spec, but we don't need
|
|
|
|
the skipfnc here, and it saves having an additional field
|
|
|
|
for this (which would be wasted space most of the
|
|
|
|
time). */
|
|
|
|
|
2004-05-21 17:32:30 +00:00
|
|
|
(*klist)[*count].skipfncvalue=NULL;
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2004-05-21 17:32:30 +00:00
|
|
|
/* Are we honoring preferred keyservers? */
|
2004-04-19 16:02:11 +00:00
|
|
|
if(opt.keyserver_options.options&KEYSERVER_HONOR_KEYSERVER_URL)
|
|
|
|
{
|
|
|
|
PKT_user_id *uid=NULL;
|
|
|
|
PKT_signature *sig=NULL;
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2004-05-21 17:32:30 +00:00
|
|
|
merge_keys_and_selfsig(keyblock);
|
|
|
|
|
2004-04-19 16:02:11 +00:00
|
|
|
for(node=node->next;node;node=node->next)
|
|
|
|
{
|
|
|
|
if(node->pkt->pkttype==PKT_USER_ID
|
|
|
|
&& node->pkt->pkt.user_id->is_primary)
|
|
|
|
uid=node->pkt->pkt.user_id;
|
|
|
|
else if(node->pkt->pkttype==PKT_SIGNATURE
|
|
|
|
&& node->pkt->pkt.signature->
|
|
|
|
flags.chosen_selfsig && uid)
|
|
|
|
{
|
|
|
|
sig=node->pkt->pkt.signature;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-05-22 03:50:20 +00:00
|
|
|
/* Try and parse the keyserver URL. If it doesn't work,
|
|
|
|
then we end up writing NULL which indicates we are
|
|
|
|
the same as any other key. */
|
2004-04-19 16:02:11 +00:00
|
|
|
if(uid && sig)
|
2004-05-22 03:50:20 +00:00
|
|
|
(*klist)[*count].skipfncvalue=parse_preferred_keyserver(sig);
|
2004-04-19 16:02:11 +00:00
|
|
|
}
|
2002-06-29 13:46:34 +00:00
|
|
|
|
|
|
|
(*count)++;
|
|
|
|
|
|
|
|
if(*count==num)
|
|
|
|
{
|
|
|
|
num+=100;
|
|
|
|
*klist=m_realloc(*klist,sizeof(KEYDB_SEARCH_DESC)*num);
|
|
|
|
}
|
|
|
|
}
|
2004-04-19 16:02:11 +00:00
|
|
|
}
|
2002-06-29 13:46:34 +00:00
|
|
|
|
2004-05-21 17:32:30 +00:00
|
|
|
if(rc==-1)
|
|
|
|
rc=0;
|
|
|
|
|
|
|
|
leave:
|
|
|
|
if(rc)
|
|
|
|
m_free(*klist);
|
|
|
|
m_free(desc);
|
|
|
|
keydb_release(kdbhd);
|
|
|
|
release_kbnode(keyblock);
|
|
|
|
|
|
|
|
return rc;
|
2002-06-29 13:46:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Note this is different than the original HKP refresh. It allows
|
|
|
|
usernames to refresh only part of the keyring. */
|
|
|
|
|
|
|
|
int
|
|
|
|
keyserver_refresh(STRLIST users)
|
|
|
|
{
|
2004-05-26 15:01:48 +00:00
|
|
|
int rc,count,numdesc,fakev3=0;
|
2002-06-29 13:46:34 +00:00
|
|
|
KEYDB_SEARCH_DESC *desc;
|
|
|
|
|
|
|
|
/* We switch merge_only on during a refresh, as 'refresh' should
|
|
|
|
never import new keys, even if their keyids match. Is it worth
|
|
|
|
preserving the old merge_only value here? */
|
2003-12-31 04:58:52 +00:00
|
|
|
opt.import_options|=IMPORT_MERGE_ONLY;
|
2002-06-29 13:46:34 +00:00
|
|
|
|
|
|
|
/* If refresh_add_fake_v3_keyids is on and it's a HKP or MAILTO
|
|
|
|
scheme, then enable fake v3 keyid generation. */
|
2004-04-15 18:16:17 +00:00
|
|
|
if((opt.keyserver_options.options&KEYSERVER_ADD_FAKE_V3) && opt.keyserver
|
2004-04-14 21:33:45 +00:00
|
|
|
&& (ascii_strcasecmp(opt.keyserver->scheme,"hkp")==0 ||
|
|
|
|
ascii_strcasecmp(opt.keyserver->scheme,"mailto")==0))
|
2002-06-29 13:46:34 +00:00
|
|
|
fakev3=1;
|
|
|
|
|
2004-05-26 15:01:48 +00:00
|
|
|
rc=keyidlist(users,&desc,&numdesc,fakev3);
|
2002-06-29 13:46:34 +00:00
|
|
|
if(rc)
|
|
|
|
return rc;
|
|
|
|
|
2004-05-26 15:01:48 +00:00
|
|
|
count=numdesc;
|
2002-06-29 13:46:34 +00:00
|
|
|
if(count>0)
|
2002-12-27 23:46:51 +00:00
|
|
|
{
|
2004-05-21 17:32:30 +00:00
|
|
|
int i;
|
|
|
|
|
|
|
|
/* Try to handle preferred keyserver keys first */
|
|
|
|
for(i=0;i<count;i++)
|
|
|
|
{
|
|
|
|
if(desc[i].skipfncvalue)
|
|
|
|
{
|
|
|
|
struct keyserver_spec *keyserver=desc[i].skipfncvalue;
|
|
|
|
|
|
|
|
/* We use the keyserver structure we parsed out before.
|
|
|
|
Note that a preferred keyserver without a scheme://
|
|
|
|
will be interpreted as hkp:// */
|
|
|
|
|
|
|
|
rc=keyserver_work(GET,NULL,&desc[i],1,keyserver);
|
|
|
|
if(rc)
|
|
|
|
log_info(_("WARNING: unable to refresh key %s"
|
|
|
|
" via %s: %s\n"),keystr_from_desc(&desc[i]),
|
|
|
|
keyserver->uri,g10_errstr(rc));
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* We got it, so mark it as NONE so we don't try and
|
|
|
|
get it again from the regular keyserver. */
|
|
|
|
|
|
|
|
desc[i].mode=KEYDB_SEARCH_MODE_NONE;
|
2004-05-26 15:01:48 +00:00
|
|
|
count--;
|
2004-05-21 17:32:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
free_keyserver_spec(keyserver);
|
|
|
|
}
|
|
|
|
}
|
2004-05-26 15:01:48 +00:00
|
|
|
}
|
2004-05-21 17:32:30 +00:00
|
|
|
|
2004-05-26 15:01:48 +00:00
|
|
|
if(count>0)
|
|
|
|
{
|
2004-04-14 21:33:45 +00:00
|
|
|
if(opt.keyserver)
|
2002-12-27 23:46:51 +00:00
|
|
|
{
|
|
|
|
if(count==1)
|
2004-04-14 21:33:45 +00:00
|
|
|
log_info(_("refreshing 1 key from %s\n"),opt.keyserver->uri);
|
2002-12-27 23:46:51 +00:00
|
|
|
else
|
|
|
|
log_info(_("refreshing %d keys from %s\n"),
|
2004-04-14 21:33:45 +00:00
|
|
|
count,opt.keyserver->uri);
|
2002-12-27 23:46:51 +00:00
|
|
|
}
|
|
|
|
|
2004-05-26 15:01:48 +00:00
|
|
|
rc=keyserver_work(GET,NULL,desc,numdesc,opt.keyserver);
|
2002-12-27 23:46:51 +00:00
|
|
|
}
|
2002-06-29 13:46:34 +00:00
|
|
|
|
|
|
|
m_free(desc);
|
|
|
|
|
2002-12-27 23:46:51 +00:00
|
|
|
return rc;
|
2002-06-29 13:46:34 +00:00
|
|
|
}
|
|
|
|
|
2002-08-20 12:45:57 +00:00
|
|
|
int
|
2002-06-29 13:46:34 +00:00
|
|
|
keyserver_search(STRLIST tokens)
|
|
|
|
{
|
|
|
|
if(tokens)
|
2004-04-19 16:02:11 +00:00
|
|
|
return keyserver_work(SEARCH,tokens,NULL,0,opt.keyserver);
|
2002-06-29 13:46:34 +00:00
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
}
|