From 11e5bfe11e62d10c2de9509daa5f26d69741b90a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Tue, 22 Jul 2003 13:04:24 +0000
Subject: [PATCH] (ETYPE-INFO2-ENTRY): salt is a KerberosString

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@12485 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/asn1/k5.asn1 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/asn1/k5.asn1 b/lib/asn1/k5.asn1
index e9dbd6363..76360c232 100644
--- a/lib/asn1/k5.asn1
+++ b/lib/asn1/k5.asn1
@@ -109,6 +109,8 @@ ENCTYPE ::= INTEGER {
 
 UNSIGNED ::= INTEGER (0..4294967295)
 
+KerberosString  ::= GeneralString
+
 Realm ::= GeneralString
 PrincipalName ::= SEQUENCE {
 	name-type[0]		NAME-TYPE,
@@ -278,7 +280,7 @@ ETYPE-INFO ::= SEQUENCE OF ETYPE-INFO-ENTRY
 
 ETYPE-INFO2-ENTRY ::= SEQUENCE {
 	etype[0]		ENCTYPE,
-	salt[1]			OCTET STRING OPTIONAL, -- KerberosString
+	salt[1]			KerberosString OPTIONAL,
 	s2kparams[2]		OCTET STRING OPTIONAL
 }