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/plugins/kdb | |
| parent | beeab09509ed1e46e1fbe4358c6388caf0dcdc61 (diff) | |
| download | krb5-6dc8b18192b302b3208d13d8bda9cc3380d5fbec.tar.gz krb5-6dc8b18192b302b3208d13d8bda9cc3380d5fbec.tar.xz krb5-6dc8b18192b302b3208d13d8bda9cc3380d5fbec.zip | |
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/plugins/kdb')
| -rw-r--r-- | src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c index eb3dec74bd..cc918142c6 100644 --- a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c +++ b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c @@ -2322,12 +2322,8 @@ kdb_ldap_tgt_keysalt_iterate(krb5_key_salt_tuple *ksent, krb5_pointer ptr) if (!(kret = krb5_c_make_random_key(context, ksent->ks_enctype, &key))) { - kret = krb5_dbekd_encrypt_key_data(context, - iargs->rblock->key, - &key, - NULL, - 1, - &entry->key_data[ind]); + kret = krb5_dbe_encrypt_key_data(context, iargs->rblock->key, &key, + NULL, 1, &entry->key_data[ind]); krb5_free_keyblock_contents(context, &key); } /*}*/ @@ -2441,9 +2437,9 @@ kdb_ldap_create_principal(krb5_context context, krb5_principal princ, goto cleanup; } kvno = 1; /* New key is getting set */ - retval = krb5_dbekd_encrypt_key_data(context, master_keyblock, - &key, NULL, kvno, - &entry.key_data[entry.n_key_data - 1]); + retval = krb5_dbe_encrypt_key_data(context, master_keyblock, + &key, NULL, kvno, + &entry.key_data[entry.n_key_data - 1]); krb5_free_keyblock_contents(context, &key); if (retval) { goto cleanup; @@ -2477,9 +2473,9 @@ kdb_ldap_create_principal(krb5_context context, krb5_principal princ, memset(entry.key_data, 0, sizeof(krb5_key_data)); entry.n_key_data++; kvno = 1; /* New key is getting set */ - retval = krb5_dbekd_encrypt_key_data(context, pblock->key, - master_keyblock, NULL, kvno, - &entry.key_data[entry.n_key_data - 1]); + retval = krb5_dbe_encrypt_key_data(context, pblock->key, + master_keyblock, NULL, kvno, + &entry.key_data[entry.n_key_data - 1]); if (retval) { goto cleanup; } |