From b39330c4873d4c3923a577e89690fc0e43b0c61a Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 22 Aug 2007 06:46:34 +0000
Subject: r24614: Merge with current lorikeet-heimdal.  This brings us one step
 closer to an alpha release.

Andrew Bartlett
(This used to be commit 30e02747d511630659c59eafec8d28f58605943b)
---
 source4/heimdal/lib/gssapi/spnego/spnego.asn1 | 45 ++++++++++++++-------------
 1 file changed, 23 insertions(+), 22 deletions(-)

(limited to 'source4/heimdal/lib/gssapi/spnego/spnego.asn1')

diff --git a/source4/heimdal/lib/gssapi/spnego/spnego.asn1 b/source4/heimdal/lib/gssapi/spnego/spnego.asn1
index aed67dc4ae..058f10ba3a 100644
--- a/source4/heimdal/lib/gssapi/spnego/spnego.asn1
+++ b/source4/heimdal/lib/gssapi/spnego/spnego.asn1
@@ -1,4 +1,4 @@
--- $Id: spnego.asn1 19420 2006-12-18 18:28:49Z lha $
+-- $Id: spnego.asn1 21403 2007-07-04 08:13:12Z lha $
 
 SPNEGO DEFINITIONS ::=
 BEGIN
@@ -8,34 +8,34 @@ MechType::= OBJECT IDENTIFIER
 MechTypeList ::= SEQUENCE OF MechType
 
 ContextFlags ::= BIT STRING {
-        delegFlag       (0),
-        mutualFlag      (1),
-        replayFlag      (2),
-        sequenceFlag    (3),
-        anonFlag        (4),
-        confFlag        (5),
-        integFlag       (6)
+    delegFlag       (0),
+    mutualFlag      (1),
+    replayFlag      (2),
+    sequenceFlag    (3),
+    anonFlag        (4),
+    confFlag        (5),
+    integFlag       (6)
 }
 
 NegHints ::= SEQUENCE {
-    hintName       [0]  GeneralString                          OPTIONAL,
-    hintAddress    [1]  OCTET STRING                           OPTIONAL
+    hintName       [0]  GeneralString	OPTIONAL,
+    hintAddress    [1]  OCTET STRING	OPTIONAL
 } 
 
 NegTokenInitWin ::= SEQUENCE {
-                            mechTypes       [0] MechTypeList,
-                            reqFlags        [1] ContextFlags   OPTIONAL,
-                            mechToken       [2] OCTET STRING   OPTIONAL,
-			    negHints        [3] NegHints       OPTIONAL
-			     }
+    mechTypes       [0] MechTypeList,
+    reqFlags        [1] ContextFlags   OPTIONAL,
+    mechToken       [2] OCTET STRING   OPTIONAL,
+    negHints        [3] NegHints       OPTIONAL
+}
 
 NegTokenInit ::= SEQUENCE {
-                            mechTypes       [0] MechTypeList,
-                            reqFlags        [1] ContextFlags   OPTIONAL,
-                            mechToken       [2] OCTET STRING   OPTIONAL,
-			    mechListMIC	    [3] OCTET STRING   OPTIONAL
-                         }
-
+    mechTypes       [0] MechTypeList,
+    reqFlags        [1] ContextFlags   OPTIONAL,
+    mechToken       [2] OCTET STRING   OPTIONAL,
+    mechListMIC	    [3] OCTET STRING   OPTIONAL,
+    ...
+}
 
 -- NB: negResult is not OPTIONAL in the new SPNEGO spec but
 -- Windows clients do not always send it
@@ -47,7 +47,8 @@ NegTokenResp ::= SEQUENCE {
                             request-mic         (3) }          OPTIONAL,
     supportedMech  [1] MechType                                OPTIONAL,
     responseToken  [2] OCTET STRING                            OPTIONAL,
-    mechListMIC    [3] OCTET STRING                            OPTIONAL
+    mechListMIC    [3] OCTET STRING                            OPTIONAL,
+    ...
 }
 
 NegotiationToken ::= CHOICE {
-- 
cgit