summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-03-26 14:25:19 +1100
committerDamien Miller <djm@mindrot.org>2006-03-26 14:25:19 +1100
commit8ba29fe72d68c6044b0383bc56931f05f8f35b68 (patch)
tree6197ef3dec8aa58ba7999d5e6d2a0c49bfc516b4
parent48c4ed2b78a831b068529eefd8a002c431a76232 (diff)
- deraadt@cvs.openbsd.org 2006/03/25 18:29:35
[auth-rsa.c authfd.c packet.c] needed casts (always will be needed)
-rw-r--r--ChangeLog5
-rw-r--r--auth-rsa.c4
-rw-r--r--authfd.c4
-rw-r--r--packet.c4
4 files changed, 10 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 2a12ec18..1866546e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -150,6 +150,9 @@
[uidswap.c uuencode.c xmalloc.c]
Put $OpenBSD$ tags back (as comments) to replace the RCSID()s that
Theo nuked - our scripts to sync -portable need them in the files
+ - deraadt@cvs.openbsd.org 2006/03/25 18:29:35
+ [auth-rsa.c authfd.c packet.c]
+ needed casts (always will be needed)
20060325
- OpenBSD CVS Sync
@@ -4407,4 +4410,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.4277 2006/03/26 03:25:05 djm Exp $
+$Id: ChangeLog,v 1.4278 2006/03/26 03:25:19 djm Exp $
diff --git a/auth-rsa.c b/auth-rsa.c
index a906eb2d..c331c267 100644
--- a/auth-rsa.c
+++ b/auth-rsa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-rsa.c,v 1.66 2006/03/25 13:17:01 djm Exp $ */
+/* $OpenBSD: auth-rsa.c,v 1.67 2006/03/25 18:29:35 deraadt Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -140,7 +140,7 @@ auth_rsa_challenge_dialog(Key *key)
/* Wait for a response. */
packet_read_expect(SSH_CMSG_AUTH_RSA_RESPONSE);
for (i = 0; i < 16; i++)
- response[i] = packet_get_char();
+ response[i] = (u_char)packet_get_char();
packet_check_eom();
success = PRIVSEP(auth_rsa_verify_response(key, challenge, response));
diff --git a/authfd.c b/authfd.c
index 93514376..2654892d 100644
--- a/authfd.c
+++ b/authfd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: authfd.c,v 1.72 2006/03/25 13:17:01 djm Exp $ */
+/* $OpenBSD: authfd.c,v 1.73 2006/03/25 18:29:35 deraadt Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -396,7 +396,7 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
* fatal error if the packet is corrupt.
*/
for (i = 0; i < 16; i++)
- response[i] = buffer_get_char(&buffer);
+ response[i] = (u_char)buffer_get_char(&buffer);
}
buffer_free(&buffer);
return success;
diff --git a/packet.c b/packet.c
index 71da5454..fceeef66 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.128 2006/03/25 13:17:02 djm Exp $ */
+/* $OpenBSD: packet.c,v 1.129 2006/03/25 18:29:35 deraadt Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1549,7 +1549,7 @@ packet_send_ignore(int nbytes)
for (i = 0; i < nbytes; i++) {
if (i % 4 == 0)
rnd = arc4random();
- packet_put_char(rnd & 0xff);
+ packet_put_char((u_char)rnd & 0xff);
rnd >>= 8;
}
}