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

* getkey.c (parse_auto_key_locate): Error if the user selects "cert" or

Browse Source 
"pka" when those features are disabled.

* misc.c (has_invalid_email_chars): Fix some C syntax that broke the
compilers on SGI IRIX MIPS and Compaq/DEC OSF/1 Alpha.  Noted by Nelson H.
F. Beebe.
This commit is contained in:
David Shaw 2006-03-01 18:16:55 +00:00
parent 2385935afa
commit 78904c691c
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
g10/ChangeLog
View File

@ -1,3 +1,12 @@
2006-03-01 David Shaw <dshaw@jabberwocky.com>
* getkey.c (parse_auto_key_locate): Error if the user selects
"cert" or "pka" when those features are disabled.
* misc.c (has_invalid_email_chars): Fix some C syntax that broke
the compilers on SGI IRIX MIPS and Compaq/DEC OSF/1 Alpha. Noted
by Nelson H. F. Beebe.
2006-02-27 David Shaw <dshaw@jabberwocky.com> 2006-02-27 David Shaw <dshaw@jabberwocky.com>
* options.skel: Document auto-key-locate and give a pointer to * options.skel: Document auto-key-locate and give a pointer to

14
g10/getkey.c
View File

@ -2928,14 +2928,18 @@ parse_auto_key_locate(char *options)
akl=xmalloc_clear(sizeof(*akl)); akl=xmalloc_clear(sizeof(*akl));
if(ascii_strcasecmp(tok,"cert")==0) if(ascii_strcasecmp(tok,"ldap")==0)
akl->type=AKL_CERT;
else if(ascii_strcasecmp(tok,"pka")==0)
akl->type=AKL_PKA;
else if(ascii_strcasecmp(tok,"ldap")==0)
akl->type=AKL_LDAP; akl->type=AKL_LDAP;
else if(ascii_strcasecmp(tok,"keyserver")==0) else if(ascii_strcasecmp(tok,"keyserver")==0)
akl->type=AKL_KEYSERVER; akl->type=AKL_KEYSERVER;
#ifdef USE_DNS_CERT
else if(ascii_strcasecmp(tok,"cert")==0)
akl->type=AKL_CERT;
#endif
#ifdef USE_DNS_PKA
else if(ascii_strcasecmp(tok,"pka")==0)
akl->type=AKL_PKA;
#endif
else if((akl->spec=parse_keyserver_uri(tok,1,NULL,0))) else if((akl->spec=parse_keyserver_uri(tok,1,NULL,0)))
akl->type=AKL_SPEC; akl->type=AKL_SPEC;
else else

7
g10/misc.c
View File

@ -1081,15 +1081,12 @@ unescape_percent_string (const unsigned char *s)
} }
int int
has_invalid_email_chars (const char *s) has_invalid_email_chars (const char *s)
{ {
int at_seen=0; int at_seen=0;
static char valid_chars[] = ("01234567890_-." const char *valid_chars=
"abcdefghijklmnopqrstuvwxyz" "01234567890_-.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
"ABCDEFGHIJKLMNOPQRSTUVWXYZ");
for ( ; *s; s++ ) for ( ; *s; s++ )
{ {