From: Ken Raeburn <raeburn@mit.edu>
Date: Sat, 17 Jan 2009 00:04:49 +0000 (+0000)
Subject: patch from Luke - fix enctype-nego enctype list setup
X-Git-Tag: krb5-1.7-alpha1~64
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9b33dd982c6f0ff9085159e8bc708020fc4fb617;p=krb5.git

patch from Luke - fix enctype-nego enctype list setup

ticket: 6336

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

diff --git a/src/lib/krb5/krb/mk_req_ext.c b/src/lib/krb5/krb/mk_req_ext.c
index 4a9d03551..0d24017ee 100644
--- a/src/lib/krb5/krb/mk_req_ext.c
+++ b/src/lib/krb5/krb/mk_req_ext.c
@@ -343,23 +343,15 @@ make_etype_list(krb5_context context,
     for (etypes.length = 0;
 	 etypes.etypes[etypes.length] != ENCTYPE_NULL;
 	 etypes.length++)
-	;
-
-    /*
-     * RFC 4537:
-     *
-     *   If the enctype of the ticket session key is included in the enctype
-     *   list sent by the client, it SHOULD be the last on the list;
-     */
-    for (i = 0; i < etypes.length; i++) {
-	if (etypes.etypes[i] == tkt_enctype) {
-	    krb5_enctype etype;
-
-	    etype = etypes.etypes[etypes.length - 1];
-	    etypes.etypes[etypes.length - 1] = tkt_enctype;
-	    etypes.etypes[i] = etype;
+    {
+	/*
+	 * RFC 4537:
+	 *
+	 *   If the enctype of the ticket session key is included in the enctype
+	 *   list sent by the client, it SHOULD be the last on the list;
+	 */
+	if (etypes.length && etypes.etypes[etypes.length - 1] == tkt_enctype)
 	    break;
-	}
     }
 
     code = encode_krb5_etype_list(&etypes, &enc_etype_list);