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

4 files changed, 20 insertions, 23 deletions

diff --git a/src/kdc/do_as_req.c b/src/kdc/do_as_req.c
index 9ceac84aa..18ce37f27 100644
--- a/src/kdc/do_as_req.c
+++ b/src/kdc/do_as_req.c
@@ -489,9 +489,9 @@ process_as_req(krb5_kdc_req *request, krb5_data *req_pkt,
      *
      *  server_keyblock is later used to generate auth data signatures
      */
-    if ((errcode = krb5_dbekd_decrypt_key_data(kdc_context, mkey_ptr,
-                                               server_key, &server_keyblock,
-                                               NULL))) {
+    if ((errcode = krb5_dbe_decrypt_key_data(kdc_context, mkey_ptr,
+                                             server_key, &server_keyblock,
+                                             NULL))) {
         status = "DECRYPT_SERVER_KEY";
         goto errout;
     }
@@ -537,9 +537,9 @@ process_as_req(krb5_kdc_req *request, krb5_data *req_pkt,
     }
 
     /* convert client.key_data into a real key */
-    if ((errcode = krb5_dbekd_decrypt_key_data(kdc_context, mkey_ptr,
-                                               client_key, &client_keyblock,
-                                               NULL))) {
+    if ((errcode = krb5_dbe_decrypt_key_data(kdc_context, mkey_ptr,
+                                             client_key, &client_keyblock,
+                                             NULL))) {
         status = "DECRYPT_CLIENT_KEY";
         goto errout;
     }
diff --git a/src/kdc/do_tgs_req.c b/src/kdc/do_tgs_req.c
index f1ae84b97..827f65cb3 100644
--- a/src/kdc/do_tgs_req.c
+++ b/src/kdc/do_tgs_req.c
@@ -675,10 +675,9 @@ tgt_again:
          * Convert server.key into a real key
          * (it may be encrypted in the database)
          */
-        if ((errcode = krb5_dbekd_decrypt_key_data(kdc_context,
-                                                   mkey_ptr,
-                                                   server_key, &encrypting_key,
-                                                   NULL))) {
+        if ((errcode = krb5_dbe_decrypt_key_data(kdc_context, mkey_ptr,
+                                                 server_key, &encrypting_key,
+                                                 NULL))) {
             status = "DECRYPT_SERVER_KEY";
             goto cleanup;
         }
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;
diff --git a/src/kdc/kdc_util.c b/src/kdc/kdc_util.c
index 6fa2d73a2..16c06296a 100644
--- a/src/kdc/kdc_util.c
+++ b/src/kdc/kdc_util.c
@@ -512,9 +512,8 @@ kdc_get_server_key(krb5_ticket *ticket, unsigned int flags,
         goto errout;
     }
     if ((*key = (krb5_keyblock *)malloc(sizeof **key))) {
-        retval = krb5_dbekd_decrypt_key_data(kdc_context, mkey_ptr,
-                                             server_key,
-                                             *key, NULL);
+        retval = krb5_dbe_decrypt_key_data(kdc_context, mkey_ptr, server_key,
+                                           *key, NULL);
     } else
         retval = ENOMEM;
     retval = krb5_c_enctype_compare(kdc_context, ticket->enc_part.enctype,