From a11517a4d9d90e714df0e2b8b054339e9b1f3731 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Mon, 18 Dec 2006 18:28:49 +0000 Subject: [PATCH] Add "windows" versions of the NegTokenInitWin and friends. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@19420 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/gssapi/Makefile.am | 2 ++ lib/gssapi/spnego/spnego.asn1 | 14 +++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/lib/gssapi/Makefile.am b/lib/gssapi/Makefile.am index 53985add0..bebb6e09c 100644 --- a/lib/gssapi/Makefile.am +++ b/lib/gssapi/Makefile.am @@ -215,8 +215,10 @@ spnego_files = \ asn1_MechType.x \ asn1_MechTypeList.x \ asn1_NegotiationToken.x \ + asn1_NegotiationTokenWin.x \ asn1_NegHints.x \ asn1_NegTokenInit.x \ + asn1_NegTokenInitWin.x \ asn1_NegTokenResp.x $(libgssapi_la_OBJECTS): $(srcdir)/krb5/gsskrb5-private.h diff --git a/lib/gssapi/spnego/spnego.asn1 b/lib/gssapi/spnego/spnego.asn1 index 2c3dc7a10..cd2315e76 100644 --- a/lib/gssapi/spnego/spnego.asn1 +++ b/lib/gssapi/spnego/spnego.asn1 @@ -22,16 +22,20 @@ NegHints ::= SEQUENCE { hintAddress [1] OCTET STRING OPTIONAL } +NegTokenInitWin ::= SEQUENCE { + 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 - } --- negHints [3] NegHints OPTIONAL, - -- NB: negResult is not OPTIONAL in the new SPNEGO spec but -- Windows clients do not always send it @@ -51,4 +55,8 @@ NegotiationToken ::= CHOICE { negTokenResp[1] NegTokenResp } +NegotiationTokenWin ::= CHOICE { + negTokenInit[0] NegTokenInitWin +} + END