From 6dc8b18192b302b3208d13d8bda9cc3380d5fbec Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Fri, 2 Jul 2010 17:33:44 +0000 Subject: 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 --- src/lib/kadm5/srv/server_kdb.c | 4 +-- src/lib/kadm5/srv/svr_principal.c | 51 +++++++++++++++------------------------ 2 files changed, 22 insertions(+), 33 deletions(-) (limited to 'src/lib/kadm5') diff --git a/src/lib/kadm5/srv/server_kdb.c b/src/lib/kadm5/srv/server_kdb.c index 3c09f90..768c8f7 100644 --- a/src/lib/kadm5/srv/server_kdb.c +++ b/src/lib/kadm5/srv/server_kdb.c @@ -213,8 +213,8 @@ kdb_get_hist_key(kadm5_server_handle_t handle, krb5_keyblock *hist_keyblock, if (ret) goto done; - ret = krb5_dbekd_decrypt_key_data(handle->context, mkey, - &kdb.key_data[0], hist_keyblock, NULL); + ret = krb5_dbe_decrypt_key_data(handle->context, mkey, &kdb.key_data[0], + hist_keyblock, NULL); if (ret) goto done; diff --git a/src/lib/kadm5/srv/svr_principal.c b/src/lib/kadm5/srv/svr_principal.c index 469a8e8..451e4ff 100644 --- a/src/lib/kadm5/srv/svr_principal.c +++ b/src/lib/kadm5/srv/svr_principal.c @@ -977,18 +977,15 @@ check_pw_reuse(krb5_context context, krb5_error_code ret; for (x = 0; x < n_new_key_data; x++) { - ret = krb5_dbekd_decrypt_key_data(context, - mkey, - &(new_key_data[x]), - &newkey, NULL); + ret = krb5_dbe_decrypt_key_data(context, mkey, &(new_key_data[x]), + &newkey, NULL); if (ret) return(ret); for (y = 0; y < n_pw_hist_data; y++) { for (z = 0; z < pw_hist_data[y].n_key_data; z++) { - ret = krb5_dbekd_decrypt_key_data(context, - hist_keyblock, - &pw_hist_data[y].key_data[z], - &histkey, NULL); + ret = krb5_dbe_decrypt_key_data(context, hist_keyblock, + &pw_hist_data[y].key_data[z], + &histkey, NULL); if (ret) return(ret); @@ -1047,17 +1044,14 @@ int create_history_entry(krb5_context context, krb5_keyblock *mkey, memset(hist->key_data, 0, n_key_data*sizeof(krb5_key_data)); for (i = 0; i < n_key_data; i++) { - ret = krb5_dbekd_decrypt_key_data(context, - mkey, - &key_data[i], - &key, &salt); + ret = krb5_dbe_decrypt_key_data(context, mkey, &key_data[i], &key, + &salt); if (ret) return ret; - ret = krb5_dbekd_encrypt_key_data(context, hist_key, - &key, &salt, - key_data[i].key_data_kvno, - &hist->key_data[i]); + ret = krb5_dbe_encrypt_key_data(context, hist_key, &key, &salt, + key_data[i].key_data_kvno, + &hist->key_data[i]); if (ret) return ret; @@ -1731,9 +1725,8 @@ kadm5_setv4key_principal(void *server_handle, goto done; /* use tmp_key_data as temporary location and reallocate later */ - ret = krb5_dbekd_encrypt_key_data(handle->context, act_mkey, - keyblock, &keysalt, kvno + 1, - &tmp_key_data); + ret = krb5_dbe_encrypt_key_data(handle->context, act_mkey, keyblock, + &keysalt, kvno + 1, &tmp_key_data); if (ret) { goto done; } @@ -1935,12 +1928,10 @@ kadm5_setkey_principal_3(void *server_handle, if (ret) goto done; - ret = krb5_dbekd_encrypt_key_data(handle->context, - act_mkey, - &keyblocks[i], - n_ks_tuple ? &keysalt : NULL, - kvno + 1, - &tmp_key_data); + ret = krb5_dbe_encrypt_key_data(handle->context, act_mkey, + &keyblocks[i], + n_ks_tuple ? &keysalt : NULL, kvno + 1, + &tmp_key_data); if (ret) goto done; @@ -2120,9 +2111,8 @@ static int decrypt_key_data(krb5_context context, krb5_keyblock *mkey, memset(keys, 0, n_key_data*sizeof(krb5_keyblock)); for (i = 0; i < n_key_data; i++) { - ret = krb5_dbekd_decrypt_key_data(context, mkey, - &key_data[i], - &keys[i], NULL); + ret = krb5_dbe_decrypt_key_data(context, mkey, &key_data[i], &keys[i], + NULL); if (ret) { for (; i >= 0; i--) { if (keys[i].contents) { @@ -2218,9 +2208,8 @@ kadm5_ret_t kadm5_decrypt_key(void *server_handle, } } - if ((ret = krb5_dbekd_decrypt_key_data(handle->context, - mkey_ptr, key_data, - keyblock, keysalt))) + if ((ret = krb5_dbe_decrypt_key_data(handle->context, mkey_ptr, key_data, + keyblock, keysalt))) return ret; /* -- cgit v1.1