- deraadt@cvs.openbsd.org 2004/05/11 19:01:43

     [auth.c auth2-none.c authfile.c channels.c monitor.c monitor_mm.c
     packet.c packet.h progressmeter.c session.c openbsd-compat/xmmap.c]
     improve some code lint did not like; djm millert ok

12 files changed, 49 insertions, 33 deletions

diff --git a/ChangeLog b/ChangeLog
index 83594e4a5..fb81a8145 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,10 @@
    - djm@cvs.openbsd.org 2004/05/09 01:26:48
      [kex.c]
      don't overwrite what we are trying to compute
+   - deraadt@cvs.openbsd.org 2004/05/11 19:01:43
+     [auth.c auth2-none.c authfile.c channels.c monitor.c monitor_mm.c
+     packet.c packet.h progressmeter.c session.c openbsd-compat/xmmap.c]
+     improve some code lint did not like; djm millert ok
 
 20040502
  - (dtucker) OpenBSD CVS Sync
@@ -1103,4 +1107,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3349 2004/05/13 06:31:48 dtucker Exp $
+$Id: ChangeLog,v 1.3350 2004/05/13 06:39:33 dtucker Exp $
diff --git a/auth.c b/auth.c
index 8acfcf86c..4f93ce5ae 100644
--- a/auth.c
+++ b/auth.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth.c,v 1.52 2004/05/08 00:01:37 deraadt Exp $");
+RCSID("$OpenBSD: auth.c,v 1.53 2004/05/11 19:01:43 deraadt Exp $");
 
 #ifdef HAVE_LOGIN_H
 #include <login.h>
@@ -562,8 +562,8 @@ fakepw(void)
         fake.pw_passwd =
             "$2a$06$r3.juUaHZDlIbQaO2dS9FuYxL1W9M81R1Tc92PoSNmzvpEqLkLGrK";
         fake.pw_gecos = "NOUSER";
-        fake.pw_uid = -1;
-        fake.pw_gid = -1;
+        fake.pw_uid = (uid_t)-1;
+        fake.pw_gid = (gid_t)-1;
 #ifdef HAVE_PW_CLASS_IN_PASSWD
         fake.pw_class = "";
 #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 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth2-none.c,v 1.6 2003/08/26 09:58:43 markus Exp $");
+RCSID("$OpenBSD: auth2-none.c,v 1.7 2004/05/11 19:01:43 deraadt Exp $");
 
 #include "auth.h"
 #include "xmalloc.h"
@@ -46,7 +46,7 @@ auth2_read_banner(void)
 {
         struct stat st;
         char *banner = NULL;
-        off_t len, n;
+        size_t len, n;
         int fd;
 
         if ((fd = open(options.banner, O_RDONLY)) == -1)
@@ -55,7 +55,12 @@ auth2_read_banner(void)
                 close(fd);
                 return (NULL);
         }
-        len = st.st_size;
+        if (st.st_size > 1*1024*1024) {
+                close(fd);
+                return (NULL);
+        }
+
+        len = (size_t)st.st_size;               /* truncate */
         banner = xmalloc(len + 1);
         n = atomicio(read, fd, banner, len);
         close(fd);
diff --git a/authfile.c b/authfile.c
index 83ddd635f..305e9473b 100644
--- a/authfile.c
+++ b/authfile.c
@@ -36,7 +36,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: authfile.c,v 1.55 2003/09/18 07:56:05 markus Exp $");
+RCSID("$OpenBSD: authfile.c,v 1.56 2004/05/11 19:01:43 deraadt Exp $");
 
 #include <openssl/err.h>
 #include <openssl/evp.h>
@@ -236,14 +236,16 @@ key_load_public_rsa1(int fd, const char *filename, char **commentp)
         struct stat st;
         char *cp;
         int i;
-        off_t len;
+        size_t len;
 
         if (fstat(fd, &st) < 0) {
                 error("fstat for key file %.200s failed: %.100s",
                     filename, strerror(errno));
                 return NULL;
         }
