diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2002-02-25 16:33:28 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2002-02-25 16:33:28 +0000 |
| commit | 12e9430cd94c62cd0fe9b9b9a5ed44ca71b20a27 (patch) | |
| tree | e2108c7a0b2b7dbf0d1ca99fcdd951f416bce671 /usr.bin | |
| parent | 1563d63ea434179e59e6a7f0762881179cc8494c (diff) | |
more u_* fixes
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/ssh-keygen.c | 4 | ||||
| -rw-r--r-- | usr.bin/ssh/sshconnect2.c | 6 | ||||
| -rw-r--r-- | usr.bin/ssh/uuencode.c | 6 | ||||
| -rw-r--r-- | usr.bin/ssh/uuencode.h | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c index e2403f3fcbf..961fad619bd 100644 --- a/usr.bin/ssh/ssh-keygen.c +++ b/usr.bin/ssh/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> @@ -146,7 +146,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/usr.bin/ssh/sshconnect2.c b/usr.bin/ssh/sshconnect2.c index 374eab57030..c5b5ee51550 100644 --- a/usr.bin/ssh/sshconnect2.c +++ b/usr.bin/ssh/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/usr.bin/ssh/uuencode.c b/usr.bin/ssh/uuencode.c index bd1891f3b39..7f3691f5bf8 100644 --- a/usr.bin/ssh/uuencode.c +++ b/usr.bin/ssh/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. @@ -30,7 +30,7 @@ #include <resolv.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, @@ -60,7 +60,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/usr.bin/ssh/uuencode.h b/usr.bin/ssh/uuencode.h index 0067635b677..682b623acb8 100644 --- a/usr.bin/ssh/uuencode.h +++ b/usr.bin/ssh/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 |