security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-21 14:47:03 +01:00
Code Activity

* main.h, keylist.c (show_notation): Add argument to show only user

Browse Source 
notations, only standard notations, or both.  Change all callers.

* keyserver.c (keyserver_spawn): We still need EXEC_TEMPFILE_ONLY.
This commit is contained in:
David Shaw 2004-04-29 03:42:54 +00:00
parent 75f14e8571
commit 0842905be3
6 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
g10/ChangeLog
View File

@ -1,3 +1,11 @@
2004-04-28 David Shaw <dshaw@jabberwocky.com>
* main.h, keylist.c (show_notation): Add argument to show only
user notations, only standard notations, or both. Change all
callers.
* keyserver.c (keyserver_spawn): We still need EXEC_TEMPFILE_ONLY.
2004-04-28 Werner Koch <wk@gnupg.org> 2004-04-28 Werner Koch <wk@gnupg.org>
* card-util.c (card_edit): Require PIN only for generate. * card-util.c (card_edit): Require PIN only for generate.

2
g10/keyedit.c
View File

@ -170,7 +170,7 @@ print_and_check_one_sig( KBNODE keyblock, KBNODE node,
show_policy_url(sig,3,0); show_policy_url(sig,3,0);
if(sig->flags.notation && (opt.list_options&LIST_SHOW_NOTATIONS)) if(sig->flags.notation && (opt.list_options&LIST_SHOW_NOTATIONS))
show_notation(sig,3,0); show_notation(sig,3,0,0);
if(sig->flags.pref_ks && (opt.list_options&LIST_SHOW_KEYSERVER_URLS)) if(sig->flags.pref_ks && (opt.list_options&LIST_SHOW_KEYSERVER_URLS))
show_keyserver_url(sig,3,0); show_keyserver_url(sig,3,0);

15
g10/keylist.c
View File

@ -236,10 +236,14 @@ show_keyserver_url(PKT_signature *sig,int indent,int mode)
mode=0 for stdout. mode=0 for stdout.
mode=1 for log_info + status messages mode=1 for log_info + status messages
mode=2 for status messages only mode=2 for status messages only
which=0 for both standard and user notations
which=1 for standard notations only
which=2 for user notations only
*/ */
void void
show_notation(PKT_signature *sig,int indent,int mode) show_notation(PKT_signature *sig,int indent,int mode,int which)
{ {
const byte *p; const byte *p;
size_t len; size_t len;
@ -259,9 +263,14 @@ show_notation(PKT_signature *sig,int indent,int mode)
if(8+n1+n2!=len) if(8+n1+n2!=len)
{ {
log_info(_("WARNING: invalid notation data found\n")); log_info(_("WARNING: invalid notation data found\n"));
return; continue;
} }
if(which==1 && memchr(p+8,'@',n1))
continue;
else if(which==2 && !memchr(p+8,'@',n1))
continue;
if(mode!=2) if(mode!=2)
{ {
int i; int i;
@ -864,7 +873,7 @@ list_keyblock_print ( KBNODE keyblock, int secret, int fpr, void *opaque )
if(sig->flags.notation if(sig->flags.notation
&& (opt.list_options&LIST_SHOW_NOTATIONS)) && (opt.list_options&LIST_SHOW_NOTATIONS))
show_notation(sig,3,0); show_notation(sig,3,0,0);
if(sig->flags.pref_ks if(sig->flags.pref_ks
&& (opt.list_options&LIST_SHOW_KEYSERVER_URLS)) && (opt.list_options&LIST_SHOW_KEYSERVER_URLS))

4
g10/keyserver.c
View File

@ -719,6 +719,10 @@ keyserver_spawn(int action,STRLIST list,KEYDB_SEARCH_DESC *desc,
assert(keyserver); assert(keyserver);
#ifdef EXEC_TEMPFILE_ONLY
opt.keyserver_options.use_temp_files=1;
#endif
/* Push the libexecdir into path. If DISABLE_KEYSERVER_PATH is set, /* Push the libexecdir into path. If DISABLE_KEYSERVER_PATH is set,
use the 0 arg to replace the path. */ use the 0 arg to replace the path. */
#ifdef DISABLE_KEYSERVER_PATH #ifdef DISABLE_KEYSERVER_PATH

2
g10/main.h
View File

@ -222,7 +222,7 @@ void list_keyblock( KBNODE keyblock, int secret, int fpr, void *opaque );
void print_fingerprint (PKT_public_key *pk, PKT_secret_key *sk, int mode); void print_fingerprint (PKT_public_key *pk, PKT_secret_key *sk, int mode);
void show_policy_url(PKT_signature *sig,int indent,int mode); void show_policy_url(PKT_signature *sig,int indent,int mode);
void show_keyserver_url(PKT_signature *sig,int indent,int mode); void show_keyserver_url(PKT_signature *sig,int indent,int mode);
void show_notation(PKT_signature *sig,int indent,int mode); void show_notation(PKT_signature *sig,int indent,int mode,int which);
void dump_attribs(const PKT_user_id *uid, void dump_attribs(const PKT_user_id *uid,
PKT_public_key *pk,PKT_secret_key *sk); PKT_public_key *pk,PKT_secret_key *sk);
void set_attrib_fd(int fd); void set_attrib_fd(int fd);

4
g10/mainproc.c
View File

@ -1539,9 +1539,9 @@ check_sig_and_print( CTX c, KBNODE node )
show_keyserver_url(sig,0,2); show_keyserver_url(sig,0,2);
if(opt.verify_options&VERIFY_SHOW_NOTATIONS) if(opt.verify_options&VERIFY_SHOW_NOTATIONS)
show_notation(sig,0,1); show_notation(sig,0,1,0);
else else
show_notation(sig,0,2); show_notation(sig,0,2,0);
} }
if( !rc && is_status_enabled() ) { if( !rc && is_status_enabled() ) {