-        len = st.st_size;
+        if (st.st_size > 1*1024*1024)
+                close(fd);
+        len = (size_t)st.st_size;               /* truncated */
 
         buffer_init(&buffer);
         cp = buffer_append_space(&buffer, len);
@@ -318,7 +320,7 @@ key_load_private_rsa1(int fd, const char *filename, const char *passphrase,
     char **commentp)
 {
         int i, check1, check2, cipher_type;
-        off_t len;
+        size_t len;
         Buffer buffer, decrypted;
         u_char *cp;
         CipherContext ciphercontext;
@@ -332,7 +334,11 @@ key_load_private_rsa1(int fd, const char *filename, const char *passphrase,
                 close(fd);
                 return NULL;
         }
-        len = st.st_size;
+        if (st.st_size > 1*1024*1024) {
+                close(fd);
+                return (NULL);
+        }
+        len = (size_t)st.st_size;               /* truncated */
 
         buffer_init(&buffer);
         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 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: channels.c,v 1.200 2004/01/19 09:24:21 markus Exp $");
+RCSID("$OpenBSD: channels.c,v 1.201 2004/05/11 19:01:43 deraadt Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -1031,7 +1031,7 @@ channel_decode_socks5(Channel *c, fd_set * readset, fd_set * writeset)
         buffer_get(&c->input, (char *)&dest_port, 2);
         dest_addr[addrlen] = '\0';
         if (s5_req.atyp == SSH_SOCKS5_DOMAIN)
-                strlcpy(c->path, dest_addr, sizeof(c->path));
+                strlcpy(c->path, (char *)dest_addr, sizeof(c->path));
         else if (inet_ntop(af, dest_addr, c->path, sizeof(c->path)) == NULL)
                 return -1;
         c->host_port = ntohs(dest_port);
diff --git a/monitor.c b/monitor.c
index 4636000bb..2200eb09d 100644
--- a/monitor.c
+++ b/monitor.c
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: monitor.c,v 1.56 2004/05/09 01:19:27 djm Exp $");
+RCSID("$OpenBSD: monitor.c,v 1.57 2004/05/11 19:01:43 deraadt Exp $");
 
 #include <openssl/dh.h>
 
@@ -1479,7 +1479,7 @@ mm_answer_term(int socket, Buffer *req)
         res = WIFEXITED(status) ? WEXITSTATUS(status) : 1;
 
         /* Terminate process */
-        exit (res);
+        exit(res);
 }
 
 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 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: monitor_mm.c,v 1.8 2002/08/02 14:43:15 millert Exp $");
+RCSID("$OpenBSD: monitor_mm.c,v 1.9 2004/05/11 19:01:43 deraadt Exp $");
 
 #ifdef HAVE_SYS_MMAN_H
 #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 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $Id: xmmap.c,v 1.3 2003/06/02 02:25:27 tim Exp $ */
+/* $Id: xmmap.c,v 1.4 2004/05/13 06:39:34 dtucker Exp $ */
 
 #include "includes.h"
 
@@ -40,10 +40,10 @@ void *xmmap(size_t size)
 #ifdef HAVE_MMAP
 # ifdef MAP_ANON
         address = mmap(NULL, size, PROT_WRITE|PROT_READ, MAP_ANON|MAP_SHARED,
-            -1, 0);
+            -1, (off_t)0);
 # else
         address = mmap(NULL, size, PROT_WRITE|PROT_READ, MAP_SHARED,
-            open("/dev/zero", O_RDWR), 0);
+            open("/dev/zero", O_RDWR), (off_t)0);
 # endif
 
 #define MM_SWAP_TEMPLATE "/var/run/sshd.mm.XXXXXXXX"
