mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* g10.c (main): Add --no-throw-keyid.
* keydb.h, encode.c (write_pubkey_enc_from_list), g10.c (main), pkclist.c (build_pk_list): Add --hidden-recipient (-R) and --hidden-encrypt-to, which do a single-user variation on --throw-keyid. The "hide this key" flag is carried in bit 0 of the pk_list flags field. * keyserver.c (parse_keyrec): Fix shadowing warning.
This commit is contained in:
parent
7b4ad0f64c
commit
bdf0e306df
6 changed files with 69 additions and 12 deletions
|
@ -304,7 +304,7 @@ parse_keyrec(char *keystring)
|
|||
{
|
||||
static struct keyrec *work=NULL;
|
||||
struct keyrec *ret=NULL;
|
||||
char *record,*tok;
|
||||
char *record;
|
||||
int i;
|
||||
|
||||
if(keystring==NULL)
|
||||
|
@ -342,6 +342,8 @@ parse_keyrec(char *keystring)
|
|||
|
||||
if(ascii_strcasecmp("pub",record)==0)
|
||||
{
|
||||
char *tok;
|
||||
|
||||
if(work->desc.mode)
|
||||
{
|
||||
ret=work;
|
||||
|
@ -415,7 +417,6 @@ parse_keyrec(char *keystring)
|
|||
else if(ascii_strcasecmp("uid",record)==0 && work->desc.mode)
|
||||
{
|
||||
char *userid,*tok,*decoded;
|
||||
int i=0;
|
||||
|
||||
if((tok=strsep(&keystring,":"))==NULL)
|
||||
return ret;
|
||||
|
@ -428,6 +429,8 @@ parse_keyrec(char *keystring)
|
|||
/* By definition, de-%-encoding is always smaller than the
|
||||
original string so we can decode in place. */
|
||||
|
||||
i=0;
|
||||
|
||||
while(*tok)
|
||||
if(tok[0]=='%' && tok[1] && tok[2])
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue