Attachment 5854 Details for Bug 7577 – Replacement patcg for 3.5.x.

[patch] Replacement patcg for 3.5.x.

foobar (text/plain), 2.49 KB, created by Jeremy Allison on 2010-07-20 12:27:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2010-07-20 12:27:30 UTC

Size: 2.49 KB

patch

obsolete

>diff --git a/source3/libsmb/clispnego.c b/source3/libsmb/clispnego.c
>index 264743b..36d21d0 100644
>--- a/source3/libsmb/clispnego.c
>+++ b/source3/libsmb/clispnego.c
>@@ -4,7 +4,7 @@
>    Copyright (C) Andrew Tridgell 2001
>    Copyright (C) Jim McDonough <jmcd@us.ibm.com> 2002
>    Copyright (C) Luke Howard     2003
>-   
>+
>    This program is free software; you can redistribute it and/or modify
>    it under the terms of the GNU General Public License as published by
>    the Free Software Foundation; either version 3 of the License, or
>@@ -146,9 +146,16 @@ bool spnego_parse_negTokenInit(DATA_BLOB blob,
> 	asn1_start_tag(data,ASN1_APPLICATION(0));
> 
> 	asn1_check_OID(data,OID_SPNEGO);
>+
>+	/* negTokenInit  [0]  NegTokenInit */
> 	asn1_start_tag(data,ASN1_CONTEXT(0));
> 	asn1_start_tag(data,ASN1_SEQUENCE(0));
> 
>+	/* mechTypes [0] MechTypeList  OPTIONAL */
>+
>+	/* Not really optional, we depend on this to decide
>+	 * what mechanisms we have to work with. */
>+
> 	asn1_start_tag(data,ASN1_CONTEXT(0));
> 	asn1_start_tag(data,ASN1_SEQUENCE(0));
> 	for (i=0; asn1_tag_remaining(data) > 0 && i < ASN1_MAX_OIDS-1; i++) {
>@@ -161,11 +168,45 @@ bool spnego_parse_negTokenInit(DATA_BLOB blob,
> 	asn1_end_tag(data);
> 
> 	*principal = NULL;
>-	if (asn1_tag_remaining(data) > 0) {
>+
>+	/*
>+	  Win7 + Live Sign-in Assistant attaches a mechToken
>+	  ASN1_CONTEXT(2) to the negTokenInit packet
>+	  which breaks our negotiation if we just assume
>+	  the next tag is ASN1_CONTEXT(3).
>+	*/
>+
>+	if (asn1_peek_tag(data, ASN1_CONTEXT(1))) {
>+		uint8 flags;
>+
>+		/* reqFlags [1] ContextFlags  OPTIONAL */
>+		asn1_start_tag(data, ASN1_CONTEXT(1));
>+		asn1_start_tag(data, ASN1_BIT_STRING);
>+		while (asn1_tag_remaining(data) > 0) {
>+			asn1_read_uint8(data, &flags);
>+		}
>+		asn1_end_tag(data);
>+		asn1_end_tag(data);
>+	}
>+
>+	if (asn1_peek_tag(data, ASN1_CONTEXT(2))) {
>+		/* mechToken [2] OCTET STRING  OPTIONAL */
>+		DATA_BLOB token;
>+		asn1_start_tag(data, ASN1_CONTEXT(2));
>+		asn1_read_OctetString(data, talloc_autofree_context(),
>+			&token);
>+		asn1_end_tag(data);
>+		/* Throw away the token - not used. */
>+		data_blob_free(&token);
>+	}
>+
>+	if (asn1_peek_tag(data, ASN1_CONTEXT(3))) {
>+		/* mechListMIC [3] OCTET STRING  OPTIONAL */
> 		asn1_start_tag(data, ASN1_CONTEXT(3));
> 		asn1_start_tag(data, ASN1_SEQUENCE(0));
> 		asn1_start_tag(data, ASN1_CONTEXT(0));
>-		asn1_read_GeneralString(data,talloc_autofree_context(),principal);
>+		asn1_read_GeneralString(data,talloc_autofree_context(),
>+			principal);
> 		asn1_end_tag(data);
> 		asn1_end_tag(data);
> 		asn1_end_tag(data);

Flags:

idra: review+

Actions: View

Attachments on bug 7577: 5850 | 5851 | 5852 | 5854 | 5855