- deraadt@cvs.openbsd.org 2006/03/25 18:29:35
[auth-rsa.c authfd.c packet.c] needed casts (always will be needed)
This commit is contained in:
parent
48c4ed2b78
commit
8ba29fe72d
|
@ -150,6 +150,9 @@
|
||||||
[uidswap.c uuencode.c xmalloc.c]
|
[uidswap.c uuencode.c xmalloc.c]
|
||||||
Put $OpenBSD$ tags back (as comments) to replace the RCSID()s that
|
Put $OpenBSD$ tags back (as comments) to replace the RCSID()s that
|
||||||
Theo nuked - our scripts to sync -portable need them in the files
|
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
|
20060325
|
||||||
- OpenBSD CVS Sync
|
- OpenBSD CVS Sync
|
||||||
|
@ -4407,4 +4410,4 @@
|
||||||
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
|
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
|
||||||
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
|
- (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 $
|
||||||
|
|
|
@ -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>
|
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
||||||
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
* 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. */
|
/* Wait for a response. */
|
||||||
packet_read_expect(SSH_CMSG_AUTH_RSA_RESPONSE);
|
packet_read_expect(SSH_CMSG_AUTH_RSA_RESPONSE);
|
||||||
for (i = 0; i < 16; i++)
|
for (i = 0; i < 16; i++)
|
||||||
response[i] = packet_get_char();
|
response[i] = (u_char)packet_get_char();
|
||||||
packet_check_eom();
|
packet_check_eom();
|
||||||
|
|
||||||
success = PRIVSEP(auth_rsa_verify_response(key, challenge, response));
|
success = PRIVSEP(auth_rsa_verify_response(key, challenge, response));
|
||||||
|
|
4
authfd.c
4
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>
|
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
||||||
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
* 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.
|
* fatal error if the packet is corrupt.
|
||||||
*/
|
*/
|
||||||
for (i = 0; i < 16; i++)
|
for (i = 0; i < 16; i++)
|
||||||
response[i] = buffer_get_char(&buffer);
|
response[i] = (u_char)buffer_get_char(&buffer);
|
||||||
}
|
}
|
||||||
buffer_free(&buffer);
|
buffer_free(&buffer);
|
||||||
return success;
|
return success;
|
||||||
|
|
4
packet.c
4
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>
|
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
||||||
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
* 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++) {
|
for (i = 0; i < nbytes; i++) {
|
||||||
if (i % 4 == 0)
|
if (i % 4 == 0)
|
||||||
rnd = arc4random();
|
rnd = arc4random();
|
||||||
packet_put_char(rnd & 0xff);
|
packet_put_char((u_char)rnd & 0xff);
|
||||||
rnd >>= 8;
|
rnd >>= 8;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue