security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

* keyserver.c (keyserver_import_pka): New. Moved from

Browse source 
getkey.c:get_pubkey_byname which was getting crowded.

* keyserver.c (keyserver_import_cert): Import a key found in DNS via CERT
records.  Can handle both the PGP (actual key) and IPGP (URL) CERT types.

* getkey.c (get_pubkey_byname): Call them both here.

* options.h, keyserver.c (parse_keyserver_options): Add
"auto-cert-retrieve" option with optional max size argument.
This commit is contained in:
David Shaw 2005-12-23 22:17:11 +00:00
parent 8b9c16ed0a
commit 846eefaa71
6 changed files with 161 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

99
g10/keyserver.c
View file

@ -86,6 +86,8 @@ static struct parse_options keyserver_opts[]=
{"auto-key-retrieve",KEYSERVER_AUTO_KEY_RETRIEVE,NULL,
N_("automatically retrieve keys when verifying signatures")},
{"auto-pka-retrieve",KEYSERVER_AUTO_PKA_RETRIEVE,NULL,
N_("automatically retrieve keys from PKA records")},
{"auto-cert-retrieve",KEYSERVER_AUTO_CERT_RETRIEVE,NULL,
N_("automatically retrieve keys from DNS")},
{"try-dns-srv",KEYSERVER_TRY_DNS_SRV,NULL,
NULL},
@ -98,11 +100,19 @@ static int keyserver_work(enum ks_action action,STRLIST list,
KEYDB_SEARCH_DESC *desc,int count,
struct keyserver_spec *keyserver);
/* Reasonable guess */
#define DEFAULT_MAX_CERT_SIZE 16384
static size_t max_cert_size=DEFAULT_MAX_CERT_SIZE;
int
parse_keyserver_options(char *options)
{
int ret=1;
char *tok;
char *max_cert;
keyserver_opts[7].value=&max_cert;
while((tok=optsep(&options)))
{
@ -163,6 +173,15 @@ parse_keyserver_options(char *options)
}
}
if(opt.keyserver_options.options&KEYSERVER_AUTO_CERT_RETRIEVE)
{
if(max_cert)
max_cert_size=strtoul(max_cert,(char **)NULL,10);
if(max_cert_size==0)
max_cert_size=DEFAULT_MAX_CERT_SIZE;
}
return ret;
}
@ -1895,8 +1914,86 @@ keyserver_fetch(STRLIST urilist)
return 0;
}
/* Import key in a CERT or pointed to by a CERT */
int
keyserver_getname(const char *name)
keyserver_import_cert(const char *name)
{
char *domain,*look,*url;
IOBUF key;
int type,rc=-1;
look=xstrdup(name);
domain=strrchr(look,'@');
if(domain)
*domain='.';
type=get_cert(look,max_cert_size,&key,&url);
if(type==1)
{
int armor_status=opt.no_armor;
/* CERTs are always in binary format */
opt.no_armor=1;
rc=import_keys_stream(key,NULL,opt.keyserver_options.import_options);
opt.no_armor=armor_status;
iobuf_close(key);
}
else if(type==2)
{
struct keyserver_spec *spec;
spec=parse_keyserver_uri(url,1,NULL,0);
if(spec)
{
STRLIST list=NULL;
add_to_strlist(&list,url);
rc=keyserver_fetch(list);
free_strlist(list);
free_keyserver_spec(spec);
}
xfree(url);
}
xfree(look);
return rc;
}
/* Import key pointed to by a PKA record */
int
keyserver_import_pka(const char *name)
{
unsigned char fpr[MAX_FINGERPRINT_LEN];
char *uri;
int rc=-1;
uri = get_pka_info (name, fpr);
if (uri)
{
struct keyserver_spec *spec;
spec = parse_keyserver_uri (uri, 0, NULL, 0);
if (spec)
{
rc=keyserver_import_fprint (fpr, 20, spec);
free_keyserver_spec (spec);
}
xfree (uri);
}
return rc;
}
/* Import all keys that match name */
int
keyserver_import_name(const char *name)
{
STRLIST list=NULL;
int rc;