@@ -58,7 +58,7 @@ void *xmmap(size_t size)
                 unlink(tmpname);
                 ftruncate(tmpfd, size);
                 address = mmap(NULL, size, PROT_WRITE|PROT_READ, MAP_SHARED,
-                    tmpfd, 0);
+                    tmpfd, (off_t)0);
                 close(tmpfd);
         }
 
diff --git a/packet.c b/packet.c
index daae9ffaa..fe3eea094 100644
--- a/packet.c
+++ b/packet.c
@@ -37,7 +37,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: packet.c,v 1.112 2003/09/23 20:17:11 markus Exp $");
+RCSID("$OpenBSD: packet.c,v 1.113 2004/05/11 19:01:43 deraadt Exp $");
 
 #include "openbsd-compat/sys-queue.h"
 
@@ -154,8 +154,10 @@ packet_set_connection(int fd_in, int fd_out)
                 fatal("packet_set_connection: cannot load cipher 'none'");
         connection_in = fd_in;
         connection_out = fd_out;
-        cipher_init(&send_context, none, "", 0, NULL, 0, CIPHER_ENCRYPT);
-        cipher_init(&receive_context, none, "", 0, NULL, 0, CIPHER_DECRYPT);
+        cipher_init(&send_context, none, (const u_char *)"",
+            0, NULL, 0, CIPHER_ENCRYPT);
+        cipher_init(&receive_context, none, (const u_char *)"",
+            0, NULL, 0, CIPHER_DECRYPT);
         newkeys[MODE_IN] = newkeys[MODE_OUT] = NULL;
         if (!initialized) {
                 initialized = 1;
@@ -1449,7 +1451,7 @@ packet_is_interactive(void)
         return interactive_mode;
 }
 
-u_int
+int
 packet_set_maxsize(u_int s)
 {
         static int called = 0;
@@ -1503,7 +1505,7 @@ packet_send_ignore(int nbytes)
         }
 }
 
-#define MAX_PACKETS     (1<<31)
+#define MAX_PACKETS     (1U<<31)
 int
 packet_need_rekeying(void)
 {
diff --git a/packet.h b/packet.h
index 7732fafb7..37f82f2f6 100644
--- a/packet.h
+++ b/packet.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: packet.h,v 1.40 2003/06/24 08:23:46 markus Exp $      */
+/*      $OpenBSD: packet.h,v 1.41 2004/05/11 19:01:43 deraadt Exp $     */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -82,7 +82,7 @@ void	 tty_make_modes(int, struct termios *);
 void     tty_parse_modes(int, int *);
 
 extern u_int max_packet_size;
-u_int    packet_set_maxsize(u_int);
+int      packet_set_maxsize(u_int);
 #define  packet_get_maxsize() max_packet_size
 
 /* 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 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: progressmeter.c,v 1.19 2004/02/05 15:33:33 markus Exp $");
+RCSID("$OpenBSD: progressmeter.c,v 1.20 2004/05/11 19:01:43 deraadt Exp $");
 
 #include "progressmeter.h"
 #include "atomicio.h"
@@ -167,7 +167,7 @@ refresh_progress_meter(void)
 
         /* bandwidth usage */
         format_rate(buf + strlen(buf), win_size - strlen(buf),
-            bytes_per_second);
+            (off_t)bytes_per_second);
         strlcat(buf, "/s ", win_size);
 
         /* ETA */
diff --git a/session.c b/session.c
index 2ecf637f9..2fe511612 100644
--- a/session.c
+++ b/session.c
@@ -33,7 +33,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: session.c,v 1.174 2004/05/09 01:19:28 djm Exp $");
+RCSID("$OpenBSD: session.c,v 1.175 2004/05/11 19:01:43 deraadt Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -1824,9 +1824,8 @@ session_exec_req(Session *s)
 static int
 session_break_req(Session *s)
 {
-        u_int break_length;
 
-        break_length = packet_get_int();        /* ignored */
+        packet_get_int();       /* ignored */
         packet_check_eom();
 
         if (s->ttyfd == -1 ||