13 files changed, 35 insertions, 31 deletions

diff --git a/ChangeLog b/ChangeLog
index e6d0ce878..e64ef5b33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
    - markus@cvs.openbsd.org 2003/06/23 09:02:44
      [ssh_config.5]
      document EnableSSHKeysign; bugzilla #599; ok deraadt@, jmc@
+   - markus@cvs.openbsd.org 2003/06/24 08:23:46
+     [auth2-hostbased.c auth2-pubkey.c auth2.c channels.c key.c key.h
+      monitor.c packet.c packet.h serverloop.c sshconnect2.c sshd.c]
+     int -> u_int; ok djm@, deraadt@, mouring@
 
 20030624
  - (dtucker) Have configure refer the user to config.log and
@@ -589,4 +593,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.2824 2003/06/28 02:33:12 dtucker Exp $
+$Id: ChangeLog,v 1.2825 2003/06/28 02:38:01 dtucker Exp $
diff --git a/auth2-hostbased.c b/auth2-hostbased.c
index bbc7d8a4d..505d3eff4 100644
--- a/auth2-hostbased.c
+++ b/auth2-hostbased.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth2-hostbased.c,v 1.4 2003/06/02 09:17:34 markus Exp $");
+RCSID("$OpenBSD: auth2-hostbased.c,v 1.5 2003/06/24 08:23:46 markus Exp $");
 
 #include "ssh2.h"
 #include "xmalloc.h"
@@ -42,7 +42,7 @@ RCSID("$OpenBSD: auth2-hostbased.c,v 1.4 2003/06/02 09:17:34 markus Exp $");
 /* import */
 extern ServerOptions options;
 extern u_char *session_id2;
-extern int session_id2_len;
+extern u_int session_id2_len;
 
 static int
 userauth_hostbased(Authctxt *authctxt)
diff --git a/auth2-pubkey.c b/auth2-pubkey.c
index 85ee33eed..d51e939f1 100644
--- a/auth2-pubkey.c
+++ b/auth2-pubkey.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth2-pubkey.c,v 1.3 2003/04/08 20:21:28 itojun Exp $");
+RCSID("$OpenBSD: auth2-pubkey.c,v 1.4 2003/06/24 08:23:46 markus Exp $");
 
 #include "ssh2.h"
 #include "xmalloc.h"
@@ -44,7 +44,7 @@ RCSID("$OpenBSD: auth2-pubkey.c,v 1.3 2003/04/08 20:21:28 itojun Exp $");
 /* import */
 extern ServerOptions options;
 extern u_char *session_id2;
-extern int session_id2_len;
+extern u_int session_id2_len;
 
 static int
 userauth_pubkey(Authctxt *authctxt)
diff --git a/auth2.c b/auth2.c
index 5ca020001..639bf9117 100644
--- a/auth2.c
+++ b/auth2.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth2.c,v 1.98 2003/05/14 02:15:47 markus Exp $");
+RCSID("$OpenBSD: auth2.c,v 1.99 2003/06/24 08:23:46 markus Exp $");
 
 #include "ssh2.h"
 #include "xmalloc.h"
@@ -39,7 +39,7 @@ RCSID("$OpenBSD: auth2.c,v 1.98 2003/05/14 02:15:47 markus Exp $");
 /* import */
 extern ServerOptions options;
 extern u_char *session_id2;
-extern int session_id2_len;
+extern u_int session_id2_len;
 
 Authctxt *x_authctxt = NULL;
 
