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/kadmin/dbutil/dump.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/kadmin/dbutil/dump.c')
| -rw-r--r-- | src/kadmin/dbutil/dump.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/kadmin/dbutil/dump.c b/src/kadmin/dbutil/dump.c index d0495e4cf..64c63afb1 100644 --- a/src/kadmin/dbutil/dump.c +++ b/src/kadmin/dbutil/dump.c @@ -302,9 +302,8 @@ krb5_error_code master_key_convert(context, db_entry) retval = krb5_dbe_find_mkey(context, master_keylist, db_entry, &tmp_mkey); if (retval) return retval; - retval = krb5_dbekd_decrypt_key_data(context, tmp_mkey, - key_data, &v5plainkey, - &keysalt); + retval = krb5_dbe_decrypt_key_data(context, tmp_mkey, key_data, + &v5plainkey, &keysalt); if (retval) return retval; @@ -313,10 +312,9 @@ krb5_error_code master_key_convert(context, db_entry) key_ptr = &v5plainkey; kvno = (krb5_kvno) key_data->key_data_kvno; - retval = krb5_dbekd_encrypt_key_data(context, &new_master_keyblock, - key_ptr, &keysalt, - (int) kvno, - &new_key_data); + retval = krb5_dbe_encrypt_key_data(context, &new_master_keyblock, + key_ptr, &keysalt, (int) kvno, + &new_key_data); if (retval) return retval; krb5_free_keyblock_contents(context, &v5plainkey); |