summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sshconnect1.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6a80682c7..1d512e6fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
9 - itojun@cvs.openbsd.org 2002/03/11 03:19:53 9 - itojun@cvs.openbsd.org 2002/03/11 03:19:53
10 [sftp-client.c] 10 [sftp-client.c]
11 indent 11 indent
12 - markus@cvs.openbsd.org 2002/03/14 15:24:27
13 [sshconnect1.c]
14 don't trust size sent by (rogue) server; noted by s.esser@e-matters.de
12 15
1320020317 1620020317
14 - (tim) [configure.ac] Assume path given with --with-pid-dir=PATH is wanted, 17 - (tim) [configure.ac] Assume path given with --with-pid-dir=PATH is wanted,
@@ -7855,4 +7858,4 @@
7855 - Wrote replacements for strlcpy and mkdtemp 7858 - Wrote replacements for strlcpy and mkdtemp
7856 - Released 1.0pre1 7859 - Released 1.0pre1
7857 7860
7858$Id: ChangeLog,v 1.1926 2002/03/22 01:05:27 mouring Exp $ 7861$Id: ChangeLog,v 1.1927 2002/03/22 01:08:07 mouring Exp $
diff --git a/sshconnect1.c b/sshconnect1.c
index d7722f4b9..393694138 100644
--- a/sshconnect1.c
+++ b/sshconnect1.c
@@ -13,7 +13,7 @@
13 */ 13 */
14 14
15#include "includes.h" 15#include "includes.h"
16RCSID("$OpenBSD: sshconnect1.c,v 1.48 2002/02/11 16:15:46 markus Exp $"); 16RCSID("$OpenBSD: sshconnect1.c,v 1.49 2002/03/14 15:24:27 markus Exp $");
17 17
18#include <openssl/bn.h> 18#include <openssl/bn.h>
19#include <openssl/md5.h> 19#include <openssl/md5.h>
@@ -459,6 +459,8 @@ try_krb4_authentication(void)
459 459
460 /* Get server's response. */ 460 /* Get server's response. */
461 reply = packet_get_string((u_int *) &auth.length); 461 reply = packet_get_string((u_int *) &auth.length);
462 if (auth.length >= MAX_KTXT_LEN)
463 fatal("Kerberos v4: Malformed response from server");
462 memcpy(auth.dat, reply, auth.length); 464 memcpy(auth.dat, reply, auth.length);
463 xfree(reply); 465 xfree(reply);
464 466