summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-09-12 09:49:15 +1000
committerDamien Miller <djm@mindrot.org>2002-09-12 09:49:15 +1000
commita10f56151b24ce677c2c93440d723597410229d5 (patch)
treef645cbc8397d2f97472ed058ca680b6600535ec0
parent25162f2518f72035b50b254bfeb5b89d018223a6 (diff)
- markus@cvs.openbsd.org 2002/09/09 14:54:15
[channels.c kex.h key.c monitor.c monitor_wrap.c radix.c uuencode.c] signed vs unsigned from -pedantic; ok henning@
-rw-r--r--ChangeLog5
-rw-r--r--channels.c4
-rw-r--r--kex.h4
-rw-r--r--key.c5
-rw-r--r--monitor.c17
-rw-r--r--monitor_wrap.c4
-rw-r--r--radix.c9
-rw-r--r--uuencode.c5
8 files changed, 30 insertions, 23 deletions
diff --git a/ChangeLog b/ChangeLog
index e3626cb9..8b1d2872 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@
[monitor_wrap.c monitor_wrap.h]
kerberos support for privsep. confirmed to work by lha@stacken.kth.se
patch from markus
+ - markus@cvs.openbsd.org 2002/09/09 14:54:15
+ [channels.c kex.h key.c monitor.c monitor_wrap.c radix.c uuencode.c]
+ signed vs unsigned from -pedantic; ok henning@
20020911
- (djm) Sync openbsd-compat with OpenBSD -current
@@ -1628,4 +1631,4 @@
- (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@
-$Id: ChangeLog,v 1.2453 2002/09/11 23:47:29 djm Exp $
+$Id: ChangeLog,v 1.2454 2002/09/11 23:49:15 djm Exp $
diff --git a/channels.c b/channels.c
index fe99cdbe..0ae37b6d 100644
--- a/channels.c
+++ b/channels.c
@@ -39,7 +39,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: channels.c,v 1.180 2002/07/04 08:12:15 deraadt Exp $");
+RCSID("$OpenBSD: channels.c,v 1.181 2002/09/09 14:54:14 markus Exp $");
#include "ssh.h"
#include "ssh1.h"
@@ -875,7 +875,7 @@ channel_pre_x11_open(Channel *c, fd_set * readset, fd_set * writeset)
static int
channel_decode_socks4(Channel *c, fd_set * readset, fd_set * writeset)
{
- u_char *p, *host;
+ char *p, *host;
int len, have, i, found;
char username[256];
struct {
diff --git a/kex.h b/kex.h
index 12edcdc6..93a529e1 100644
--- a/kex.h
+++ b/kex.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.h,v 1.31 2002/05/16 22:02:50 markus Exp $ */
+/* $OpenBSD: kex.h,v 1.32 2002/09/09 14:54:14 markus Exp $ */
/*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
@@ -96,7 +96,7 @@ struct Newkeys {
};
struct Kex {
u_char *session_id;
- int session_id_len;
+ u_int session_id_len;
Newkeys *newkeys[MODE_MAX];
int we_need;
int server;
diff --git a/key.c b/key.c
index 0b03e991..9806a729 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.48 2002/07/04 10:41:47 markus Exp $");
+RCSID("$OpenBSD: key.c,v 1.49 2002/09/09 14:54:14 markus Exp $");
#include <openssl/evp.h>
@@ -494,7 +494,8 @@ key_write(Key *key, FILE *f)
{
int n, success = 0;
u_int len, bits = 0;
- u_char *blob, *uu;
+ u_char *blob;
+ char *uu;
if (key->type == KEY_RSA1 && key->rsa != NULL) {
/* size of modulus 'n' */
diff --git a/monitor.c b/monitor.c
index 562efcaf..69445ee2 100644
--- a/monitor.c
+++ b/monitor.c
@@ -25,7 +25,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: monitor.c,v 1.25 2002/09/09 06:48:06 itojun Exp $");
+RCSID("$OpenBSD: monitor.c,v 1.26 2002/09/09 14:54:15 markus Exp $");
#include <openssl/dh.h>
@@ -131,8 +131,8 @@ static BIGNUM *ssh1_challenge = NULL; /* used for ssh1 rsa auth */
static u_char *key_blob = NULL;
static u_int key_bloblen = 0;
static int key_blobtype = MM_NOKEY;
-static u_char *hostbased_cuser = NULL;
-static u_char *hostbased_chost = NULL;
+static char *hostbased_cuser = NULL;
+static char *hostbased_chost = NULL;
static char *auth_method = "unknown";
static int session_id2_len = 0;
static u_char *session_id2 = NULL;
@@ -758,7 +758,8 @@ int
mm_answer_keyallowed(int socket, Buffer *m)
{
Key *key;
- u_char *cuser, *chost, *blob;
+ char *cuser, *chost;
+ u_char *blob;
u_int bloblen;
enum mm_keytype type = 0;
int allowed = 0;
@@ -834,7 +835,7 @@ static int
monitor_valid_userblob(u_char *data, u_int datalen)
{
Buffer b;
- u_char *p;
+ char *p;
u_int len;
int fail = 0;
@@ -887,11 +888,11 @@ monitor_valid_userblob(u_char *data, u_int datalen)
}
static int
-monitor_valid_hostbasedblob(u_char *data, u_int datalen, u_char *cuser,
- u_char *chost)
+monitor_valid_hostbasedblob(u_char *data, u_int datalen, char *cuser,
+ char *chost)
{
Buffer b;
- u_char *p;
+ char *p;
u_int len;
int fail = 0;
diff --git a/monitor_wrap.c b/monitor_wrap.c
index ed1c50ff..5d11a659 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -25,7 +25,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: monitor_wrap.c,v 1.17 2002/09/09 06:48:06 itojun Exp $");
+RCSID("$OpenBSD: monitor_wrap.c,v 1.18 2002/09/09 14:54:15 markus Exp $");
#include <openssl/bn.h>
#include <openssl/dh.h>
@@ -599,7 +599,7 @@ int
mm_pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, int namebuflen)
{
Buffer m;
- u_char *p;
+ char *p;
int success = 0;
buffer_init(&m);
diff --git a/radix.c b/radix.c
index 580e7e07..c680d6bf 100644
--- a/radix.c
+++ b/radix.c
@@ -26,7 +26,7 @@
#include "includes.h"
#include "uuencode.h"
-RCSID("$OpenBSD: radix.c,v 1.21 2002/06/19 00:27:55 deraadt Exp $");
+RCSID("$OpenBSD: radix.c,v 1.22 2002/09/09 14:54:15 markus Exp $");
#ifdef AFS
#include <krb.h>
@@ -93,9 +93,10 @@ int
radix_to_creds(const char *buf, CREDENTIALS *creds)
{
Buffer b;
- char c, version, *space, *p;
- u_int endTime;
- int len, blen, ret;
+ u_char *space;
+ char c, version, *p;
+ u_int endTime, len;
+ int blen, ret;
ret = 0;
blen = strlen(buf);
diff --git a/uuencode.c b/uuencode.c
index 89fcb081..21eaf4d3 100644
--- a/uuencode.c
+++ b/uuencode.c
@@ -23,9 +23,10 @@
*/
#include "includes.h"
+RCSID("$OpenBSD: uuencode.c,v 1.16 2002/09/09 14:54:15 markus Exp $");
+
#include "xmalloc.h"
#include "uuencode.h"
-RCSID("$OpenBSD: uuencode.c,v 1.15 2002/03/04 17:27:39 stevesk Exp $");
int
uuencode(u_char *src, u_int srclength,
@@ -57,7 +58,7 @@ uudecode(const char *src, u_char *target, size_t targsize)
void
dump_base64(FILE *fp, u_char *data, u_int len)
{
- u_char *buf = xmalloc(2*len);
+ char *buf = xmalloc(2*len);
int i, n;
n = uuencode(data, len, buf, 2*len);