From: Tom Yu <tlyu@mit.edu>
Date: Tue, 12 Jan 2010 04:15:30 +0000 (+0000)
Subject: pull up r23325, 23384 from trunk
X-Git-Tag: krb5-1.7.1-beta1~11
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d683ddfe24ee02a4d748b509d21142acced0fc8d;p=krb5.git

pull up r23325, 23384 from trunk

 ------------------------------------------------------------------------
 r23384 | hartmans | 2009-11-30 09:14:47 -0500 (Mon, 30 Nov 2009) | 4 lines

 ticket: 6585

 Fix memory leak

 ------------------------------------------------------------------------
 r23325 | hartmans | 2009-11-23 20:05:30 -0500 (Mon, 23 Nov 2009) | 12 lines

 ticket: 6585
 subject: KDC MUST NOT accept ap-request armor in FAST TGS
 target_version: 1.7.1
 tags: pullup

 Per the latest preauth framework spec, the working group has decided
 to forbid ap-request armor in the TGS request because of security
 problems with that armor type.

 This commit was tested against an implementation of FAST TGS client to
 confirm that if explicit armor is sent, the request is rejected.

ticket: 6585
version_fixed: 1.7.1
status: resolved

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-7@23643 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/kdc/fast_util.c b/src/kdc/fast_util.c
index f02410b96..d88e0cb21 100644
--- a/src/kdc/fast_util.c
+++ b/src/kdc/fast_util.c
@@ -147,6 +147,12 @@ krb5_error_code  kdc_find_fast
     if (retval == 0 &&fast_armored_req->armor) {
 	switch (fast_armored_req->armor->armor_type) {
 	case KRB5_FAST_ARMOR_AP_REQUEST:
+	    if (tgs_subkey) {
+		krb5_set_error_message( kdc_context, KRB5KDC_ERR_PREAUTH_FAILED,
+					"Ap-request armor not permitted with TGS");
+		retval = KRB5KDC_ERR_PREAUTH_FAILED;
+		break;
+	    }
 	    retval = armor_ap_request(state, fast_armored_req->armor);
 	    break;
 	default: