- deraadt@cvs.openbsd.org 2006/03/20 18:42:27

     [canohost.c match.c ssh.c sshconnect.c]
     be strict with tolower() casting

diff --git a/ChangeLog b/ChangeLog
index ea3af21597d7dfa63aa886b13798fd53f0ccd3a2..e27976234e3c2bee43694e80318dd65ab2cd6e9e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -95,6 +95,9 @@
    - deraadt@cvs.openbsd.org 2006/03/20 18:41:43
      [dns.c]
      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
  - OpenBSD CVS Sync

diff --git a/canohost.c b/canohost.c
index 4fafb0b82d69539f47f11f771c5b2ec247bc354f..b1c35e99ea60ca78dca6f733542b1eb1d92978d0 100644 (file)
--- a/canohost.c
+++ b/canohost.c
@@ -88,7 +88,7 @@ get_remote_hostname(int sock, int use_dns)
         */
        for (i = 0; name[i]; 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
         * address actually is an address of this host.  This is

diff --git a/match.c b/match.c
index 736047df1720da90dedcc5c1b3cc22f240f221d5..e08afdeb0785e982fe6f186a55c9290b5ada3d1a 100644 (file)
--- a/match.c
+++ b/match.c
@@ -137,7 +137,7 @@ match_pattern_list(const char *string, const char *pattern, u_int len,
                    i < len && subi < sizeof(sub) - 1 && pattern[i] != ',';
                    subi++, 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 (subi >= sizeof(sub) - 1)
                        return 0;

diff --git a/ssh.c b/ssh.c
index 2681ccb6bb48c8e9ff76a834cb8054bf48ab0db4..0c950745bdecb38e2a3b0928741a37c10a9e0f44 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -629,7 +629,7 @@ main(int ac, char **av)
        if (options.host_key_alias != NULL) {
                for (p = options.host_key_alias; *p; p++)
                        if (isupper(*p))
-                               *p = tolower(*p);
+                               *p = (char)tolower(*p);
        }
 
        /* Get default port if port has not been set. */

diff --git a/sshconnect.c b/sshconnect.c
index 53b5200ff16b9a88eec9aabd360900e5fc545caa..33961e4dc169e264846726e03c15bfc19af8c25e 100644 (file)
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -927,7 +927,7 @@ ssh_login(Sensitive *sensitive, const char *orighost,
        host = xstrdup(orighost);
        for (cp = host; *cp; cp++)
                if (isupper(*cp))
-                       *cp = tolower(*cp);
+                       *cp = (char)tolower(*cp);
 
        /* Exchange protocol version identification strings with the server. */
        ssh_exchange_identification();