Rename krb5_free_keyblock to krb5_free_keyblock_contents.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3917 ec53bebd-3082-4978-b11e-865c3cabbd6b

diff --git a/admin/extkeytab.c b/admin/extkeytab.c
index c14b7a3e7ddce797a0f6a585c0a1ca1b3f842df1..bb2cd7c2987a26e761de8dee351f3bc6c75797a5 100644 (file)
--- a/admin/extkeytab.c
+++ b/admin/extkeytab.c
@@ -108,7 +108,7 @@ ext_keytab(int argc, char **argv)
        
        if (ret) {
            krb5_free_principal (context, key_entry.principal);
-           krb5_free_keyblock (context, &key_entry.keyblock);
+           krb5_free_keyblock_contents (context, &key_entry.keyblock);
            krb5_warn(context, ret, "krb5_kt_add_entry");
            break;
        }

diff --git a/appl/telnet/libtelnet/kerberos5.c b/appl/telnet/libtelnet/kerberos5.c
index 5ac213c41e13643da3ea154c3debdea1a01eadcb..2d3c3daae28f4f6d047a92e01988c55f248991e0 100644 (file)
--- a/appl/telnet/libtelnet/kerberos5.c
+++ b/appl/telnet/libtelnet/kerberos5.c
@@ -436,7 +436,7 @@ kerberos5_is(Authenticator *ap, unsigned char *data, int cnt)
        }
        auth_finished(ap, AUTH_USER);
 
-       krb5_free_keyblock(context, key_block);
+       krb5_free_keyblock_contents(context, key_block);
        
        break;
 #ifdef FORWARD
@@ -557,7 +557,7 @@ kerberos5_reply(Authenticator *ap, unsigned char *data, int cnt)
        skey.length = 8;
        skey.data = keyblock->keyvalue.data;
        encrypt_session_key(&skey, 0);
-       krb5_free_keyblock (context, keyblock);
+       krb5_free_keyblock_contents (context, keyblock);
        auth_finished(ap, AUTH_USER);
 #ifdef FORWARD
        if (forward_flags & OPTS_FORWARD_CREDS)

diff --git a/kadmin/cpw.c b/kadmin/cpw.c
index 3c1be576f52cf4d8a831b4439e196db1ae38e2db..4eda0b8cf7e9b06ef7a2d8e17d5aaaf3de64eb4b 100644 (file)
--- a/kadmin/cpw.c
+++ b/kadmin/cpw.c
@@ -105,7 +105,7 @@ cpw_entry(int argc, char **argv)
                krb5_warn(context, ret, "%s", argv[i]);
            else{
                for(i = 0; i < num_keys; i++)
-                   krb5_free_keyblock(context, &keys[i]);
+                   krb5_free_keyblock_contents(context, &keys[i]);
                free(keys);
            }
        }

diff --git a/kadmin/server.c b/kadmin/server.c
index 2f033e8e599670d85a8900f2a0300a6b123cf548..7212df5ff9b438287193d7f4d2ad3e7db6557b86 100644 (file)
--- a/kadmin/server.c
+++ b/kadmin/server.c
@@ -238,7 +238,7 @@ kadmind_dispatch(void *kadm_handle, krb5_storage *sp)
            krb5_store_int32(sp, n_keys);
            for(i = 0; i < n_keys; i++){
                krb5_store_keyblock(sp, new_keys[i]);
-               krb5_free_keyblock(context->context, &new_keys[i]);
+               krb5_free_keyblock_contents(context->context, &new_keys[i]);
            }
        }
        break;

diff --git a/kpasswd/kpasswdd.c b/kpasswd/kpasswdd.c
index 56eef311a966f6c07937f1199f8aacf22755b73b..989e8d0d42660ce11ba5b0331af7d0f7a9340c65 100644 (file)
--- a/kpasswd/kpasswdd.c
+++ b/kpasswd/kpasswdd.c
@@ -339,7 +339,7 @@ change (krb5_auth_context auth_context,
        ret = db->store (context, db, 1, &ent);
     }
     krb5_data_free (&salt);
