diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | auth.c | 6 | ||||
-rw-r--r-- | auth2-none.c | 11 | ||||
-rw-r--r-- | authfile.c | 16 | ||||
-rw-r--r-- | channels.c | 4 | ||||
-rw-r--r-- | monitor.c | 4 | ||||
-rw-r--r-- | monitor_mm.c | 2 | ||||
-rw-r--r-- | openbsd-compat/xmmap.c | 8 | ||||
-rw-r--r-- | packet.c | 12 | ||||
-rw-r--r-- | packet.h | 4 | ||||
-rw-r--r-- | progressmeter.c | 4 | ||||
-rw-r--r-- | session.c | 5 |
12 files changed, 49 insertions, 33 deletions
@@ -27,6 +27,10 @@ | |||
27 | - djm@cvs.openbsd.org 2004/05/09 01:26:48 | 27 | - djm@cvs.openbsd.org 2004/05/09 01:26:48 |
28 | [kex.c] | 28 | [kex.c] |
29 | don't overwrite what we are trying to compute | 29 | don't overwrite what we are trying to compute |
30 | - deraadt@cvs.openbsd.org 2004/05/11 19:01:43 | ||
31 | [auth.c auth2-none.c authfile.c channels.c monitor.c monitor_mm.c | ||
32 | packet.c packet.h progressmeter.c session.c openbsd-compat/xmmap.c] | ||
33 | improve some code lint did not like; djm millert ok | ||
30 | 34 | ||
31 | 20040502 | 35 | 20040502 |
32 | - (dtucker) OpenBSD CVS Sync | 36 | - (dtucker) OpenBSD CVS Sync |
@@ -1103,4 +1107,4 @@ | |||
1103 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 1107 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
1104 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 1108 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
1105 | 1109 | ||
1106 | $Id: ChangeLog,v 1.3349 2004/05/13 06:31:48 dtucker Exp $ | 1110 | $Id: ChangeLog,v 1.3350 2004/05/13 06:39:33 dtucker Exp $ |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: auth.c,v 1.52 2004/05/08 00:01:37 deraadt Exp $"); | 26 | RCSID("$OpenBSD: auth.c,v 1.53 2004/05/11 19:01:43 deraadt Exp $"); |
27 | 27 | ||
28 | #ifdef HAVE_LOGIN_H | 28 | #ifdef HAVE_LOGIN_H |
29 | #include <login.h> | 29 | #include <login.h> |
@@ -562,8 +562,8 @@ fakepw(void) | |||
562 | fake.pw_passwd = | 562 | fake.pw_passwd = |
563 | "$2a$06$r3.juUaHZDlIbQaO2dS9FuYxL1W9M81R1Tc92PoSNmzvpEqLkLGrK"; | 563 | "$2a$06$r3.juUaHZDlIbQaO2dS9FuYxL1W9M81R1Tc92PoSNmzvpEqLkLGrK"; |
564 | fake.pw_gecos = "NOUSER"; | 564 | fake.pw_gecos = "NOUSER"; |
565 | fake.pw_uid = -1; | 565 | fake.pw_uid = (uid_t)-1; |
566 | fake.pw_gid = -1; | 566 | fake.pw_gid = (gid_t)-1; |
567 | #ifdef HAVE_PW_CLASS_IN_PASSWD | 567 | #ifdef HAVE_PW_CLASS_IN_PASSWD |
568 | fake.pw_class = ""; | 568 | fake.pw_class = ""; |
569 | #endif | 569 | #endif |
diff --git a/auth2-none.c b/auth2-none.c index c342addec..2bf5b5c80 100644 --- a/auth2-none.c +++ b/auth2-none.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: auth2-none.c,v 1.6 2003/08/26 09:58:43 markus Exp $"); | 26 | RCSID("$OpenBSD: auth2-none.c,v 1.7 2004/05/11 19:01:43 deraadt Exp $"); |
27 | 27 | ||
28 | #include "auth.h" | 28 | #include "auth.h" |
29 | #include "xmalloc.h" | 29 | #include "xmalloc.h" |
@@ -46,7 +46,7 @@ auth2_read_banner(void) | |||
46 | { | 46 | { |
47 | struct stat st; | 47 | struct stat st; |
48 | char *banner = NULL; | 48 | char *banner = NULL; |
49 | off_t len, n; | 49 | size_t len, n; |
50 | int fd; | 50 | int fd; |
51 | 51 | ||
52 | if ((fd = open(options.banner, O_RDONLY)) == -1) | 52 | if ((fd = open(options.banner, O_RDONLY)) == -1) |
@@ -55,7 +55,12 @@ auth2_read_banner(void) | |||
55 | close(fd); | 55 | close(fd); |
56 | return (NULL); | 56 | return (NULL); |
57 | } | 57 | } |
58 | len = st.st_size; | 58 | if (st.st_size > 1*1024*1024) { |
59 | close(fd); | ||
60 | return (NULL); | ||
61 | } | ||
62 | |||
63 | len = (size_t)st.st_size; /* truncate */ | ||
59 | banner = xmalloc(len + 1); | 64 | banner = xmalloc(len + 1); |
60 | n = atomicio(read, fd, banner, len); | 65 | n = atomicio(read, fd, banner, len); |
61 | close(fd); | 66 | close(fd); |
diff --git a/authfile.c b/authfile.c index 83ddd635f..305e9473b 100644 --- a/authfile.c +++ b/authfile.c | |||
@@ -36,7 +36,7 @@ | |||
36 | */ | 36 | */ |
37 | 37 | ||
38 | #include "includes.h" | 38 | #include "includes.h" |
39 | RCSID("$OpenBSD: authfile.c,v 1.55 2003/09/18 07:56:05 markus Exp $"); | 39 | RCSID("$OpenBSD: authfile.c,v 1.56 2004/05/11 19:01:43 deraadt Exp $"); |
40 | 40 | ||
41 | #include <openssl/err.h> | 41 | #include <openssl/err.h> |
42 | #include <openssl/evp.h> | 42 | #include <openssl/evp.h> |
@@ -236,14 +236,16 @@ key_load_public_rsa1(int fd, const char *filename, char **commentp) | |||
236 | struct stat st; | 236 | struct stat st; |
237 | char *cp; | 237 | char *cp; |
238 | int i; | 238 | int i; |
239 | off_t len; | 239 | size_t len; |
240 | 240 | ||
241 | if (fstat(fd, &st) < 0) { | 241 | if (fstat(fd, &st) < 0) { |
242 | error("fstat for key file %.200s failed: %.100s", | 242 | error("fstat for key file %.200s failed: %.100s", |
243 | filename, strerror(errno)); | 243 | filename, strerror(errno)); |
244 | return NULL; | 244 | return NULL; |
245 | } | 245 | } |
246 | len = st.st_size; | 246 | if (st.st_size > 1*1024*1024) |
247 | close(fd); | ||
248 | len = (size_t)st.st_size; /* truncated */ | ||
247 | 249 | ||
248 | buffer_init(&buffer); | 250 | buffer_init(&buffer); |
249 | cp = buffer_append_space(&buffer, len); | 251 | cp = buffer_append_space(&buffer, len); |
@@ -318,7 +320,7 @@ key_load_private_rsa1(int fd, const char *filename, const char *passphrase, | |||
318 | char **commentp) | 320 | char **commentp) |
319 | { | 321 | { |
320 | int i, check1, check2, cipher_type; | 322 | int i, check1, check2, cipher_type; |
321 | off_t len; | 323 | size_t len; |
322 | Buffer buffer, decrypted; | 324 | Buffer buffer, decrypted; |
323 | u_char *cp; | 325 | u_char *cp; |
324 | CipherContext ciphercontext; | 326 | CipherContext ciphercontext; |
@@ -332,7 +334,11 @@ key_load_private_rsa1(int fd, const char *filename, const char *passphrase, | |||
332 | close(fd); | 334 | close(fd); |
333 | return NULL; | 335 | return NULL; |
334 | } | 336 | } |
335 | len = st.st_size; | 337 | if (st.st_size > 1*1024*1024) { |
338 | close(fd); | ||
339 | return (NULL); | ||
340 | } | ||
341 | len = (size_t)st.st_size; /* truncated */ | ||
336 | 342 | ||
337 | buffer_init(&buffer); | 343 | buffer_init(&buffer); |
338 | cp = buffer_append_space(&buffer, len); | 344 | cp = buffer_append_space(&buffer, len); |
diff --git a/channels.c b/channels.c index e663c2159..55dc67342 100644 --- a/channels.c +++ b/channels.c | |||
@@ -39,7 +39,7 @@ | |||
39 | */ | 39 | */ |
40 | 40 | ||
41 | #include "includes.h" | 41 | #include "includes.h" |
42 | RCSID("$OpenBSD: channels.c,v 1.200 2004/01/19 09:24:21 markus Exp $"); | 42 | RCSID("$OpenBSD: channels.c,v 1.201 2004/05/11 19:01:43 deraadt Exp $"); |
43 | 43 | ||
44 | #include "ssh.h" | 44 | #include "ssh.h" |
45 | #include "ssh1.h" | 45 | #include "ssh1.h" |
@@ -1031,7 +1031,7 @@ channel_decode_socks5(Channel *c, fd_set * readset, fd_set * writeset) | |||
1031 | buffer_get(&c->input, (char *)&dest_port, 2); | 1031 | buffer_get(&c->input, (char *)&dest_port, 2); |
1032 | dest_addr[addrlen] = '\0'; | 1032 | dest_addr[addrlen] = '\0'; |
1033 | if (s5_req.atyp == SSH_SOCKS5_DOMAIN) | 1033 | if (s5_req.atyp == SSH_SOCKS5_DOMAIN) |
1034 | strlcpy(c->path, dest_addr, sizeof(c->path)); | 1034 | strlcpy(c->path, (char *)dest_addr, sizeof(c->path)); |
1035 | else if (inet_ntop(af, dest_addr, c->path, sizeof(c->path)) == NULL) | 1035 | else if (inet_ntop(af, dest_addr, c->path, sizeof(c->path)) == NULL) |
1036 | return -1; | 1036 | return -1; |
1037 | c->host_port = ntohs(dest_port); | 1037 | c->host_port = ntohs(dest_port); |
@@ -25,7 +25,7 @@ | |||
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "includes.h" | 27 | #include "includes.h" |
28 | RCSID("$OpenBSD: monitor.c,v 1.56 2004/05/09 01:19:27 djm Exp $"); | 28 | RCSID("$OpenBSD: monitor.c,v 1.57 2004/05/11 19:01:43 deraadt Exp $"); |
29 | 29 | ||
30 | #include <openssl/dh.h> | 30 | #include <openssl/dh.h> |
31 | 31 | ||
@@ -1479,7 +1479,7 @@ mm_answer_term(int socket, Buffer *req) | |||
1479 | res = WIFEXITED(status) ? WEXITSTATUS(status) : 1; | 1479 | res = WIFEXITED(status) ? WEXITSTATUS(status) : 1; |
1480 | 1480 | ||
1481 | /* Terminate process */ | 1481 | /* Terminate process */ |
1482 | exit (res); | 1482 | exit(res); |
1483 | } | 1483 | } |
1484 | 1484 | ||
1485 | void | 1485 | void |
diff --git a/monitor_mm.c b/monitor_mm.c index e57c87cc2..ff523a5b1 100644 --- a/monitor_mm.c +++ b/monitor_mm.c | |||
@@ -24,7 +24,7 @@ | |||
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include "includes.h" | 26 | #include "includes.h" |
27 | RCSID("$OpenBSD: monitor_mm.c,v 1.8 2002/08/02 14:43:15 millert Exp $"); | 27 | RCSID("$OpenBSD: monitor_mm.c,v 1.9 2004/05/11 19:01:43 deraadt Exp $"); |
28 | 28 | ||
29 | #ifdef HAVE_SYS_MMAN_H | 29 | #ifdef HAVE_SYS_MMAN_H |
30 | #include <sys/mman.h> | 30 | #include <sys/mman.h> |
diff --git a/openbsd-compat/xmmap.c b/openbsd-compat/xmmap.c index 9dc4340a7..f1a637a34 100644 --- a/openbsd-compat/xmmap.c +++ b/openbsd-compat/xmmap.c | |||
@@ -23,7 +23,7 @@ | |||
23 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
24 | */ | 24 | */ |
25 | 25 | ||
26 | /* $Id: xmmap.c,v 1.3 2003/06/02 02:25:27 tim Exp $ */ | 26 | /* $Id: xmmap.c,v 1.4 2004/05/13 06:39:34 dtucker Exp $ */ |
27 | 27 | ||
28 | #include "includes.h" | 28 | #include "includes.h" |
29 | 29 | ||
@@ -40,10 +40,10 @@ void *xmmap(size_t size) | |||
40 | #ifdef HAVE_MMAP | 40 | #ifdef HAVE_MMAP |
41 | # ifdef MAP_ANON | 41 | # ifdef MAP_ANON |
42 | address = mmap(NULL, size, PROT_WRITE|PROT_READ, MAP_ANON|MAP_SHARED, | 42 | address = mmap(NULL, size, PROT_WRITE|PROT_READ, MAP_ANON|MAP_SHARED, |
43 | -1, 0); | 43 | -1, (off_t)0); |
44 | # else | 44 | # else |
45 | address = mmap(NULL, size, PROT_WRITE|PROT_READ, MAP_SHARED, | 45 | address = mmap(NULL, size, PROT_WRITE|PROT_READ, MAP_SHARED, |
46 | open("/dev/zero", O_RDWR), 0); | 46 | open("/dev/zero", O_RDWR), (off_t)0); |
47 | # endif | 47 | # endif |
48 | 48 | ||
49 | #define MM_SWAP_TEMPLATE "/var/run/sshd.mm.XXXXXXXX" | 49 | #define MM_SWAP_TEMPLATE "/var/run/sshd.mm.XXXXXXXX" |
@@ -58,7 +58,7 @@ void *xmmap(size_t size) | |||
58 | unlink(tmpname); | 58 | unlink(tmpname); |
59 | ftruncate(tmpfd, size); | 59 | ftruncate(tmpfd, size); |
60 | address = mmap(NULL, size, PROT_WRITE|PROT_READ, MAP_SHARED, | 60 | address = mmap(NULL, size, PROT_WRITE|PROT_READ, MAP_SHARED, |
61 | tmpfd, 0); | 61 | tmpfd, (off_t)0); |
62 | close(tmpfd); | 62 | close(tmpfd); |
63 | } | 63 | } |
64 | 64 | ||
@@ -37,7 +37,7 @@ | |||
37 | */ | 37 | */ |
38 | 38 | ||
39 | #include "includes.h" | 39 | #include "includes.h" |
40 | RCSID("$OpenBSD: packet.c,v 1.112 2003/09/23 20:17:11 markus Exp $"); | 40 | RCSID("$OpenBSD: packet.c,v 1.113 2004/05/11 19:01:43 deraadt Exp $"); |
41 | 41 | ||
42 | #include "openbsd-compat/sys-queue.h" | 42 | #include "openbsd-compat/sys-queue.h" |
43 | 43 | ||
@@ -154,8 +154,10 @@ packet_set_connection(int fd_in, int fd_out) | |||
154 | fatal("packet_set_connection: cannot load cipher 'none'"); | 154 | fatal("packet_set_connection: cannot load cipher 'none'"); |
155 | connection_in = fd_in; | 155 | connection_in = fd_in; |
156 | connection_out = fd_out; | 156 | connection_out = fd_out; |
157 | cipher_init(&send_context, none, "", 0, NULL, 0, CIPHER_ENCRYPT); | 157 | cipher_init(&send_context, none, (const u_char *)"", |
158 | cipher_init(&receive_context, none, "", 0, NULL, 0, CIPHER_DECRYPT); | 158 | 0, NULL, 0, CIPHER_ENCRYPT); |
159 | cipher_init(&receive_context, none, (const u_char *)"", | ||
160 | 0, NULL, 0, CIPHER_DECRYPT); | ||
159 | newkeys[MODE_IN] = newkeys[MODE_OUT] = NULL; | 161 | newkeys[MODE_IN] = newkeys[MODE_OUT] = NULL; |
160 | if (!initialized) { | 162 | if (!initialized) { |
161 | initialized = 1; | 163 | initialized = 1; |
@@ -1449,7 +1451,7 @@ packet_is_interactive(void) | |||
1449 | return interactive_mode; | 1451 | return interactive_mode; |
1450 | } | 1452 | } |
1451 | 1453 | ||
1452 | u_int | 1454 | int |
1453 | packet_set_maxsize(u_int s) | 1455 | packet_set_maxsize(u_int s) |
1454 | { | 1456 | { |
1455 | static int called = 0; | 1457 | static int called = 0; |
@@ -1503,7 +1505,7 @@ packet_send_ignore(int nbytes) | |||
1503 | } | 1505 | } |
1504 | } | 1506 | } |
1505 | 1507 | ||
1506 | #define MAX_PACKETS (1<<31) | 1508 | #define MAX_PACKETS (1U<<31) |
1507 | int | 1509 | int |
1508 | packet_need_rekeying(void) | 1510 | packet_need_rekeying(void) |
1509 | { | 1511 | { |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: packet.h,v 1.40 2003/06/24 08:23:46 markus Exp $ */ | 1 | /* $OpenBSD: packet.h,v 1.41 2004/05/11 19:01:43 deraadt Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -82,7 +82,7 @@ void tty_make_modes(int, struct termios *); | |||
82 | void tty_parse_modes(int, int *); | 82 | void tty_parse_modes(int, int *); |
83 | 83 | ||
84 | extern u_int max_packet_size; | 84 | extern u_int max_packet_size; |
85 | u_int packet_set_maxsize(u_int); | 85 | int packet_set_maxsize(u_int); |
86 | #define packet_get_maxsize() max_packet_size | 86 | #define packet_get_maxsize() max_packet_size |
87 | 87 | ||
88 | /* don't allow remaining bytes after the end of the message */ | 88 | /* don't allow remaining bytes after the end of the message */ |
diff --git a/progressmeter.c b/progressmeter.c index f42668526..e74f4785f 100644 --- a/progressmeter.c +++ b/progressmeter.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: progressmeter.c,v 1.19 2004/02/05 15:33:33 markus Exp $"); | 26 | RCSID("$OpenBSD: progressmeter.c,v 1.20 2004/05/11 19:01:43 deraadt Exp $"); |
27 | 27 | ||
28 | #include "progressmeter.h" | 28 | #include "progressmeter.h" |
29 | #include "atomicio.h" | 29 | #include "atomicio.h" |
@@ -167,7 +167,7 @@ refresh_progress_meter(void) | |||
167 | 167 | ||
168 | /* bandwidth usage */ | 168 | /* bandwidth usage */ |
169 | format_rate(buf + strlen(buf), win_size - strlen(buf), | 169 | format_rate(buf + strlen(buf), win_size - strlen(buf), |
170 | bytes_per_second); | 170 | (off_t)bytes_per_second); |
171 | strlcat(buf, "/s ", win_size); | 171 | strlcat(buf, "/s ", win_size); |
172 | 172 | ||
173 | /* ETA */ | 173 | /* ETA */ |
@@ -33,7 +33,7 @@ | |||
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include "includes.h" | 35 | #include "includes.h" |
36 | RCSID("$OpenBSD: session.c,v 1.174 2004/05/09 01:19:28 djm Exp $"); | 36 | RCSID("$OpenBSD: session.c,v 1.175 2004/05/11 19:01:43 deraadt Exp $"); |
37 | 37 | ||
38 | #include "ssh.h" | 38 | #include "ssh.h" |
39 | #include "ssh1.h" | 39 | #include "ssh1.h" |
@@ -1824,9 +1824,8 @@ session_exec_req(Session *s) | |||
1824 | static int | 1824 | static int |
1825 | session_break_req(Session *s) | 1825 | session_break_req(Session *s) |
1826 | { | 1826 | { |
1827 | u_int break_length; | ||
1828 | 1827 | ||
1829 | break_length = packet_get_int(); /* ignored */ | 1828 | packet_get_int(); /* ignored */ |
1830 | packet_check_eom(); | 1829 | packet_check_eom(); |
1831 | 1830 | ||
1832 | if (s->ttyfd == -1 || | 1831 | if (s->ttyfd == -1 || |