- markus@cvs.openbsd.org 2002/02/25 16:33:27

     [ssh-keygen.c sshconnect2.c uuencode.c uuencode.h]
     more u_* fixes

diff --git a/ChangeLog b/ChangeLog
index 2779e411c4fd2c2578be58312f49ec1d0e53d567..b696028a499212a5acc33018bb31a6b53f75f749 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -48,6 +48,9 @@
      forwarding endpoints).  the intention is to preserve the on-the-wire
      appearance to applications at either end; the applications can then
      enable TCP_NODELAY according to their requirements. ok markus@
+   - markus@cvs.openbsd.org 2002/02/25 16:33:27
+     [ssh-keygen.c sshconnect2.c uuencode.c uuencode.h]
+     more u_* fixes
 
 20020225
  - (bal) Last AIX patch.  Moved aix_usrinfo() outside of do_setuserconext()

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 4560a3ffe50d6084311d04150d8cfc648397a5db..6aff4a444aed1318e961d481ff560409381a8307 100644 (file)
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-keygen.c,v 1.93 2002/02/24 19:14:59 markus Exp $");
+RCSID("$OpenBSD: ssh-keygen.c,v 1.94 2002/02/25 16:33:27 markus Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/pem.h>
@@ -150,7 +150,7 @@ static void
 do_convert_to_ssh2(struct passwd *pw)
 {
        Key *k;
-       int len;
+       u_int len;
        u_char *blob;
        struct stat st;
 

diff --git a/sshconnect2.c b/sshconnect2.c
index 374eab570302c8d1ec4871c1c4e0ad86e74017e6..c5b5ee51550c262f40af6bb7aeeb6d9833001c74 100644 (file)
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect2.c,v 1.96 2002/02/24 19:14:59 markus Exp $");
+RCSID("$OpenBSD: sshconnect2.c,v 1.97 2002/02/25 16:33:27 markus Exp $");
 
 #include "ssh.h"
 #include "ssh2.h"
@@ -567,7 +567,7 @@ send_pubkey_test(Authctxt *authctxt, Key *k, sign_cb_fn *sign_callback,
     int hint)
 {
        u_char *blob;
-       int bloblen, have_sig = 0;
+       u_int bloblen, have_sig = 0;
 
        debug3("send_pubkey_test");
 
@@ -956,7 +956,7 @@ authmethod_get(char *authlist)
 {
 
        char *name = NULL;
-       int next;
+       u_int next;
 
        /* Use a suitable default if we're passed a nil list.  */
        if (authlist == NULL || strlen(authlist) == 0)

diff --git a/uuencode.c b/uuencode.c
index 8d79c93f2ee36da37e9368fd9528900edb424dd7..685d2dfa750e259017441cea3400fb1ef05ceee9 100644 (file)
--- a/uuencode.c
+++ b/uuencode.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: uuencode.c,v 1.13 2002/02/24 18:31:09 markus Exp $    */
+/*     $OpenBSD: uuencode.c,v 1.14 2002/02/25 16:33:27 markus Exp $    */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -28,7 +28,7 @@
 #include "xmalloc.h"
 #include "uuencode.h"
 
-RCSID("$OpenBSD: uuencode.c,v 1.13 2002/02/24 18:31:09 markus Exp $");
+RCSID("$OpenBSD: uuencode.c,v 1.14 2002/02/25 16:33:27 markus Exp $");
 
 int
 uuencode(u_char *src, u_int srclength,
@@ -58,7 +58,7 @@ uudecode(const char *src, u_char *target, size_t targsize)
 }
 
 void
-dump_base64(FILE *fp, u_char *data, int len)
+dump_base64(FILE *fp, u_char *data, u_int len)
 {
        u_char *buf = xmalloc(2*len);
        int i, n;

diff --git a/uuencode.h b/uuencode.h
index 0067635b677f25e547a39c09e723083115b5b0dc..682b623acb814d07263a53334065b2b96931a460 100644 (file)
--- a/uuencode.h
+++ b/uuencode.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: uuencode.h,v 1.8 2001/06/26 17:27:25 markus Exp $     */
+/*     $OpenBSD: uuencode.h,v 1.9 2002/02/25 16:33:27 markus Exp $     */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -28,5 +28,5 @@
 #define UUENCODE_H
 int     uuencode(u_char *, u_int, char *, size_t);
 int     uudecode(const char *, u_char *, size_t);
-void    dump_base64(FILE *, u_char *, int);
+void    dump_base64(FILE *, u_char *, u_int);
 #endif