pull up r22083 from trunk

 ------------------------------------------------------------------------
 r22083 | ghudson | 2009-03-12 23:10:12 -0400 (Thu, 12 Mar 2009) | 9 lines
 Changed paths:
    M /trunk/src/lib/krb5/krb/get_in_tkt.c

 ticket: 6415
 subject: Use correct salt for canonicalized principals
 target_version: 1.7
 tags: pullup

 In cases where the salt is derived from the client principal, use the
 canonicalized principal received from the KDC to determine the salt.
 Further changes are probably required for some preauth cases.

ticket: 6415
version_fixed: 1.7

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

diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c
index c14c26857bb0d698cd6d067789575c6198b13ee5..96235d13407fd3efa71a5d6f79b49f01b441f017 100644 (file)
--- a/src/lib/krb5/krb/get_in_tkt.c
+++ b/src/lib/krb5/krb/get_in_tkt.c
@@ -254,7 +254,13 @@ decrypt_as_reply(krb5_context              context,
     if (key)
            decrypt_key = key;
     else {
-       if ((retval = krb5_principal2salt(context, request->client, &salt)))
+       /*
+        * Use salt corresponding to the client principal supplied by
+        * the KDC, which may differ from the requested principal if
+        * canonicalization is in effect.  We will check
+        * as_reply->client later in verify_as_reply.
+        */
+       if ((retval = krb5_principal2salt(context, as_reply->client, &salt)))
            return(retval);
     
        retval = (*key_proc)(context, as_reply->enc_part.enctype,
@@ -1385,6 +1391,22 @@ krb5_get_init_creds(krb5_context context,
        goto cleanup;
        }
 
+    /*
+     * If we haven't gotten a salt from another source yet, set up one
+     * corresponding to the client principal returned by the KDC.  We
+     * could get the same effect by passing local_as_reply->client to
+     * gak_fct below, but that would put the canonicalized client name
+     * in the prompt, which raises issues of needing to sanitize
+     * unprintable characters.  So for now we just let it affect the
+     * salt.  local_as_reply->client will be checked later on in
+     * verify_as_reply.
+     */
+    if (salt.length == SALT_TYPE_AFS_LENGTH && salt.data == NULL) {
+       ret = krb5_principal2salt(context, local_as_reply->client, &salt);
+       if (ret)
+           goto cleanup;
+    }
+
     /* XXX For 1.1.1 and prior KDC's, when SAM is used w/ USE_SAD_AS_KEY,
        the AS_REP comes back encrypted in the user's longterm key
        instead of in the SAD. If there was a SAM preauth, there