From: Sam Hartman <hartmans@mit.edu>
Date: Tue, 20 May 2003 22:29:57 +0000 (+0000)
Subject: krb5_get_in_tkt now only supports old (non-etype-info2) enctypes
X-Git-Tag: krb5-1.4-beta1~943
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a9ee9b5ed1c1f2aa756f83e7b9ac255c1bc0fe95;p=krb5.git

krb5_get_in_tkt now only supports old (non-etype-info2) enctypes

Ticket: 1480
Tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15462 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index a0942a46c..4cfa1f5f7 100644
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,5 +1,8 @@
 2003-05-20  Sam Hartman  <hartmans@mit.edu>
 
+	* get_in_tkt.c: get_in_tkt only supports old (non-etype-info2)
+	enctypes. 
+
 	* Makefile.in (SRCS): Remove in_ktb.c
 
 	* gic_keytab.c (krb5_get_in_tkt_with_keytab): Move from
diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c
index 3ccb6066f..ec6c9bb20 100644
--- a/src/lib/krb5/krb/get_in_tkt.c
+++ b/src/lib/krb5/krb/get_in_tkt.c
@@ -409,6 +409,15 @@ make_preauth_list(krb5_context	context,
 }
 
 #define MAX_IN_TKT_LOOPS 16
+static krb5_enctype get_in_tkt_enctypes[] = {
+    ENCTYPE_DES3_CBC_SHA1,
+    ENCTYPE_ARCFOUR_HMAC,
+    ENCTYPE_DES_CBC_MD5,
+    ENCTYPE_DES_CBC_MD4,
+    ENCTYPE_DES_CBC_CRC,
+    0
+};
+
 
 krb5_error_code KRB5_CALLCONV
 krb5_get_in_tkt(krb5_context context,
@@ -460,8 +469,13 @@ krb5_get_in_tkt(krb5_context context,
     request.from = creds->times.starttime;
     request.till = creds->times.endtime;
     request.rtime = creds->times.renew_till;
-    if ((retval = krb5_get_default_in_tkt_ktypes(context, &request.ktype)))
+
+    request.ktype = malloc (sizeof(get_in_tkt_enctypes));
+    if (request.ktype == NULL) {
+	retval = ENOMEM;
 	goto cleanup;
+    }
+    memcpy(request.ktype, get_in_tkt_enctypes, sizeof(get_in_tkt_enctypes));
     for (request.nktypes = 0;request.ktype[request.nktypes];request.nktypes++);
     if (ktypes) {
 	int i, req, next = 0;