diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | auth2-gss.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -6,6 +6,9 @@ | |||
6 | - markus@cvs.openbsd.org 2003/10/15 09:48:45 | 6 | - markus@cvs.openbsd.org 2003/10/15 09:48:45 |
7 | [monitor_wrap.c] | 7 | [monitor_wrap.c] |
8 | check pmonitor != NULL | 8 | check pmonitor != NULL |
9 | - markus@cvs.openbsd.org 2003/10/21 09:50:06 | ||
10 | [auth2-gss.c] | ||
11 | make sure the doid is larger than 2 | ||
9 | 12 | ||
10 | 20031021 | 13 | 20031021 |
11 | - (dtucker) [INSTALL] Some system crypt() functions support MD5 passwords | 14 | - (dtucker) [INSTALL] Some system crypt() functions support MD5 passwords |
@@ -1380,4 +1383,4 @@ | |||
1380 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1383 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1381 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1384 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1382 | 1385 | ||
1383 | $Id: ChangeLog,v 1.3087 2003/11/03 09:03:25 dtucker Exp $ | 1386 | $Id: ChangeLog,v 1.3088 2003/11/03 09:05:03 dtucker Exp $ |
diff --git a/auth2-gss.c b/auth2-gss.c index 75b94b009..a82b87f51 100644 --- a/auth2-gss.c +++ b/auth2-gss.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth2-gss.c,v 1.3 2003/09/01 20:44:54 markus Exp $ */ | 1 | /* $OpenBSD: auth2-gss.c,v 1.4 2003/10/21 09:50:06 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. | 4 | * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. |
@@ -79,6 +79,8 @@ userauth_gssapi(Authctxt *authctxt) | |||
79 | xfree(doid); | 79 | xfree(doid); |
80 | 80 | ||
81 | doid = packet_get_string(&len); | 81 | doid = packet_get_string(&len); |
82 | if (len <= 2) | ||
83 | packet_disconnect("Short OID received"); | ||
82 | 84 | ||
83 | if (doid[0] != SSH_GSS_OIDTYPE || doid[1] != len-2) { | 85 | if (doid[0] != SSH_GSS_OIDTYPE || doid[1] != len-2) { |
84 | logit("Mechanism OID received using the old encoding form"); | 86 | logit("Mechanism OID received using the old encoding form"); |