diff options
author | Darren Tucker <dtucker@zip.com.au> | 2004-06-22 12:56:01 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2004-06-22 12:56:01 +1000 |
commit | 3f9fdc71219d498a996c4e4ca8330df7f598fb5d (patch) | |
tree | 902072deed2ca26a5b0b3fa5f3749783e0bd62e6 /kex.c | |
parent | b357afc0a03a4238a01acf5d9641ebda9f71d500 (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 'kex.c')
-rw-r--r-- | kex.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: kex.c,v 1.59 2004/06/13 12:53:24 djm Exp $"); | 26 | RCSID("$OpenBSD: kex.c,v 1.60 2004/06/21 17:36:31 avsm Exp $"); |
27 | 27 | ||
28 | #include <openssl/crypto.h> | 28 | #include <openssl/crypto.h> |
29 | 29 | ||
@@ -148,7 +148,7 @@ kex_finish(Kex *kex) | |||
148 | void | 148 | void |
149 | kex_send_kexinit(Kex *kex) | 149 | kex_send_kexinit(Kex *kex) |
150 | { | 150 | { |
151 | u_int32_t rand = 0; | 151 | u_int32_t rnd = 0; |
152 | u_char *cookie; | 152 | u_char *cookie; |
153 | int i; | 153 | int i; |
154 | 154 | ||
@@ -168,9 +168,9 @@ kex_send_kexinit(Kex *kex) | |||
168 | cookie = buffer_ptr(&kex->my); | 168 | cookie = buffer_ptr(&kex->my); |
169 | for (i = 0; i < KEX_COOKIE_LEN; i++) { | 169 | for (i = 0; i < KEX_COOKIE_LEN; i++) { |
170 | if (i % 4 == 0) | 170 | if (i % 4 == 0) |
171 | rand = arc4random(); | 171 | rnd = arc4random(); |
172 | cookie[i] = rand; | 172 | cookie[i] = rnd; |
173 | rand >>= 8; | 173 | rnd >>= 8; |
174 | } | 174 | } |
175 | packet_start(SSH2_MSG_KEXINIT); | 175 | packet_start(SSH2_MSG_KEXINIT); |
176 | packet_put_raw(buffer_ptr(&kex->my), buffer_len(&kex->my)); | 176 | packet_put_raw(buffer_ptr(&kex->my), buffer_len(&kex->my)); |