(_kdc_as_rep): log what enctypes was using in ENC-TS preauth, both for

failure and success.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15829 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-07-28 20:29:39 +00:00
parent 80e3a7bc53
commit 299df4981f

View File

@@ -873,6 +873,7 @@ _kdc_as_rep(krb5_context context,
size_t len; size_t len;
EncryptedData enc_data; EncryptedData enc_data;
Key *pa_key; Key *pa_key;
char *str;
found_pa = 1; found_pa = 1;
@@ -924,14 +925,23 @@ _kdc_as_rep(krb5_context context,
&ts_data); &ts_data);
krb5_crypto_destroy(context, crypto); krb5_crypto_destroy(context, crypto);
if(ret){ if(ret){
ret = krb5_enctype_to_string(context,
pa_key->key.keytype, &str);
if (ret)
str = NULL;
kdc_log(context, config, 5,
"Failed to decrypt PA-DATA -- %s "
"(enctype %s) error %d",
client_name, str ? str : "unknown enctype", ret);
free(str);
if(hdb_next_enctype2key(context, client, if(hdb_next_enctype2key(context, client,
enc_data.etype, &pa_key) == 0) enc_data.etype, &pa_key) == 0)
goto try_next_key; goto try_next_key;
free_EncryptedData(&enc_data);
e_text = "Failed to decrypt PA-DATA"; e_text = "Failed to decrypt PA-DATA";
kdc_log(context, config,
5, "Failed to decrypt PA-DATA -- %s", free_EncryptedData(&enc_data);
client_name);
ret = KRB5KRB_AP_ERR_BAD_INTEGRITY; ret = KRB5KRB_AP_ERR_BAD_INTEGRITY;
continue; continue;
} }
@@ -958,9 +968,15 @@ _kdc_as_rep(krb5_context context,
goto out; goto out;
} }
et.flags.pre_authent = 1; et.flags.pre_authent = 1;
ret = krb5_enctype_to_string(context,pa_key->key.keytype, &str);
if (ret)
str = NULL;
kdc_log(context, config, 2, kdc_log(context, config, 2,
"ENC-TS Pre-authentication succeeded -- %s", "ENC-TS Pre-authentication succeeded -- %s using %s",
client_name); client_name, str ? str : "unknown enctype");
free(str);
break; break;
} }
#ifdef PKINIT #ifdef PKINIT