summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--canohost.c3
-rw-r--r--clientloop.c8
-rw-r--r--match.c6
-rw-r--r--readconf.c4
-rw-r--r--sftp.c4
6 files changed, 16 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 253e02275..cb4dae30e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,10 @@
15 [scp.c] 15 [scp.c]
16 unsigned casts for ctype macros where neccessary 16 unsigned casts for ctype macros where neccessary
17 ok guenther millert markus 17 ok guenther millert markus
18 - deraadt@cvs.openbsd.org 2013/11/20 20:54:10
19 [canohost.c clientloop.c match.c readconf.c sftp.c]
20 unsigned casts for ctype macros where neccessary
21 ok guenther millert markus
18 22
1920131110 2320131110
20 - (dtucker) [regress/keytype.sh] Populate ECDSA key types to be tested by 24 - (dtucker) [regress/keytype.sh] Populate ECDSA key types to be tested by
diff --git a/canohost.c b/canohost.c
index a8eeb0e35..2e5a0b86e 100644
--- a/canohost.c
+++ b/canohost.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: canohost.c,v 1.68 2013/10/14 23:28:22 djm Exp $ */ 1/* $OpenBSD: canohost.c,v 1.69 2013/11/20 20:54:10 deraadt Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -20,7 +20,6 @@
20#include <netinet/in.h> 20#include <netinet/in.h>
21#include <arpa/inet.h> 21#include <arpa/inet.h>
22 22
23#include <ctype.h>
24#include <errno.h> 23#include <errno.h>
25#include <netdb.h> 24#include <netdb.h>
26#include <stdio.h> 25#include <stdio.h>
diff --git a/clientloop.c b/clientloop.c
index 8ad5d06b0..f30c8b6b5 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: clientloop.c,v 1.255 2013/11/08 00:39:15 djm Exp $ */ 1/* $OpenBSD: clientloop.c,v 1.256 2013/11/20 20:54:10 deraadt Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -289,7 +289,7 @@ client_x11_display_valid(const char *display)
289 289
290 dlen = strlen(display); 290 dlen = strlen(display);
291 for (i = 0; i < dlen; i++) { 291 for (i = 0; i < dlen; i++) {
292 if (!isalnum(display[i]) && 292 if (!isalnum((u_char)display[i]) &&
293 strchr(SSH_X11_VALID_DISPLAY_CHARS, display[i]) == NULL) { 293 strchr(SSH_X11_VALID_DISPLAY_CHARS, display[i]) == NULL) {
294 debug("Invalid character '%c' in DISPLAY", display[i]); 294 debug("Invalid character '%c' in DISPLAY", display[i]);
295 return 0; 295 return 0;
@@ -884,7 +884,7 @@ process_cmdline(void)
884 cmd = s = read_passphrase("\r\nssh> ", RP_ECHO); 884 cmd = s = read_passphrase("\r\nssh> ", RP_ECHO);
885 if (s == NULL) 885 if (s == NULL)
886 goto out; 886 goto out;
887 while (isspace(*s)) 887 while (isspace((u_char)*s))
888 s++; 888 s++;
889 if (*s == '-') 889 if (*s == '-')
890 s++; /* Skip cmdline '-', if any */ 890 s++; /* Skip cmdline '-', if any */
@@ -938,7 +938,7 @@ process_cmdline(void)
938 goto out; 938 goto out;
939 } 939 }
940 940
941 while (isspace(*++s)) 941 while (isspace((u_char)*++s))
942 ; 942 ;
943 943
944 /* XXX update list of forwards in options */ 944 /* XXX update list of forwards in options */
diff --git a/match.c b/match.c
index 7be7d2c5c..c35e32896 100644
--- a/match.c
+++ b/match.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: match.c,v 1.28 2013/05/17 00:13:13 djm Exp $ */ 1/* $OpenBSD: match.c,v 1.29 2013/11/20 20:54:10 deraadt Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -141,8 +141,8 @@ match_pattern_list(const char *string, const char *pattern, u_int len,
141 for (subi = 0; 141 for (subi = 0;
142 i < len && subi < sizeof(sub) - 1 && pattern[i] != ','; 142 i < len && subi < sizeof(sub) - 1 && pattern[i] != ',';
143 subi++, i++) 143 subi++, i++)
144 sub[subi] = dolower && isupper(pattern[i]) ? 144 sub[subi] = dolower && isupper((u_char)pattern[i]) ?
145 (char)tolower(pattern[i]) : pattern[i]; 145 tolower((u_char)pattern[i]) : pattern[i];
146 /* If subpattern too long, return failure (no match). */ 146 /* If subpattern too long, return failure (no match). */
147 if (subi >= sizeof(sub) - 1) 147 if (subi >= sizeof(sub) - 1)
148 return 0; 148 return 0;
diff --git a/readconf.c b/readconf.c
index 63c0ba196..0e1030d00 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: readconf.c,v 1.213 2013/10/24 00:51:48 dtucker Exp $ */ 1/* $OpenBSD: readconf.c,v 1.214 2013/11/20 20:54:10 deraadt Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1753,7 +1753,7 @@ parse_forward(Forward *fwd, const char *fwdspec, int dynamicfwd, int remotefwd)
1753 cp = p = xstrdup(fwdspec); 1753 cp = p = xstrdup(fwdspec);
1754 1754
1755 /* skip leading spaces */ 1755 /* skip leading spaces */
1756 while (isspace(*cp)) 1756 while (isspace((u_char)*cp))
1757 cp++; 1757 cp++;
1758 1758
1759 for (i = 0; i < 4; ++i) 1759 for (i = 0; i < 4; ++i)
diff --git a/sftp.c b/sftp.c
index abc689e8c..ad1f8c84d 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp.c,v 1.157 2013/10/17 07:35:48 jmc Exp $ */ 1/* $OpenBSD: sftp.c,v 1.158 2013/11/20 20:54:10 deraadt Exp $ */
2/* 2/*
3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> 3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
4 * 4 *
@@ -1065,7 +1065,7 @@ makeargv(const char *arg, int *argcp, int sloppy, char *lastquote,
1065 error("Too many arguments."); 1065 error("Too many arguments.");
1066 return NULL; 1066 return NULL;
1067 } 1067 }
1068 if (isspace(arg[i])) { 1068 if (isspace((unsigned char)arg[i])) {
1069 if (state == MA_UNQUOTED) { 1069 if (state == MA_UNQUOTED) {
1070 /* Terminate current argument */ 1070 /* Terminate current argument */
1071 argvs[j++] = '\0'; 1071 argvs[j++] = '\0';