From 0305bed6536e2df154dcc5a75cbdd33e0a4ae2d4 Mon Sep 17 00:00:00 2001
From: Johan Danielsson <joda@pdc.kth.se>
Date: Sun, 31 Aug 1997 19:30:29 +0000
Subject: [PATCH] Include salt type in salt.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3317 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/hdb/hdb.asn1 | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/hdb/hdb.asn1 b/lib/hdb/hdb.asn1
index 62dca17cb..fed988a03 100644
--- a/lib/hdb/hdb.asn1
+++ b/lib/hdb/hdb.asn1
@@ -6,13 +6,22 @@ EncryptionKey EXTERNAL
 KerberosTime EXTERNAL
 Principal EXTERNAL
 
-HDB_DB_FORMAT INTEGER ::= 0	-- format of database, 
+HDB_DB_FORMAT INTEGER ::= 1	-- format of database, 
 				-- update when making changes
 
+-- these should have the same value as the pa-* counterparts
+hdb-pw-salt	INTEGER	::= 3
+hdb-afs3-salt	INTEGER	::= 10
+
+Salt ::= SEQUENCE {
+	type[0]		INTEGER,
+	salt[1]		OCTET STRING
+}
+
 Key ::= SEQUENCE {
 	mkvno[0]	INTEGER,	-- master key version number
 	key[1]		EncryptionKey,
-	salt[2]		OCTET STRING OPTIONAL
+	salt[2]		Salt OPTIONAL
 }
 
 Event ::= SEQUENCE {