[canohost.c match.c ssh.c sshconnect.c]
     be strict with tolower() casting
This commit is contained in:
Damien Miller 2006-03-26 14:09:54 +11:00
parent 1ff7c642ee
commit 1d2b6706ba
5 changed files with 8 additions and 5 deletions

View File

@ -95,6 +95,9 @@
- deraadt@cvs.openbsd.org 2006/03/20 18:41:43 - deraadt@cvs.openbsd.org 2006/03/20 18:41:43
[dns.c] [dns.c]
cast xstrdup to propert u_char * cast xstrdup to propert u_char *
- deraadt@cvs.openbsd.org 2006/03/20 18:42:27
[canohost.c match.c ssh.c sshconnect.c]
be strict with tolower() casting
20060325 20060325
- OpenBSD CVS Sync - OpenBSD CVS Sync
@ -4352,4 +4355,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.4269 2006/03/26 03:09:09 djm Exp $ $Id: ChangeLog,v 1.4270 2006/03/26 03:09:54 djm Exp $

View File

@ -88,7 +88,7 @@ get_remote_hostname(int sock, int use_dns)
*/ */
for (i = 0; name[i]; i++) for (i = 0; name[i]; i++)
if (isupper(name[i])) if (isupper(name[i]))
name[i] = tolower(name[i]); name[i] = (char)tolower(name[i]);
/* /*
* Map it back to an IP address and check that the given * Map it back to an IP address and check that the given
* address actually is an address of this host. This is * address actually is an address of this host. This is

View File

@ -137,7 +137,7 @@ match_pattern_list(const char *string, const char *pattern, u_int len,
i < len && subi < sizeof(sub) - 1 && pattern[i] != ','; i < len && subi < sizeof(sub) - 1 && pattern[i] != ',';
subi++, i++) subi++, i++)
sub[subi] = dolower && isupper(pattern[i]) ? sub[subi] = dolower && isupper(pattern[i]) ?
tolower(pattern[i]) : pattern[i]; (char)tolower(pattern[i]) : pattern[i];
/* If subpattern too long, return failure (no match). */ /* If subpattern too long, return failure (no match). */
if (subi >= sizeof(sub) - 1) if (subi >= sizeof(sub) - 1)
return 0; return 0;

2
ssh.c
View File

@ -629,7 +629,7 @@ main(int ac, char **av)
if (options.host_key_alias != NULL) { if (options.host_key_alias != NULL) {
for (p = options.host_key_alias; *p; p++) for (p = options.host_key_alias; *p; p++)
if (isupper(*p)) if (isupper(*p))
*p = tolower(*p); *p = (char)tolower(*p);
} }
/* Get default port if port has not been set. */ /* Get default port if port has not been set. */

View File

@ -927,7 +927,7 @@ ssh_login(Sensitive *sensitive, const char *orighost,
host = xstrdup(orighost); host = xstrdup(orighost);
for (cp = host; *cp; cp++) for (cp = host; *cp; cp++)
if (isupper(*cp)) if (isupper(*cp))
*cp = tolower(*cp); *cp = (char)tolower(*cp);
/* Exchange protocol version identification strings with the server. */ /* Exchange protocol version identification strings with the server. */
ssh_exchange_identification(); ssh_exchange_identification();