-    krb5_free_keyblock (context, &new_keyblock);
+    krb5_free_keyblock_contents (context, &new_keyblock);
 
     if (ret) {
        krb5_log (context, log_facility, KPASSWDD_LOG_ERR,

diff --git a/lib/kadm5/randkey_s.c b/lib/kadm5/randkey_s.c
index 66ed7dce81ddea5af3a280d12d0ef59d1a12857e..914d2fa2a87405ed477ba3bd53f1a0a8be4073aa 100644 (file)
--- a/lib/kadm5/randkey_s.c
+++ b/lib/kadm5/randkey_s.c
@@ -68,7 +68,7 @@ kadm5_s_randkey_principal(void *server_handle,
                free_Salt(key->salt);
                key->salt = NULL;
            }
-           krb5_free_keyblock(context->context, &key->key);
+           krb5_free_keyblock_contents(context->context, &key->key);
            ret = krb5_generate_random_keyblock(context->context,
                                                key->key.keytype,
                                                &key->key);
@@ -97,7 +97,7 @@ out:
     if(ret){
        int i;
        for(i = 0; i < *n_keys; i++)
-           krb5_free_keyblock(context->context, &(*new_keys)[i]);
+           krb5_free_keyblock_contents(context->context, &(*new_keys)[i]);
        free(*new_keys);
        *n_keys = 0;
     }

diff --git a/lib/kadm5/server.c b/lib/kadm5/server.c
index 2f033e8e599670d85a8900f2a0300a6b123cf548..7212df5ff9b438287193d7f4d2ad3e7db6557b86 100644 (file)
--- a/lib/kadm5/server.c
+++ b/lib/kadm5/server.c
@@ -238,7 +238,7 @@ kadmind_dispatch(void *kadm_handle, krb5_storage *sp)
            krb5_store_int32(sp, n_keys);
            for(i = 0; i < n_keys; i++){
                krb5_store_keyblock(sp, new_keys[i]);
-               krb5_free_keyblock(context->context, &new_keys[i]);
+               krb5_free_keyblock_contents(context->context, &new_keys[i]);
            }
        }
        break;

diff --git a/lib/kadm5/set_keys.c b/lib/kadm5/set_keys.c
index 2d58bf60c6a117fd851b70033e80a3480218a55e..87dcdd6d37d23264fc4553c44606692c6c4fd3dc 100644 (file)
--- a/lib/kadm5/set_keys.c
+++ b/lib/kadm5/set_keys.c
@@ -57,7 +57,7 @@ _kadm5_set_keys(kadm5_server_context *context,
            free_Salt(key->salt);
            key->salt = NULL;
        }
-       krb5_free_keyblock(context->context, &key->key);
+       krb5_free_keyblock_contents(context->context, &key->key);
        ret = krb5_string_to_key(password, 
                                 key->salt ? &key->salt->salt : &salt,
                                 key->key.keytype,

diff --git a/lib/krb5/creds.c b/lib/krb5/creds.c
index b75329c9005fe3dc61a47c1e8e2d3ed31587f682..ab33fc3607749c466e54a5730ed308e0cbfbff0b 100644 (file)
--- a/lib/krb5/creds.c
+++ b/lib/krb5/creds.c
@@ -47,7 +47,7 @@ krb5_free_creds_contents (krb5_context context, krb5_creds *c)
     c->client = NULL;
     krb5_free_principal (context, c->server);
     c->server = NULL;
-    krb5_free_keyblock (context, &c->session);
+    krb5_free_keyblock_contents (context, &c->session);
     krb5_data_free (&c->ticket);
     krb5_data_free (&c->second_ticket);
     krb5_data_free (&c->authdata);

diff --git a/lib/krb5/generate_seq_number.c b/lib/krb5/generate_seq_number.c
index fe160e72b13c4d49dd907d20f91e6ea509f78a19..89dce20f6bd38fabd4a5663ae5e438b455c8a4d6 100644 (file)
--- a/lib/krb5/generate_seq_number.c
+++ b/lib/krb5/generate_seq_number.c
@@ -62,6 +62,6 @@ krb5_generate_seq_number(krb5_context context,
        q = (q << 8) | *p;
     q &= 0xffffffff;
     *seqno = q;
-    krb5_free_keyblock (context, subkey);
+    krb5_free_keyblock_contents (context, subkey);
     return 0;
 }

diff --git a/lib/krb5/get_cred.c b/lib/krb5/get_cred.c
index ac0d9987ea792c3f562d431c7495e35b077d90a4..24455d8cb6645827ae3695d870d1fb6ebe16fbb3 100644 (file)
--- a/lib/krb5/get_cred.c
+++ b/lib/krb5/get_cred.c
@@ -357,7 +357,7 @@ get_cred_kdc(krb5_context context, krb5_ccache id, krb5_kdc_flags flags,
     krb5_data_free(&resp);
 out:
     if(subkey){
-       krb5_free_keyblock(context, subkey);
+       krb5_free_keyblock_contents(context, subkey);
        free(subkey);
     }
     return ret;

diff --git a/lib/krb5/get_in_tkt.c b/lib/krb5/get_in_tkt.c
index 61333ff326127d86ef8f3959a00a0bc1a28ccd35..88c1d4d2ac1c6faf17df9da0670e2eb1215a2a43 100644 (file)
--- a/lib/krb5/get_in_tkt.c
+++ b/lib/krb5/get_in_tkt.c
@@ -455,7 +455,7 @@ init_as_req (krb5_context context,
        if (ret)
            goto fail;
        ret = make_pa_enc_timestamp(context, &a->padata->val[0], etype, key);
-       krb5_free_keyblock (context, key);
+       krb5_free_keyblock_contents (context, key);
        free (key);
        if (ret)
            goto fail;
@@ -472,7 +472,7 @@ init_as_req (krb5_context context,
        if (ret)
            goto fail;
        ret = make_pa_enc_timestamp(context, &a->padata->val[1], etype, key);
-       krb5_free_keyblock (context, key);
+       krb5_free_keyblock_contents (context, key);
        free (key);
        if (ret)
            goto fail;
@@ -593,7 +593,7 @@ krb5_get_in_cred(krb5_context context,
     ret = _krb5_extract_ticket(context, &rep, creds, key, keyseed, 
                              NULL, nonce, FALSE, decrypt_proc, decryptarg);
     memset (key->keyvalue.data, 0, key->keyvalue.length);
-    krb5_free_keyblock (context, key);
+    krb5_free_keyblock_contents (context, key);
     free (key);
 
     if (ret == 0 && ret_as_reply)

diff --git a/lib/krb5/keytab.c b/lib/krb5/keytab.c
index 825fc60d00474e949233ca671e0067842b71e14f..db135e76c538a290bde760c4b18deb4554e043c1 100644 (file)
--- a/lib/krb5/keytab.c
+++ b/lib/krb5/keytab.c
@@ -176,7 +176,7 @@ krb5_kt_free_entry(krb5_context context,
                   krb5_keytab_entry *entry)
 {
   krb5_free_principal (context, entry->principal);
-  krb5_free_keyblock (context, &entry->keyblock);
+  krb5_free_keyblock_contents (context, &entry->keyblock);
   return 0;
 }