aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Hartman <hartmans@mit.edu>2009-11-24 00:53:36 +0000
committerSam Hartman <hartmans@mit.edu>2009-11-24 00:53:36 +0000
commit117873bc61d5dcda8f060845cfa19ea5f4409016 (patch)
tree46389f6bfe2123fb53d23bbb8f384954f385a29a
parent78f50ed2f33cb2a894b33c928bb77f8ed530aa57 (diff)
downloadkrb5-117873bc61d5dcda8f060845cfa19ea5f4409016.zip
krb5-117873bc61d5dcda8f060845cfa19ea5f4409016.tar.gz
krb5-117873bc61d5dcda8f060845cfa19ea5f4409016.tar.bz2
KDC MUST NOT accept ap-request armor in FAST TGS
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 target_version: 1.7.1 tags: pullup git-svn-id: svn://anonsvn.mit.edu/krb5/users/hartmans/fast-negotiate@23324 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r--src/kdc/fast_util.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/kdc/fast_util.c b/src/kdc/fast_util.c
index 17b8447..310faf0 100644
--- a/src/kdc/fast_util.c
+++ b/src/kdc/fast_util.c
@@ -148,6 +148,11 @@ kdc_find_fast(krb5_kdc_req **requestptr,
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");
+ return KRB5KDC_ERR_PREAUTH_FAILED;
+ }
retval = armor_ap_request(state, fast_armored_req->armor);
break;
default: