summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh-keygen.c4
-rw-r--r--sshconnect2.c6
-rw-r--r--uuencode.c6
-rw-r--r--uuencode.h4
5 files changed, 14 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 8e1b4677d..d02a80e69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -48,6 +48,9 @@
48 forwarding endpoints). the intention is to preserve the on-the-wire 48 forwarding endpoints). the intention is to preserve the on-the-wire
49 appearance to applications at either end; the applications can then 49 appearance to applications at either end; the applications can then
50 enable TCP_NODELAY according to their requirements. ok markus@ 50 enable TCP_NODELAY according to their requirements. ok markus@
51 - markus@cvs.openbsd.org 2002/02/25 16:33:27
52 [ssh-keygen.c sshconnect2.c uuencode.c uuencode.h]
53 more u_* fixes
51 54
5220020225 5520020225
53 - (bal) Last AIX patch. Moved aix_usrinfo() outside of do_setuserconext() 56 - (bal) Last AIX patch. Moved aix_usrinfo() outside of do_setuserconext()
@@ -7721,4 +7724,4 @@
7721 - Wrote replacements for strlcpy and mkdtemp 7724 - Wrote replacements for strlcpy and mkdtemp
7722 - Released 1.0pre1 7725 - Released 1.0pre1
7723 7726
7724$Id: ChangeLog,v 1.1886 2002/02/26 18:12:51 mouring Exp $ 7727$Id: ChangeLog,v 1.1887 2002/02/26 18:15:09 mouring Exp $
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 4560a3ffe..6aff4a444 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -12,7 +12,7 @@
12 */ 12 */
13 13
14#include "includes.h" 14#include "includes.h"
15RCSID("$OpenBSD: ssh-keygen.c,v 1.93 2002/02/24 19:14:59 markus Exp $"); 15RCSID("$OpenBSD: ssh-keygen.c,v 1.94 2002/02/25 16:33:27 markus Exp $");
16 16
17#include <openssl/evp.h> 17#include <openssl/evp.h>
18#include <openssl/pem.h> 18#include <openssl/pem.h>
@@ -150,7 +150,7 @@ static void
150do_convert_to_ssh2(struct passwd *pw) 150do_convert_to_ssh2(struct passwd *pw)
151{ 151{
152 Key *k; 152 Key *k;
153 int len; 153 u_int len;
154 u_char *blob; 154 u_char *blob;
155 struct stat st; 155 struct stat st;
156 156
diff --git a/sshconnect2.c b/sshconnect2.c
index 374eab570..c5b5ee515 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: sshconnect2.c,v 1.96 2002/02/24 19:14:59 markus Exp $"); 26RCSID("$OpenBSD: sshconnect2.c,v 1.97 2002/02/25 16:33:27 markus Exp $");
27 27
28#include "ssh.h" 28#include "ssh.h"
29#include "ssh2.h" 29#include "ssh2.h"
@@ -567,7 +567,7 @@ send_pubkey_test(Authctxt *authctxt, Key *k, sign_cb_fn *sign_callback,
567 int hint) 567 int hint)
568{ 568{
569 u_char *blob; 569 u_char *blob;
570 int bloblen, have_sig = 0; 570 u_int bloblen, have_sig = 0;
571 571
572 debug3("send_pubkey_test"); 572 debug3("send_pubkey_test");
573 573
@@ -956,7 +956,7 @@ authmethod_get(char *authlist)
956{ 956{
957 957
958 char *name = NULL; 958 char *name = NULL;
959 int next; 959 u_int next;
960 960
961 /* Use a suitable default if we're passed a nil list. */ 961 /* Use a suitable default if we're passed a nil list. */
962 if (authlist == NULL || strlen(authlist) == 0) 962 if (authlist == NULL || strlen(authlist) == 0)
diff --git a/uuencode.c b/uuencode.c
index 8d79c93f2..685d2dfa7 100644
--- a/uuencode.c
+++ b/uuencode.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: uuencode.c,v 1.13 2002/02/24 18:31:09 markus Exp $ */ 1/* $OpenBSD: uuencode.c,v 1.14 2002/02/25 16:33:27 markus Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -28,7 +28,7 @@
28#include "xmalloc.h" 28#include "xmalloc.h"
29#include "uuencode.h" 29#include "uuencode.h"
30 30
31RCSID("$OpenBSD: uuencode.c,v 1.13 2002/02/24 18:31:09 markus Exp $"); 31RCSID("$OpenBSD: uuencode.c,v 1.14 2002/02/25 16:33:27 markus Exp $");
32 32
33int 33int
34uuencode(u_char *src, u_int srclength, 34uuencode(u_char *src, u_int srclength,
@@ -58,7 +58,7 @@ uudecode(const char *src, u_char *target, size_t targsize)
58} 58}
59 59
60void 60void
61dump_base64(FILE *fp, u_char *data, int len) 61dump_base64(FILE *fp, u_char *data, u_int len)
62{ 62{
63 u_char *buf = xmalloc(2*len); 63 u_char *buf = xmalloc(2*len);
64 int i, n; 64 int i, n;
diff --git a/uuencode.h b/uuencode.h
index 0067635b6..682b623ac 100644
--- a/uuencode.h
+++ b/uuencode.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: uuencode.h,v 1.8 2001/06/26 17:27:25 markus Exp $ */ 1/* $OpenBSD: uuencode.h,v 1.9 2002/02/25 16:33:27 markus Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -28,5 +28,5 @@
28#define UUENCODE_H 28#define UUENCODE_H
29int uuencode(u_char *, u_int, char *, size_t); 29int uuencode(u_char *, u_int, char *, size_t);
30int uudecode(const char *, u_char *, size_t); 30int uudecode(const char *, u_char *, size_t);
31void dump_base64(FILE *, u_char *, int); 31void dump_base64(FILE *, u_char *, u_int);
32#endif 32#endif