security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-22 19:58:29 +01:00
Code Activity

* packet.h, build-packet.c (sig_to_notation), keygen.c

Browse Source 
(keygen_add_notations): Tweak to handle non-human-readable notation
values.
This commit is contained in:
David Shaw 2006-03-08 23:42:45 +00:00
parent 4fea8fdbbb
commit 889c4afd78
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
g10/ChangeLog
View File

@ -1,5 +1,9 @@
2006-03-08 David Shaw <dshaw@jabberwocky.com> 2006-03-08 David Shaw <dshaw@jabberwocky.com>
* packet.h, build-packet.c (sig_to_notation), keygen.c
(keygen_add_notations): Tweak to handle non-human-readable
notation values.
* options.h, sign.c (mk_notation_policy_etc), gpg.c * options.h, sign.c (mk_notation_policy_etc), gpg.c
(add_notation_data): Use it here for the various notation (add_notation_data): Use it here for the various notation
commands. commands.

10
g10/build-packet.c
View File

@ -1000,18 +1000,18 @@ sig_to_notation(PKT_signature *sig)
if(p[0]&0x80) if(p[0]&0x80)
{ {
n->flags.human=1;
n->value=xmalloc(n2+1); n->value=xmalloc(n2+1);
memcpy(n->value,&p[8+n1],n2);
n->value[n2]='\0'; n->value[n2]='\0';
} }
else else
{ {
n->value=xmalloc(2+strlen(_("not human readable"))+2+1); n->value=xmalloc(n2);
strcpy(n->value,"[ "); n->blen=n2;
strcat(n->value,_("not human readable"));
strcat(n->value," ]");
} }
memcpy(n->value,&p[8+n1],n2);
n->flags.critical=crit; n->flags.critical=crit;
n->next=list; n->next=list;

5
g10/keygen.c
View File

@ -708,12 +708,15 @@ keygen_add_notations(PKT_signature *sig,void *opaque)
n1=strlen(notation->name); n1=strlen(notation->name);
if(notation->altvalue) if(notation->altvalue)
n2=strlen(notation->altvalue); n2=strlen(notation->altvalue);
else if(!notation->flags.human)
n2=notation->blen;
else else
n2=strlen(notation->value); n2=strlen(notation->value);
buf = xmalloc( 8 + n1 + n2 ); buf = xmalloc( 8 + n1 + n2 );
buf[0] = 0x80; /* human readable */ /* human readable or not */
buf[0] = notation->flags.human?0x80:0;
buf[1] = buf[2] = buf[3] = 0; buf[1] = buf[2] = buf[3] = 0;
buf[4] = n1 >> 8; buf[4] = n1 >> 8;
buf[5] = n1; buf[5] = n1;

2
g10/packet.h
View File

@ -411,10 +411,12 @@ struct notation
{ {
char *name; char *name;
char *value; char *value;
size_t blen;
char *altvalue; char *altvalue;
struct struct
{ {
unsigned int critical:1; unsigned int critical:1;
unsigned int human:1;
unsigned int ignore:1; unsigned int ignore:1;
} flags; } flags;
struct notation *next; struct notation *next;