summaryrefslogtreecommitdiff
path: root/sshconnect1.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-06-22 12:56:01 +1000
committerDarren Tucker <dtucker@zip.com.au>2004-06-22 12:56:01 +1000
commit3f9fdc71219d498a996c4e4ca8330df7f598fb5d (patch)
tree902072deed2ca26a5b0b3fa5f3749783e0bd62e6 /sshconnect1.c
parentb357afc0a03a4238a01acf5d9641ebda9f71d500 (diff)
- avsm@cvs.openbsd.org 2004/06/21 17:36:31
[auth-rsa.c auth2-gss.c auth2-pubkey.c authfile.c canohost.c channels.c cipher.c dns.c kex.c monitor.c monitor_fdpass.c monitor_wrap.c monitor_wrap.h nchan.c packet.c progressmeter.c scp.c sftp-server.c sftp.c ssh-gss.h ssh-keygen.c ssh.c sshconnect.c sshconnect1.c sshlogin.c sshpty.c] make ssh -Wshadow clean, no functional changes markus@ ok There are also some portable-specific -Wshadow warnings to be fixed in monitor.c and montior_wrap.c.
Diffstat (limited to 'sshconnect1.c')
-rw-r--r--sshconnect1.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sshconnect1.c b/sshconnect1.c
index ae33ab39..61fecab1 100644
--- a/sshconnect1.c
+++ b/sshconnect1.c
@@ -13,7 +13,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: sshconnect1.c,v 1.58 2004/05/09 01:19:28 djm Exp $");
+RCSID("$OpenBSD: sshconnect1.c,v 1.59 2004/06/21 17:36:31 avsm Exp $");
#include <openssl/bn.h>
#include <openssl/md5.h>
@@ -476,7 +476,7 @@ ssh_kex(char *host, struct sockaddr *hostaddr)
u_char cookie[8];
u_int supported_ciphers;
u_int server_flags, client_flags;
- u_int32_t rand = 0;
+ u_int32_t rnd = 0;
debug("Waiting for server public key.");
@@ -540,9 +540,9 @@ ssh_kex(char *host, struct sockaddr *hostaddr)
*/
for (i = 0; i < 32; i++) {
if (i % 4 == 0)
- rand = arc4random();
- session_key[i] = rand & 0xff;
- rand >>= 8;
+ rnd = arc4random();
+ session_key[i] = rnd & 0xff;
+ rnd >>= 8;
}
/*