diff options
| author | Greg Hudson <ghudson@mit.edu> | 2010-07-02 17:33:44 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2010-07-02 17:33:44 +0000 |
| commit | 6dc8b18192b302b3208d13d8bda9cc3380d5fbec (patch) | |
| tree | 6616cfaad37f22cab4baebb82904fe234cc11ec9 /src/kdc/kdc_preauth.c | |
| parent | beeab09509ed1e46e1fbe4358c6388caf0dcdc61 (diff) | |
Rename krb5_dbekd_encrypt_key_data and krb5_dbekd_decrypt_key_data to
just use the krb5_dbe prefix.
ticket: 6749
status: open
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24164 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kdc/kdc_preauth.c')
| -rw-r--r-- | src/kdc/kdc_preauth.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/kdc/kdc_preauth.c b/src/kdc/kdc_preauth.c index 00800aab0..d754edcf4 100644 --- a/src/kdc/kdc_preauth.c +++ b/src/kdc/kdc_preauth.c @@ -773,8 +773,8 @@ get_entry_data(krb5_context context, if (krb5_dbe_find_enctype(context, entry, request->ktype[i], -1, 0, &entry_key) != 0) continue; - if (krb5_dbekd_decrypt_key_data(context, mkey_ptr, - entry_key, &keys[k], NULL) != 0) { + if (krb5_dbe_decrypt_key_data(context, mkey_ptr, entry_key, + &keys[k], NULL) != 0) { if (keys[k].contents != NULL) krb5_free_keyblock_contents(context, &keys[k]); memset(&keys[k], 0, sizeof(keys[k])); @@ -1474,8 +1474,8 @@ verify_enc_timestamp(krb5_context context, krb5_db_entry *client, -1, 0, &client_key))) goto cleanup; - if ((retval = krb5_dbekd_decrypt_key_data(context, mkey_ptr, - client_key, &key, NULL))) + if ((retval = krb5_dbe_decrypt_key_data(context, mkey_ptr, client_key, + &key, NULL))) goto cleanup; key.enctype = enc_data->enctype; @@ -2156,10 +2156,9 @@ get_sam_edata(krb5_context context, krb5_kdc_req *request, return retval; } /* convert server.key into a real key */ - retval = krb5_dbekd_decrypt_key_data(kdc_context, - mkey_ptr, - assoc_key, &encrypting_key, - NULL); + retval = krb5_dbe_decrypt_key_data(kdc_context, mkey_ptr, + assoc_key, &encrypting_key, + NULL); if (retval) { kdc_err(kdc_context, retval, "snk4 pulling out key entry"); @@ -2819,8 +2818,8 @@ static krb5_error_code verify_pkinit_request( * Unfortunately this key is stored encrypted even though it's * not sensitive... */ - krtn = krb5_dbekd_decrypt_key_data(context, mkey_ptr, - key_data, &decrypted_key, NULL); + krtn = krb5_dbe_decrypt_key_data(context, mkey_ptr, key_data, + &decrypted_key, NULL); if(krtn) { kdcPkinitDebug("verify_pkinit_request: error decrypting cert hash block\n"); break; |