From 4d59dbbfc45a3531dde1f8d8b0deee7865299d86 Mon Sep 17 00:00:00 2001
From: Johan Danielsson <joda@pdc.kth.se>
Date: Wed, 18 Apr 2001 13:10:58 +0000
Subject: [PATCH] move enctypes here

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

diff --git a/lib/asn1/k5.asn1 b/lib/asn1/k5.asn1
index 1660243f9..0bd3b7609 100644
--- a/lib/asn1/k5.asn1
+++ b/lib/asn1/k5.asn1
@@ -77,6 +77,29 @@ CKSUMTYPE ::= INTEGER {
 	CKSUMTYPE_HMAC_MD5_ENC(-1138)	-- even more unofficial
 }
 
+--enctypes
+ENCTYPE ::= INTEGER {
+	ETYPE_NULL(0),
+	ETYPE_DES_CBC_CRC(1),
+	ETYPE_DES_CBC_MD4(2),
+	ETYPE_DES_CBC_MD5(3),
+	ETYPE_DES3_CBC_MD5(5),
+	ETYPE_OLD_DES3_CBC_SHA1(7),
+	ETYPE_SIGN_DSA_GENERATE(8),
+	ETYPE_ENCRYPT_RSA_PRIV(9),
+	ETYPE_ENCRYPT_RSA_PUB(10),
+	ETYPE_DES3_CBC_SHA1(16),	-- with key derivation
+	ETYPE_ARCFOUR_HMAC_MD5(23),
+	ETYPE_ARCFOUR_HMAC_MD5_56(24),
+	ETYPE_ENCTYPE_PK_CROSS(48),
+-- these are for Heimdal internal use
+	ETYPE_DES_CBC_NONE(-0x1000),
+	ETYPE_DES3_CBC_NONE(-0x1001),
+	ETYPE_DES_CFB64_NONE(-0x1002),
+	ETYPE_DES_PCBC_NONE(-0x1003),
+	ETYPE_DES3_CBC_NONE_IVEC(-0x1004)
+}
+
 -- this is sugar to make something ASN1 does not have: unsigned
 
 UNSIGNED ::= INTEGER (0..4294967295)
@@ -169,7 +192,7 @@ LastReq ::= SEQUENCE OF SEQUENCE {
 }
 
 EncryptedData ::= SEQUENCE {
-	etype[0] 		INTEGER, -- EncryptionType
+	etype[0] 		ENCTYPE, -- EncryptionType
 	kvno[1]			INTEGER OPTIONAL,
 	cipher[2]		OCTET STRING -- ciphertext
 }
@@ -230,7 +253,7 @@ PA-DATA ::= SEQUENCE {
 }
 
 ETYPE-INFO-ENTRY ::= SEQUENCE {
-	etype[0]		INTEGER,
+	etype[0]		ENCTYPE,
 	salt[1]			OCTET STRING OPTIONAL,
 	salttype[2]		INTEGER OPTIONAL
 }
@@ -249,7 +272,7 @@ KDC-REQ-BODY ::= SEQUENCE {
 	till[5]			KerberosTime OPTIONAL,
 	rtime[6]		KerberosTime OPTIONAL,
 	nonce[7]		INTEGER,
-	etype[8]		SEQUENCE OF INTEGER, -- EncryptionType,
+	etype[8]		SEQUENCE OF ENCTYPE, -- EncryptionType,
 					-- in preference order
 	addresses[9]		HostAddresses OPTIONAL,
 	enc-authorization-data[10] EncryptedData OPTIONAL,