security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

* options.h, keyserver.c (parse_keyserver_options): Remove

Browse Source 
auto-cert-retrieve as it is no longer meaningful.  Add max-cert-size to
allow users to pick a max key size retrieved via CERT.
This commit is contained in:
David Shaw 2006-02-22 20:34:48 +00:00
parent 477defdb1b
commit 305288b5f5
3 changed files with 9 additions and 7 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-22 David Shaw <dshaw@jabberwocky.com> 2006-02-22 David Shaw <dshaw@jabberwocky.com>
* options.h, keyserver.c (parse_keyserver_options): Remove
auto-cert-retrieve as it is no longer meaningful. Add
max-cert-size to allow users to pick a max key size retrieved via
CERT.
* options.h, gpg.c (main), mainproc.c (check_sig_and_print), * options.h, gpg.c (main), mainproc.c (check_sig_and_print),
keyserver.c (keyserver_opts): Rename auto-pka-retrieve to keyserver.c (keyserver_opts): Rename auto-pka-retrieve to
honor-pka-record to be consistent with honor-keyserver-url. honor-pka-record to be consistent with honor-keyserver-url.

10
g10/keyserver.c
View File

@ -72,6 +72,7 @@ enum ks_action {KS_UNKNOWN=0,KS_GET,KS_GETNAME,KS_SEND,KS_SEARCH};
static struct parse_options keyserver_opts[]= static struct parse_options keyserver_opts[]=
{ {
{"max-cert-size",0,NULL,NULL},
{"include-revoked",KEYSERVER_INCLUDE_REVOKED,NULL, {"include-revoked",KEYSERVER_INCLUDE_REVOKED,NULL,
N_("include revoked keys in search results")}, N_("include revoked keys in search results")},
{"include-subkeys",KEYSERVER_INCLUDE_SUBKEYS,NULL, {"include-subkeys",KEYSERVER_INCLUDE_SUBKEYS,NULL,
@ -85,8 +86,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")},
{"auto-cert-retrieve",KEYSERVER_AUTO_CERT_RETRIEVE,NULL,
N_("automatically retrieve keys from DNS")},
{"try-dns-srv",KEYSERVER_TRY_DNS_SRV,NULL, {"try-dns-srv",KEYSERVER_TRY_DNS_SRV,NULL,
NULL}, NULL},
{"honor-keyserver-url",KEYSERVER_HONOR_KEYSERVER_URL,NULL, {"honor-keyserver-url",KEYSERVER_HONOR_KEYSERVER_URL,NULL,
@ -112,7 +111,7 @@ parse_keyserver_options(char *options)
char *tok; char *tok;
char *max_cert; char *max_cert;
keyserver_opts[7].value=&max_cert; keyserver_opts[0].value=&max_cert;
while((tok=optsep(&options))) while((tok=optsep(&options)))
{ {
@ -173,10 +172,9 @@ parse_keyserver_options(char *options)
} }
} }
if(opt.keyserver_options.options&KEYSERVER_AUTO_CERT_RETRIEVE) if(max_cert)
{ {
if(max_cert) max_cert_size=strtoul(max_cert,(char **)NULL,10);
max_cert_size=strtoul(max_cert,(char **)NULL,10);
if(max_cert_size==0) if(max_cert_size==0)
max_cert_size=DEFAULT_MAX_CERT_SIZE; max_cert_size=DEFAULT_MAX_CERT_SIZE;

1
g10/options.h
View File

@ -320,6 +320,5 @@ struct {
#define KEYSERVER_TRY_DNS_SRV (1<<6) #define KEYSERVER_TRY_DNS_SRV (1<<6)
#define KEYSERVER_HONOR_KEYSERVER_URL (1<<7) #define KEYSERVER_HONOR_KEYSERVER_URL (1<<7)
#define KEYSERVER_HONOR_PKA_RECORD (1<<8) #define KEYSERVER_HONOR_PKA_RECORD (1<<8)
#define KEYSERVER_AUTO_CERT_RETRIEVE (1<<9)
#endif /*G10_OPTIONS_H*/ #endif /*G10_OPTIONS_H*/