summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 2a12ec18d..1866546e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -150,6 +150,9 @@
150 [uidswap.c uuencode.c xmalloc.c] 150 [uidswap.c uuencode.c xmalloc.c]
151 Put $OpenBSD$ tags back (as comments) to replace the RCSID()s that 151 Put $OpenBSD$ tags back (as comments) to replace the RCSID()s that
152 Theo nuked - our scripts to sync -portable need them in the files 152 Theo nuked - our scripts to sync -portable need them in the files
153 - deraadt@cvs.openbsd.org 2006/03/25 18:29:35
154 [auth-rsa.c authfd.c packet.c]
155 needed casts (always will be needed)
153 156
15420060325 15720060325
155 - OpenBSD CVS Sync 158 - OpenBSD CVS Sync
@@ -4407,4 +4410,4 @@
4407 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4410 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4408 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4411 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4409 4412
4410$Id: ChangeLog,v 1.4277 2006/03/26 03:25:05 djm Exp $ 4413$Id: ChangeLog,v 1.4278 2006/03/26 03:25:19 djm Exp $
diff --git a/auth-rsa.c b/auth-rsa.c
index a906eb2d6..c331c267d 100644
--- a/auth-rsa.c
+++ b/auth-rsa.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth-rsa.c,v 1.66 2006/03/25 13:17:01 djm Exp $ */ 1/* $OpenBSD: auth-rsa.c,v 1.67 2006/03/25 18:29:35 deraadt Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -140,7 +140,7 @@ auth_rsa_challenge_dialog(Key *key)
140 /* Wait for a response. */ 140 /* Wait for a response. */
141 packet_read_expect(SSH_CMSG_AUTH_RSA_RESPONSE); 141 packet_read_expect(SSH_CMSG_AUTH_RSA_RESPONSE);
142 for (i = 0; i < 16; i++) 142 for (i = 0; i < 16; i++)
143 response[i] = packet_get_char(); 143 response[i] = (u_char)packet_get_char();
144 packet_check_eom(); 144 packet_check_eom();
145 145
146 success = PRIVSEP(auth_rsa_verify_response(key, challenge, response)); 146 success = PRIVSEP(auth_rsa_verify_response(key, challenge, response));
diff --git a/authfd.c b/authfd.c
index 935143765..2654892d0 100644
--- a/authfd.c
+++ b/authfd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: authfd.c,v 1.72 2006/03/25 13:17:01 djm Exp $ */ 1/* $OpenBSD: authfd.c,v 1.73 2006/03/25 18:29:35 deraadt Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -396,7 +396,7 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
396 * fatal error if the packet is corrupt. 396 * fatal error if the packet is corrupt.
397 */ 397 */
398 for (i = 0; i < 16; i++) 398 for (i = 0; i < 16; i++)
399 response[i] = buffer_get_char(&buffer); 399 response[i] = (u_char)buffer_get_char(&buffer);
400 } 400 }
401 buffer_free(&buffer); 401 buffer_free(&buffer);
402 return success; 402 return success;
diff --git a/packet.c b/packet.c
index 71da5454e..fceeef666 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: packet.c,v 1.128 2006/03/25 13:17:02 djm Exp $ */ 1/* $OpenBSD: packet.c,v 1.129 2006/03/25 18:29:35 deraadt Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1549,7 +1549,7 @@ packet_send_ignore(int nbytes)
1549 for (i = 0; i < nbytes; i++) { 1549 for (i = 0; i < nbytes; i++) {
1550 if (i % 4 == 0) 1550 if (i % 4 == 0)
1551 rnd = arc4random(); 1551 rnd = arc4random();
1552 packet_put_char(rnd & 0xff); 1552 packet_put_char((u_char)rnd & 0xff);
1553 rnd >>= 8; 1553 rnd >>= 8;
1554 } 1554 }
1555} 1555}