security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-11-10 21:38:50 +01:00
Code Activity

* keyserver.c (parse_keyserver_uri): Include the scheme in the uri

Browse Source 
even when we've assumed "hkp" when there was no scheme.
This commit is contained in:
David Shaw 2006-02-21 05:20:08 +00:00
parent ca6c57bc8a
commit 8a1bd087fc
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g10/ChangeLog
View File

@ -1,3 +1,8 @@
2006-02-20 David Shaw <dshaw@jabberwocky.com>
* keyserver.c (parse_keyserver_uri): Include the scheme in the uri
even when we've assumed "hkp" when there was no scheme.
2006-02-14 Werner Koch <wk@gnupg.org> 2006-02-14 Werner Koch <wk@gnupg.org>
* verify.c (verify_signatures): Print warning also for NO_DATA. * verify.c (verify_signatures): Print warning also for NO_DATA.

9
g10/keyserver.c
View File

@ -215,8 +215,6 @@ parse_keyserver_uri(const char *uri,int require_scheme,
keyserver=xmalloc_clear(sizeof(struct keyserver_spec)); keyserver=xmalloc_clear(sizeof(struct keyserver_spec));
keyserver->uri=xstrdup(uri);
/* Get the scheme */ /* Get the scheme */
for(idx=uri,count=0;*idx && *idx!=':';idx++) for(idx=uri,count=0;*idx && *idx!=':';idx++)
@ -247,11 +245,18 @@ parse_keyserver_uri(const char *uri,int require_scheme,
/* Assume HKP if there is no scheme */ /* Assume HKP if there is no scheme */
assume_hkp=1; assume_hkp=1;
keyserver->scheme=xstrdup("hkp"); keyserver->scheme=xstrdup("hkp");
keyserver->uri=xmalloc(strlen(keyserver->scheme)+3+strlen(uri)+1);
strcpy(keyserver->uri,keyserver->scheme);
strcat(keyserver->uri,"://");
strcat(keyserver->uri,uri);
} }
else else
{ {
int i; int i;
keyserver->uri=xstrdup(uri);
keyserver->scheme=xmalloc(count+1); keyserver->scheme=xmalloc(count+1);
/* Force to lowercase */ /* Force to lowercase */