mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* photoid.h, photoid.c (parse_image_header, image_type_to_string): Useful
functions to return data about an image. * packet.h, parse-packet.c (make_attribute_uidname, parse_attribute_subpkts, parse_attribute), photoid.h, photoid.c (show_photos): Handle multiple images in a single attribute packet. * main.h, misc.c (pct_expando), sign.c (mk_notation_and_policy), photoid.c (show_photos): Simpler expando code that does not require using compile-time string sizes. Call image_type_to_string to get image strings (i.e. "jpg", "image/jpeg"). Change all callers. * keyedit.c (menu_showphoto), keylist.c (list_keyblock_print): Allow viewing multiple images within a single attribute packet. * gpgv.c: Various stubs for link happiness.
This commit is contained in:
parent
0d63a076b0
commit
6dc53d136a
11 changed files with 283 additions and 157 deletions
19
g10/sign.c
19
g10/sign.c
|
@ -62,6 +62,10 @@ mk_notation_and_policy( PKT_signature *sig, PKT_public_key *pk )
|
|||
byte *buf;
|
||||
unsigned n1, n2;
|
||||
STRLIST nd=NULL,pu=NULL;
|
||||
struct expando_args args;
|
||||
|
||||
memset(&args,0,sizeof(args));
|
||||
args.pk=pk;
|
||||
|
||||
/* notation data */
|
||||
if(IS_SIG(sig) && opt.sig_notation_data)
|
||||
|
@ -124,18 +128,13 @@ mk_notation_and_policy( PKT_signature *sig, PKT_public_key *pk )
|
|||
{
|
||||
string = pu->d;
|
||||
|
||||
if(pk)
|
||||
s=pct_expando(string,&args);
|
||||
if(!s)
|
||||
{
|
||||
s=pct_expando(string,pk);
|
||||
if(!s)
|
||||
{
|
||||
log_error(_("WARNING: unable to %%-expand policy url "
|
||||
"(too large). Using unexpanded.\n"));
|
||||
s=m_strdup(string);
|
||||
}
|
||||
log_error(_("WARNING: unable to %%-expand policy url "
|
||||
"(too large). Using unexpanded.\n"));
|
||||
s=m_strdup(string);
|
||||
}
|
||||
else
|
||||
s=m_strdup(string);
|
||||
|
||||
build_sig_subpkt(sig,SIGSUBPKT_POLICY|
|
||||
((pu->flags & 1)?SIGSUBPKT_FLAG_CRITICAL:0),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue