diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2002-02-26 17:58:29 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2002-02-26 17:58:29 +0000 |
commit | 14519086e4d04acec0e0f83e1d31ffdce4419d52 (patch) | |
tree | 2a4c32ac3d83a81991bae34f4a1552fc9b4e0345 | |
parent | 9c8edc96fcb30cb8a9b0bd87fc1903c6fb618c31 (diff) |
- markus@cvs.openbsd.org 2002/02/23 17:59:02
[kex.c kexdh.c kexgex.c]
don't allow garbage after payload.
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | kex.c | 3 | ||||
-rw-r--r-- | kexdh.c | 3 | ||||
-rw-r--r-- | kexgex.c | 3 |
4 files changed, 10 insertions, 4 deletions
@@ -23,6 +23,9 @@ | |||
23 | - markus@cvs.openbsd.org 2002/02/22 12:20:34 | 23 | - markus@cvs.openbsd.org 2002/02/22 12:20:34 |
24 | [log.c log.h ssh-keyscan.c] | 24 | [log.c log.h ssh-keyscan.c] |
25 | overwrite fatal() in ssh-keyscan.c; fixes pr 2354; ok provos@ | 25 | overwrite fatal() in ssh-keyscan.c; fixes pr 2354; ok provos@ |
26 | - markus@cvs.openbsd.org 2002/02/23 17:59:02 | ||
27 | [kex.c kexdh.c kexgex.c] | ||
28 | don't allow garbage after payload. | ||
26 | 29 | ||
27 | 20020225 | 30 | 20020225 |
28 | - (bal) Last AIX patch. Moved aix_usrinfo() outside of do_setuserconext() | 31 | - (bal) Last AIX patch. Moved aix_usrinfo() outside of do_setuserconext() |
@@ -7696,4 +7699,4 @@ | |||
7696 | - Wrote replacements for strlcpy and mkdtemp | 7699 | - Wrote replacements for strlcpy and mkdtemp |
7697 | - Released 1.0pre1 | 7700 | - Released 1.0pre1 |
7698 | 7701 | ||
7699 | $Id: ChangeLog,v 1.1879 2002/02/26 17:52:14 mouring Exp $ | 7702 | $Id: ChangeLog,v 1.1880 2002/02/26 17:58:29 mouring Exp $ |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: kex.c,v 1.45 2002/02/14 23:41:01 markus Exp $"); | 26 | RCSID("$OpenBSD: kex.c,v 1.46 2002/02/23 17:59:02 markus Exp $"); |
27 | 27 | ||
28 | #include <openssl/crypto.h> | 28 | #include <openssl/crypto.h> |
29 | 29 | ||
@@ -132,6 +132,7 @@ kex_finish(Kex *kex) | |||
132 | 132 | ||
133 | debug("waiting for SSH2_MSG_NEWKEYS"); | 133 | debug("waiting for SSH2_MSG_NEWKEYS"); |
134 | packet_read_expect(SSH2_MSG_NEWKEYS); | 134 | packet_read_expect(SSH2_MSG_NEWKEYS); |
135 | packet_check_eom(); | ||
135 | debug("SSH2_MSG_NEWKEYS received"); | 136 | debug("SSH2_MSG_NEWKEYS received"); |
136 | 137 | ||
137 | kex->done = 1; | 138 | kex->done = 1; |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: kexdh.c,v 1.14 2002/01/31 13:35:11 markus Exp $"); | 26 | RCSID("$OpenBSD: kexdh.c,v 1.15 2002/02/23 17:59:02 markus Exp $"); |
27 | 27 | ||
28 | #include <openssl/crypto.h> | 28 | #include <openssl/crypto.h> |
29 | #include <openssl/bn.h> | 29 | #include <openssl/bn.h> |
@@ -220,6 +220,7 @@ kexdh_server(Kex *kex) | |||
220 | if ((dh_client_pub = BN_new()) == NULL) | 220 | if ((dh_client_pub = BN_new()) == NULL) |
221 | fatal("dh_client_pub == NULL"); | 221 | fatal("dh_client_pub == NULL"); |
222 | packet_get_bignum2(dh_client_pub); | 222 | packet_get_bignum2(dh_client_pub); |
223 | packet_check_eom(); | ||
223 | 224 | ||
224 | #ifdef DEBUG_KEXDH | 225 | #ifdef DEBUG_KEXDH |
225 | fprintf(stderr, "dh_client_pub= "); | 226 | fprintf(stderr, "dh_client_pub= "); |
@@ -24,7 +24,7 @@ | |||
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include "includes.h" | 26 | #include "includes.h" |
27 | RCSID("$OpenBSD: kexgex.c,v 1.17 2002/01/31 13:35:11 markus Exp $"); | 27 | RCSID("$OpenBSD: kexgex.c,v 1.18 2002/02/23 17:59:02 markus Exp $"); |
28 | 28 | ||
29 | #include <openssl/bn.h> | 29 | #include <openssl/bn.h> |
30 | 30 | ||
@@ -319,6 +319,7 @@ kexgex_server(Kex *kex) | |||
319 | if ((dh_client_pub = BN_new()) == NULL) | 319 | if ((dh_client_pub = BN_new()) == NULL) |
320 | fatal("dh_client_pub == NULL"); | 320 | fatal("dh_client_pub == NULL"); |
321 | packet_get_bignum2(dh_client_pub); | 321 | packet_get_bignum2(dh_client_pub); |
322 | packet_check_eom(); | ||
322 | 323 | ||
323 | #ifdef DEBUG_KEXDH | 324 | #ifdef DEBUG_KEXDH |
324 | fprintf(stderr, "dh_client_pub= "); | 325 | fprintf(stderr, "dh_client_pub= "); |