security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Activity

* http.c (do_parse_uri): Properly handle IPv6 literal addresses as per 

RFC-2732.  Adapted from patch by Phil Pennock.
This commit is contained in:
David Shaw 2009-03-13 18:59:07 +00:00
parent 1eeefbf7f7
commit 104712d412
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/ChangeLog
View File

@ -1,3 +1,8 @@
2009-03-13 David Shaw <dshaw@jabberwocky.com>
* http.c (do_parse_uri): Properly handle IPv6 literal addresses as
per RFC-2732. Adapted from patch by Phil Pennock.
2009-03-06 Werner Koch <wk@g10code.com> 2009-03-06 Werner Koch <wk@g10code.com>
* sexputil.c (make_canon_sexp): New. * sexputil.c (make_canon_sexp): New.

22
common/http.c
View File

@ -1,6 +1,6 @@
/* http.c - HTTP protocol handler /* http.c - HTTP protocol handler
* Copyright (C) 1999, 2001, 2002, 2003, 2004, * Copyright (C) 1999, 2001, 2002, 2003, 2004, 2006,
* 2006 Free Software Foundation, Inc. * 2009 Free Software Foundation, Inc.
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *
@ -623,17 +623,27 @@ do_parse_uri (parsed_uri_t uri, int only_local_part)
for (pp=p; *pp; pp++) for (pp=p; *pp; pp++)
*pp = tolower (*(unsigned char*)pp); *pp = tolower (*(unsigned char*)pp);
uri->host = p;
/* Handle an IPv6 literal */
if( *p == '[' && (p3=strchr( p, ']' )) )
{
*p3++ = '\0';
/* worst case, uri->host should have length 0, points to \0 */
uri->host = p + 1;
p = p3;
}
else
uri->host = p;
if ((p3 = strchr (p, ':'))) if ((p3 = strchr (p, ':')))
{ {
*p3++ = 0; *p3++ = '\0';
uri->port = atoi (p3); uri->port = atoi (p3);
} }
uri->host = p;
if ((n = remove_escapes (uri->host)) < 0) if ((n = remove_escapes (uri->host)) < 0)
return gpg_error (GPG_ERR_BAD_URI); return gpg_error (GPG_ERR_BAD_URI);
if (n != strlen (p)) if (n != strlen (uri->host))
return gpg_error (GPG_ERR_BAD_URI); /* Hostname incudes a Nul. */ return gpg_error (GPG_ERR_BAD_URI); /* Hostname incudes a Nul. */
p = p2 ? p2 : NULL; p = p2 ? p2 : NULL;
} }