security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-23 10:29:58 +01:00
Code Activity

* options.c, gpg.c (main), keyserver.c (keyserver_spawn): No special

Browse Source 
treatment of include-revoked, include-subkeys, and try-dns-srv.  These are
keyserver features, and GPG shouldn't get involved here.
This commit is contained in:
David Shaw 2006-02-23 22:39:40 +00:00
parent 0302c7e0ac
commit 624f3582ba
4 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g10/ChangeLog
View File

@ -1,5 +1,10 @@
2006-02-23 David Shaw <dshaw@jabberwocky.com> 2006-02-23 David Shaw <dshaw@jabberwocky.com>
* options.c, gpg.c (main), keyserver.c (keyserver_spawn): No
special treatment of include-revoked, include-subkeys, and
try-dns-srv. These are keyserver features, and GPG shouldn't get
involved here.
* keyserver.c (parse_keyserver_uri, add_canonical_option): Always * keyserver.c (parse_keyserver_uri, add_canonical_option): Always
append options to the list, as ordering may be significant to the append options to the list, as ordering may be significant to the
user. user.

2
g10/gpg.c
View File

@ -1731,7 +1731,7 @@ main (int argc, char **argv )
opt.keyserver_options.import_options=IMPORT_REPAIR_PKS_SUBKEY_BUG; opt.keyserver_options.import_options=IMPORT_REPAIR_PKS_SUBKEY_BUG;
opt.keyserver_options.export_options=EXPORT_ATTRIBUTES; opt.keyserver_options.export_options=EXPORT_ATTRIBUTES;
opt.keyserver_options.options= opt.keyserver_options.options=
KEYSERVER_INCLUDE_SUBKEYS|KEYSERVER_INCLUDE_REVOKED|KEYSERVER_TRY_DNS_SRV|KEYSERVER_HONOR_KEYSERVER_URL|KEYSERVER_HONOR_PKA_RECORD; KEYSERVER_HONOR_KEYSERVER_URL|KEYSERVER_HONOR_PKA_RECORD;
opt.verify_options= opt.verify_options=
VERIFY_SHOW_POLICY_URLS|VERIFY_SHOW_STD_NOTATIONS|VERIFY_SHOW_KEYSERVER_URLS; VERIFY_SHOW_POLICY_URLS|VERIFY_SHOW_STD_NOTATIONS|VERIFY_SHOW_KEYSERVER_URLS;
opt.trust_model=TM_AUTO; opt.trust_model=TM_AUTO;

23
g10/keyserver.c
View File

