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

* options.skel: Sample photo viewers for Win32.

Browse source 
* misc.c (pct_expando): Use the seckey for %k/%K if the pubkey is not
available.

* photoid.h, photoid.c (show_photos): Include the seckey in case a user
tries to view a photo on a secret key, and change all callers in keyedit.c
(menu_showphoto), keylist.c (list_keyblock_print), and photoid.c
(generate_photo_id).
This commit is contained in:
David Shaw 2002-06-03 12:39:23 +00:00
parent e96f8f1fe0
commit cd2450f41f
7 changed files with 30 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
g10/photoid.c
View file

@ -120,7 +120,7 @@ PKT_user_id *generate_photo_id(PKT_public_key *pk)
parse_attribute_subpkts(uid);
make_attribute_uidname(uid);
show_photos(uid->attribs,uid->numattribs,pk);
show_photos(uid->attribs,uid->numattribs,pk,NULL);
switch(cpr_get_answer_yes_no_quit("photoid.jpeg.okay",
_("Is this photo correct (y/N/q)? ")))
{
@ -215,7 +215,7 @@ char *image_type_to_string(byte type,int style)
}
void show_photos(const struct user_attribute *attrs,
int count,PKT_public_key *pk)
int count,PKT_public_key *pk,PKT_secret_key *sk)
{
int i;
struct expando_args args;
@ -224,9 +224,12 @@ void show_photos(const struct user_attribute *attrs,
memset(&args,0,sizeof(args));
args.pk=pk;
args.sk=sk;
if(pk)
keyid_from_pk(pk,kid);
else if(sk)
keyid_from_sk(sk,kid);
for(i=0;i<count;i++)
if(attrs[i].type==ATTRIB_IMAGE &&