From c2a13c1cd3baf2384585ddfb957c86ab2d511785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Mon, 21 Aug 2006 09:21:21 +0000 Subject: [PATCH] Tweak to make consisten and more easier to use. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17891 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/asn1/Makefile.am | 6 ++++-- lib/asn1/digest.asn1 | 15 +++++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/lib/asn1/Makefile.am b/lib/asn1/Makefile.am index fcc7c52f9..306d748ea 100644 --- a/lib/asn1/Makefile.am +++ b/lib/asn1/Makefile.am @@ -369,11 +369,13 @@ gen_files_test = \ gen_files_digest = \ asn1_DigestInit.x \ asn1_DigestInitReply.x \ - asn1_DigestReq.x \ asn1_DigestRequest.x \ asn1_DigestError.x \ asn1_DigestResponse.x \ - asn1_DigestReply.x + asn1_DigestReqInner.x \ + asn1_DigestREQ.x \ + asn1_DigestRepInner.x \ + asn1_DigestREP.x noinst_PROGRAMS = asn1_compile asn1_print asn1_gen diff --git a/lib/asn1/digest.asn1 b/lib/asn1/digest.asn1 index c30eac811..ebe95083a 100644 --- a/lib/asn1/digest.asn1 +++ b/lib/asn1/digest.asn1 @@ -6,15 +6,18 @@ BEGIN IMPORTS EncryptedData FROM krb5; DigestInit ::= SEQUENCE { - type UTF8String, -- http, sasl, chap., cram-md5 -- - cb-type [0] UTF8String OPTIONAL, - cb-binding [1] UTF8String OPTIONAL, - hostname [2] UTF8String OPTIONAL -- for chap/cram-md5 + type UTF8String, -- http, sasl, chap, cram-md5 -- + channel [0] SEQUENCE { + cb-type UTF8String, + cb-binding UTF8String + } OPTIONAL, + hostname [1] UTF8String OPTIONAL -- for chap/cram-md5 } DigestInitReply ::= SEQUENCE { nonce UTF8String, -- service nonce/challange - opaque UTF8String -- server state + opaque UTF8String, -- server state + identifier [0] UTF8String OPTIONAL } @@ -62,7 +65,7 @@ DigestREQ ::= [APPLICATION 128] SEQUENCE { innerReq [1] EncryptedData } -DigestReply ::= CHOICE { +DigestRepInner ::= CHOICE { error [0] DigestError, initReply [1] DigestInitReply, response [2] DigestResponse