@ -67,17 +67,13 @@ struct keyrec
enum ks_action {KS_UNKNOWN=0,KS_GET,KS_GETNAME,KS_SEND,KS_SEARCH}; enum ks_action {KS_UNKNOWN=0,KS_GET,KS_GETNAME,KS_SEND,KS_SEARCH};
/* Tell remote processes about these options */
#define REMOTE_TELL (KEYSERVER_INCLUDE_REVOKED|KEYSERVER_INCLUDE_SUBKEYS|KEYSERVER_TRY_DNS_SRV)
static struct parse_options keyserver_opts[]= static struct parse_options keyserver_opts[]=
{ {
/* some of these options are not real - just for the help
message */
{"max-cert-size",0,NULL,NULL}, {"max-cert-size",0,NULL,NULL},
{"include-revoked",KEYSERVER_INCLUDE_REVOKED,NULL, {"include-revoked",0,NULL,N_("include revoked keys in search results")},
N_("include revoked keys in search results")}, {"include-subkeys",0,NULL,N_("include subkeys when searching by key ID")},
{"include-subkeys",KEYSERVER_INCLUDE_SUBKEYS,NULL,
N_("include subkeys when searching by key ID")},
/* not a real option - just for the help message */
{"use-temp-files",0,NULL, {"use-temp-files",0,NULL,
N_("use temporary files to pass data to keyserver helpers")}, N_("use temporary files to pass data to keyserver helpers")},
{"keep-temp-files",KEYSERVER_KEEP_TEMP_FILES,NULL, {"keep-temp-files",KEYSERVER_KEEP_TEMP_FILES,NULL,
@ -86,8 +82,6 @@ static struct parse_options keyserver_opts[]=
NULL}, NULL},
{"auto-key-retrieve",KEYSERVER_AUTO_KEY_RETRIEVE,NULL, {"auto-key-retrieve",KEYSERVER_AUTO_KEY_RETRIEVE,NULL,
N_("automatically retrieve keys when verifying signatures")}, N_("automatically retrieve keys when verifying signatures")},
{"try-dns-srv",KEYSERVER_TRY_DNS_SRV,NULL,
NULL},
{"honor-keyserver-url",KEYSERVER_HONOR_KEYSERVER_URL,NULL, {"honor-keyserver-url",KEYSERVER_HONOR_KEYSERVER_URL,NULL,
N_("honor the preferred keyserver URL set on the key")}, N_("honor the preferred keyserver URL set on the key")},
{"honor-pka-record",KEYSERVER_HONOR_PKA_RECORD,NULL, {"honor-pka-record",KEYSERVER_HONOR_PKA_RECORD,NULL,
@ -933,7 +927,6 @@ keyserver_spawn(enum ks_action action,STRLIST list,KEYDB_SEARCH_DESC *desc,
unsigned int maxlen,buflen; unsigned int maxlen,buflen;
char *command,*end,*searchstr=NULL; char *command,*end,*searchstr=NULL;
byte *line=NULL; byte *line=NULL;
struct parse_options *kopts;
struct exec_info *spawn; struct exec_info *spawn;
const char *scheme; const char *scheme;
const char *libexecdir = get_libexecdir (); const char *libexecdir = get_libexecdir ();
@ -1050,15 +1043,13 @@ keyserver_spawn(enum ks_action action,STRLIST list,KEYDB_SEARCH_DESC *desc,
fprintf(spawn->tochild,"PATH %s\n",keyserver->path); fprintf(spawn->tochild,"PATH %s\n",keyserver->path);
} }
/* Write options */ /* Write global options */
for(i=0,kopts=keyserver_opts;kopts[i].name;i++)
if(opt.keyserver_options.options & kopts[i].bit & REMOTE_TELL)
fprintf(spawn->tochild,"OPTION %s\n",kopts[i].name);
for(temp=opt.keyserver_options.other;temp;temp=temp->next) for(temp=opt.keyserver_options.other;temp;temp=temp->next)
fprintf(spawn->tochild,"OPTION %s\n",temp->d); fprintf(spawn->tochild,"OPTION %s\n",temp->d);
/* Write per-keyserver options */
for(temp=opt.keyserver->options;temp;temp=temp->next) for(temp=opt.keyserver->options;temp;temp=temp->next)
fprintf(spawn->tochild,"OPTION %s\n",temp->d); fprintf(spawn->tochild,"OPTION %s\n",temp->d);

15
g10/options.h
View File

@ -313,14 +313,11 @@ struct {
#define VERIFY_SHOW_UID_VALIDITY (1<<5) #define VERIFY_SHOW_UID_VALIDITY (1<<5)
#define VERIFY_SHOW_UNUSABLE_UIDS (1<<6) #define VERIFY_SHOW_UNUSABLE_UIDS (1<<6)
#define KEYSERVER_INCLUDE_REVOKED (1<<0) #define KEYSERVER_USE_TEMP_FILES (1<<0)
#define KEYSERVER_INCLUDE_SUBKEYS (1<<1) #define KEYSERVER_KEEP_TEMP_FILES (1<<1)
#define KEYSERVER_USE_TEMP_FILES (1<<2) #define KEYSERVER_ADD_FAKE_V3 (1<<2)
#define KEYSERVER_KEEP_TEMP_FILES (1<<3) #define KEYSERVER_AUTO_KEY_RETRIEVE (1<<3)
#define KEYSERVER_ADD_FAKE_V3 (1<<4) #define KEYSERVER_HONOR_KEYSERVER_URL (1<<4)
#define KEYSERVER_AUTO_KEY_RETRIEVE (1<<5) #define KEYSERVER_HONOR_PKA_RECORD (1<<5)
#define KEYSERVER_TRY_DNS_SRV (1<<6)
#define KEYSERVER_HONOR_KEYSERVER_URL (1<<7)
#define KEYSERVER_HONOR_PKA_RECORD (1<<8)
#endif /*G10_OPTIONS_H*/ #endif /*G10_OPTIONS_H*/