diff options
author | Damien Miller <djm@mindrot.org> | 2002-01-22 23:11:40 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2002-01-22 23:11:40 +1100 |
commit | 48b03fc5460390318e94462707182b72dfaba91f (patch) | |
tree | 5fca9bcb09bab53083b274e0121a92dc8c1fbb16 /kexgex.c | |
parent | 66823cddbe80d1d22ac44d503b8c121f071e7105 (diff) |
- markus@cvs.openbsd.org 2001/12/27 20:39:58
[auth1.c auth-rsa.c channels.c clientloop.c packet.c packet.h serverloop.c session.c ssh.c sshconnect1.c sshd.c ttymodes.c]
get rid of packet_integrity_check, use packet_done() instead.
Diffstat (limited to 'kexgex.c')
-rw-r--r-- | kexgex.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -24,7 +24,7 @@ | |||
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include "includes.h" | 26 | #include "includes.h" |
27 | RCSID("$OpenBSD: kexgex.c,v 1.12 2001/12/27 19:37:23 markus Exp $"); | 27 | RCSID("$OpenBSD: kexgex.c,v 1.13 2001/12/28 12:14:27 markus Exp $"); |
28 | 28 | ||
29 | #include <openssl/bn.h> | 29 | #include <openssl/bn.h> |
30 | 30 | ||
@@ -146,7 +146,7 @@ kexgex_client(Kex *kex) | |||
146 | if ((g = BN_new()) == NULL) | 146 | if ((g = BN_new()) == NULL) |
147 | fatal("BN_new"); | 147 | fatal("BN_new"); |
148 | packet_get_bignum2(g, &dlen); | 148 | packet_get_bignum2(g, &dlen); |
149 | packet_done(); | 149 | packet_check_eom(); |
150 | 150 | ||
151 | if (BN_num_bits(p) < min || BN_num_bits(p) > max) | 151 | if (BN_num_bits(p) < min || BN_num_bits(p) > max) |
152 | fatal("DH_GEX group out of range: %d !< %d !< %d", | 152 | fatal("DH_GEX group out of range: %d !< %d !< %d", |
@@ -196,7 +196,7 @@ kexgex_client(Kex *kex) | |||
196 | 196 | ||
197 | /* signed H */ | 197 | /* signed H */ |
198 | signature = packet_get_string(&slen); | 198 | signature = packet_get_string(&slen); |
199 | packet_done(); | 199 | packet_check_eom(); |
200 | 200 | ||
201 | if (!dh_pub_is_valid(dh, dh_server_pub)) | 201 | if (!dh_pub_is_valid(dh, dh_server_pub)) |
202 | packet_disconnect("bad server public DH value"); | 202 | packet_disconnect("bad server public DH value"); |
@@ -289,7 +289,7 @@ kexgex_server(Kex *kex) | |||
289 | default: | 289 | default: |
290 | fatal("protocol error during kex, no DH_GEX_REQUEST: %d", type); | 290 | fatal("protocol error during kex, no DH_GEX_REQUEST: %d", type); |
291 | } | 291 | } |
292 | packet_done(); | 292 | packet_check_eom(); |
293 | 293 | ||
294 | if (max < min || nbits < min || max < nbits) | 294 | if (max < min || nbits < min || max < nbits) |
295 | fatal("DH_GEX_REQUEST, bad parameters: %d !< %d !< %d", | 295 | fatal("DH_GEX_REQUEST, bad parameters: %d !< %d !< %d", |