diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | scp.c | 6 |
2 files changed, 7 insertions, 3 deletions
@@ -11,6 +11,10 @@ | |||
11 | delay closure of in/out fds until after "Bad protocol version | 11 | delay closure of in/out fds until after "Bad protocol version |
12 | identification..." message, as get_remote_ipaddr/get_remote_port | 12 | identification..." message, as get_remote_ipaddr/get_remote_port |
13 | require them open. | 13 | require them open. |
14 | - deraadt@cvs.openbsd.org 2013/11/20 20:53:10 | ||
15 | [scp.c] | ||
16 | unsigned casts for ctype macros where neccessary | ||
17 | ok guenther millert markus | ||
14 | 18 | ||
15 | 20131110 | 19 | 20131110 |
16 | - (dtucker) [regress/keytype.sh] Populate ECDSA key types to be tested by | 20 | - (dtucker) [regress/keytype.sh] Populate ECDSA key types to be tested by |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: scp.c,v 1.178 2013/06/22 06:31:57 djm Exp $ */ | 1 | /* $OpenBSD: scp.c,v 1.179 2013/11/20 20:53:10 deraadt Exp $ */ |
2 | /* | 2 | /* |
3 | * scp - secure remote copy. This is basically patched BSD rcp which | 3 | * scp - secure remote copy. This is basically patched BSD rcp which |
4 | * uses ssh to do the data transfer (instead of using rcmd). | 4 | * uses ssh to do the data transfer (instead of using rcmd). |
@@ -1023,7 +1023,7 @@ sink(int argc, char **argv) | |||
1023 | if (*cp++ != ' ') | 1023 | if (*cp++ != ' ') |
1024 | SCREWUP("mode not delimited"); | 1024 | SCREWUP("mode not delimited"); |
1025 | 1025 | ||
1026 | for (size = 0; isdigit(*cp);) | 1026 | for (size = 0; isdigit((unsigned char)*cp);) |
1027 | size = size * 10 + (*cp++ - '0'); | 1027 | size = size * 10 + (*cp++ - '0'); |
1028 | if (*cp++ != ' ') | 1028 | if (*cp++ != ' ') |
1029 | SCREWUP("size not delimited"); | 1029 | SCREWUP("size not delimited"); |
@@ -1287,7 +1287,7 @@ okname(char *cp0) | |||
1287 | c = (int)*cp; | 1287 | c = (int)*cp; |
1288 | if (c & 0200) | 1288 | if (c & 0200) |
1289 | goto bad; | 1289 | goto bad; |
1290 | if (!isalpha(c) && !isdigit(c)) { | 1290 | if (!isalpha(c) && !isdigit((unsigned char)c)) { |
1291 | switch (c) { | 1291 | switch (c) { |
1292 | case '\'': | 1292 | case '\'': |
1293 | case '"': | 1293 | case '"': |