diff options
| author | David Shaw <[email protected]> | 2004-04-20 19:37:58 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-04-20 19:37:58 +0000 |
| commit | e161b21b53981d90abab191219cdfedc75255fb0 (patch) | |
| tree | 275eb68f446734a4f2da32b358cf8e991f98a8ff | |
| parent | * keygen.c (make_backsig): New function to add a backsig to a binding sig (diff) | |
| download | gnupg-e161b21b53981d90abab191219cdfedc75255fb0.tar.gz gnupg-e161b21b53981d90abab191219cdfedc75255fb0.zip | |
* keyserver.c (parse_keyserver_uri): Do not accept "http" as an alias for
"hkp". They are not the same thing.
| -rw-r--r-- | g10/ChangeLog | 5 | ||||
| -rw-r--r-- | g10/keyserver.c | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 20195a169..934c51d0c 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2004-04-20 David Shaw <[email protected]> + + * keyserver.c (parse_keyserver_uri): Do not accept "http" as an + alias for "hkp". They are not the same thing. + 2004-04-12 David Shaw <[email protected]> * keygen.c (make_backsig): New function to add a backsig to a diff --git a/g10/keyserver.c b/g10/keyserver.c index baf3f7839..47e386424 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -156,8 +156,7 @@ parse_keyserver_uri(char *uri,const char *configname,unsigned int configlineno) opt.keyserver_scheme="hkp"; opt.keyserver_options.broken_http_proxy=1; } - else if(ascii_strcasecmp(opt.keyserver_scheme,"x-hkp")==0 - || ascii_strcasecmp(opt.keyserver_scheme,"http")==0) + else if(ascii_strcasecmp(opt.keyserver_scheme,"x-hkp")==0) { /* Canonicalize this to "hkp" so it works with both the internal and external keyserver interface. */ |