diff --git a/channels.c b/channels.c
index ad879cc61..04ef6575c 100644
--- a/channels.c
+++ b/channels.c
@@ -39,7 +39,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: channels.c,v 1.190 2003/05/11 20:30:24 markus Exp $");
+RCSID("$OpenBSD: channels.c,v 1.191 2003/06/24 08:23:46 markus Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -419,7 +419,7 @@ channel_not_very_much_buffered_data(void)
                         }
 #endif
                         if (buffer_len(&c->output) > packet_get_maxsize()) {
-                                debug2("channel %d: big output buffer %d > %d",
+                                debug2("channel %d: big output buffer %u > %u",
                                     c->self, buffer_len(&c->output),
                                     packet_get_maxsize());
                                 return 0;
diff --git a/key.c b/key.c
index d918cfd0a..b101e1b27 100644
--- a/key.c
+++ b/key.c
@@ -32,7 +32,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "includes.h"
-RCSID("$OpenBSD: key.c,v 1.52 2003/05/14 18:16:20 jakob Exp $");
+RCSID("$OpenBSD: key.c,v 1.53 2003/06/24 08:23:46 markus Exp $");
 
 #include <openssl/evp.h>
 
@@ -438,7 +438,7 @@ key_read(Key *ret, char **cpp)
                         xfree(blob);
                         return -1;
                 }
-                k = key_from_blob(blob, n);
+                k = key_from_blob(blob, (u_int)n);
                 xfree(blob);
                 if (k == NULL) {
                         error("key_read: key_from_blob %s failed", cp);
@@ -674,7 +674,7 @@ key_names_valid2(const char *names)
 }
 
 Key *
-key_from_blob(u_char *blob, int blen)
+key_from_blob(u_char *blob, u_int blen)
 {
         Buffer b;
         char *ktype;
diff --git a/key.h b/key.h
index a7b6afe86..28753fdfa 100644
--- a/key.h
+++ b/key.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: key.h,v 1.21 2003/05/14 18:16:20 jakob Exp $  */
+/*      $OpenBSD: key.h,v 1.22 2003/06/24 08:23:46 markus Exp $ */
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -71,7 +71,7 @@ Key	*key_generate(int, u_int);
 Key     *key_from_private(Key *);
 int      key_type_from_name(char *);
 
-Key     *key_from_blob(u_char *, int);
+Key     *key_from_blob(u_char *, u_int);
 int      key_to_blob(Key *, u_char **, u_int *);
 char    *key_ssh_name(Key *);
 int      key_names_valid2(const char *);
diff --git a/monitor.c b/monitor.c
index f306794d4..3a8735f58 100644
--- a/monitor.c
+++ b/monitor.c
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: monitor.c,v 1.43 2003/06/12 07:57:38 markus Exp $");
+RCSID("$OpenBSD: monitor.c,v 1.44 2003/06/24 08:23:46 markus Exp $");
 
 #include <openssl/dh.h>
 
@@ -141,7 +141,7 @@ static int key_blobtype = MM_NOKEY;
 static char *hostbased_cuser = NULL;
 static char *hostbased_chost = NULL;
 static char *auth_method = "unknown";
-static int session_id2_len = 0;
+static u_int session_id2_len = 0;
 static u_char *session_id2 = NULL;
 static pid_t monitor_child_pid;
 
diff --git a/packet.c b/packet.c
index 07e90b899..022212074 100644
--- a/packet.c
+++ b/packet.c
@@ -37,7 +37,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: packet.c,v 1.107 2003/06/10 22:20:52 deraadt Exp $");
+RCSID("$OpenBSD: packet.c,v 1.108 2003/06/24 08:23:46 markus Exp $");
 
 #include "openbsd-compat/sys-queue.h"
 
@@ -108,7 +108,7 @@ static int compression_buffer_ready = 0;
 static int packet_compression = 0;
 
 /* default maximum packet size */
-int max_packet_size = 32768;
+u_int max_packet_size = 32768;
 
 /* Flag indicating whether this module has been initialized. */
 static int initialized = 0;
@@ -1446,8 +1446,8 @@ packet_is_interactive(void)
         return interactive_mode;
 }
 
-int
-packet_set_maxsize(int s)
+u_int
+packet_set_maxsize(u_int s)
 {
         static int called = 0;
 
diff --git a/packet.h b/packet.h
index fa000d686..7732fafb7 100644
--- a/packet.h
+++ b/packet.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: packet.h,v 1.39 2003/04/08 20:21:29 itojun Exp $      */
+/*      $OpenBSD: packet.h,v 1.40 2003/06/24 08:23:46 markus Exp $      */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -81,8 +81,8 @@ void	 packet_add_padding(u_char);
 void     tty_make_modes(int, struct termios *);
 void     tty_parse_modes(int, int *);
 
-extern int max_packet_size;
-int      packet_set_maxsize(int);
+extern u_int max_packet_size;
+u_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/serverloop.c b/serverloop.c
index 90eec0855..a95390273 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: serverloop.c,v 1.109 2003/06/04 12:03:59 djm Exp $");
+RCSID("$OpenBSD: serverloop.c,v 1.110 2003/06/24 08:23:46 markus Exp $");
 
 #include "xmalloc.h"
 #include "packet.h"
@@ -158,7 +158,7 @@ sigchld_handler(int sig)
 static void
 make_packets_from_stderr_data(void)
 {
-        int len;
+        u_int len;
 
         /* Send buffered stderr data to the client. */
         while (buffer_len(&stderr_buffer) > 0 &&
@@ -187,7 +187,7 @@ make_packets_from_stderr_data(void)
 static void
 make_packets_from_stdout_data(void)
 {
-        int len;
+        u_int len;
 
         /* Send buffered stdout data to the client. */
         while (buffer_len(&stdout_buffer) > 0 &&
diff --git a/sshconnect2.c b/sshconnect2.c
index 1b85730fe..6a0bd409a 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect2.c,v 1.119 2003/05/15 00:28:28 markus Exp $");
+RCSID("$OpenBSD: sshconnect2.c,v 1.120 2003/06/24 08:23:46 markus Exp $");
 
 #ifdef KRB5
 #include <krb5.h>
@@ -67,7 +67,7 @@ extern Options options;
  */
 
 u_char *session_id2 = NULL;
-int session_id2_len = 0;
+u_int session_id2_len = 0;
 
 char *xxx_host;
 struct sockaddr *xxx_hostaddr;
@@ -591,7 +591,7 @@ sign_and_send_pubkey(Authctxt *authctxt, Identity *id)
         Buffer b;
         u_char *blob, *signature;
         u_int bloblen, slen;
-        int skip = 0;
+        u_int skip = 0;
         int ret = -1;
         int have_sig = 1;
 
diff --git a/sshd.c b/sshd.c
index bc458488b..b8f360841 100644
--- a/sshd.c
+++ b/sshd.c
@@ -42,7 +42,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.268 2003/06/04 10:23:48 djm Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.269 2003/06/24 08:23:46 markus Exp $");
 
 #include <openssl/dh.h>
 #include <openssl/bn.h>
@@ -188,7 +188,7 @@ u_char session_id[16];
 
 /* same for ssh2 */
 u_char *session_id2 = NULL;
-int session_id2_len = 0;
+u_int session_id2_len = 0;
 
 /* record remote hostname or ip */
 u_int utmp_len = MAXHOSTNAMELEN;