tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- deraadt@cvs.openbsd.org 2013/11/20 20:54:10 

[canohost.c clientloop.c match.c readconf.c sftp.c]
     unsigned casts for ctype macros where neccessary
     ok guenther millert markus
This commit is contained in:
Damien Miller 2013-11-21 13:57:15 +11:00
parent e00167307e
commit fdb2306acd
6 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -15,6 +15,10 @@
[scp.c] [scp.c]
unsigned casts for ctype macros where neccessary unsigned casts for ctype macros where neccessary
ok guenther millert markus ok guenther millert markus
- deraadt@cvs.openbsd.org 2013/11/20 20:54:10
[canohost.c clientloop.c match.c readconf.c sftp.c]
unsigned casts for ctype macros where neccessary
ok guenther millert markus
20131110 20131110
- (dtucker) [regress/keytype.sh] Populate ECDSA key types to be tested by - (dtucker) [regress/keytype.sh] Populate ECDSA key types to be tested by

3
canohost.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: canohost.c,v 1.68 2013/10/14 23:28:22 djm Exp $ */ /* $OpenBSD: canohost.c,v 1.69 2013/11/20 20:54:10 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -20,7 +20,6 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <ctype.h>
#include <errno.h> #include <errno.h>
#include <netdb.h> #include <netdb.h>
#include <stdio.h> #include <stdio.h>

8
clientloop.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: clientloop.c,v 1.255 2013/11/08 00:39:15 djm Exp $ */ /* $OpenBSD: clientloop.c,v 1.256 2013/11/20 20:54:10 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -289,7 +289,7 @@ client_x11_display_valid(const char *display)
dlen = strlen(display); dlen = strlen(display);
for (i = 0; i < dlen; i++) { for (i = 0; i < dlen; i++) {
if (!isalnum(display[i]) && if (!isalnum((u_char)display[i]) &&
strchr(SSH_X11_VALID_DISPLAY_CHARS, display[i]) == NULL) { strchr(SSH_X11_VALID_DISPLAY_CHARS, display[i]) == NULL) {
debug("Invalid character '%c' in DISPLAY", display[i]); debug("Invalid character '%c' in DISPLAY", display[i]);
return 0; return 0;
@ -884,7 +884,7 @@ process_cmdline(void)
cmd = s = read_passphrase("\r\nssh> ", RP_ECHO); cmd = s = read_passphrase("\r\nssh> ", RP_ECHO);
if (s == NULL) if (s == NULL)
goto out; goto out;
while (isspace(*s)) while (isspace((u_char)*s))
s++; s++;
if (*s == '-') if (*s == '-')
s++; /* Skip cmdline '-', if any */ s++; /* Skip cmdline '-', if any */
@ -938,7 +938,7 @@ process_cmdline(void)
goto out; goto out;
} }
while (isspace(*++s)) while (isspace((u_char)*++s))
; ;
/* XXX update list of forwards in options */ /* XXX update list of forwards in options */

6
match.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: match.c,v 1.28 2013/05/17 00:13:13 djm Exp $ */ /* $OpenBSD: match.c,v 1.29 2013/11/20 20:54:10 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * 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,
for (subi = 0; for (subi = 0;
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((u_char)pattern[i]) ?
(char)tolower(pattern[i]) : pattern[i]; tolower((u_char)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;

4
readconf.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: readconf.c,v 1.213 2013/10/24 00:51:48 dtucker Exp $ */ /* $OpenBSD: readconf.c,v 1.214 2013/11/20 20:54:10 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * 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)
cp = p = xstrdup(fwdspec); cp = p = xstrdup(fwdspec);
/* skip leading spaces */ /* skip leading spaces */
while (isspace(*cp)) while (isspace((u_char)*cp))
cp++; cp++;
for (i = 0; i < 4; ++i) for (i = 0; i < 4; ++i)

4
sftp.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sftp.c,v 1.157 2013/10/17 07:35:48 jmc Exp $ */ /* $OpenBSD: sftp.c,v 1.158 2013/11/20 20:54:10 deraadt Exp $ */
/* /*
* Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
* *
@ -1065,7 +1065,7 @@ makeargv(const char *arg, int *argcp, int sloppy, char *lastquote,
error("Too many arguments."); error("Too many arguments.");
return NULL; return NULL;
} }
if (isspace(arg[i])) { if (isspace((unsigned char)arg[i])) {
if (state == MA_UNQUOTED) { if (state == MA_UNQUOTED) {
/* Terminate current argument */ /* Terminate current argument */
argvs[j++] = '\0'; argvs[j++] = '\0';