Modernize k5buf

Rename the krb5int_buf_ family of functions to use the k5_ prefix for
brevity.  Reformat some k5buf implementation code to match current
practices.

18 files changed, 180 insertions, 185 deletions

diff --git a/src/lib/crypto/crypto_tests/t_hmac.c b/src/lib/crypto/crypto_tests/t_hmac.c
index 02168e5c7..cd79dc3ee 100644
--- a/src/lib/crypto/crypto_tests/t_hmac.c
+++ b/src/lib/crypto/crypto_tests/t_hmac.c
@@ -247,11 +247,11 @@ static void test_hmac()
             exit(1);
         }
 
-        krb5int_buf_init_fixed(&buf, stroutbuf, sizeof(stroutbuf));
-        krb5int_buf_add(&buf, "0x");
+        k5_buf_init_fixed(&buf, stroutbuf, sizeof(stroutbuf));
+        k5_buf_add(&buf, "0x");
         for (j = 0; j < out.length; j++)
-            krb5int_buf_add_fmt(&buf, "%02x", 0xff & outbuf[j]);
-        if (krb5int_buf_data(&buf) == NULL)
+            k5_buf_add_fmt(&buf, "%02x", 0xff & outbuf[j]);
+        if (k5_buf_data(&buf) == NULL)
             abort();
         if (strcmp(stroutbuf, md5tests[i].hexdigest)) {
             printf("*** CHECK FAILED!\n"
diff --git a/src/lib/crypto/krb/cf2.c b/src/lib/crypto/krb/cf2.c
index 1d0a01b64..e6d990cef 100644
--- a/src/lib/crypto/krb/cf2.c
+++ b/src/lib/crypto/krb/cf2.c
@@ -46,9 +46,9 @@ prf_plus(krb5_context context, krb5_keyblock *k, const char *pepper,
     char *buffer = NULL;
     struct k5buf prf_inbuf;
 
-    krb5int_buf_init_dynamic(&prf_inbuf);
-    krb5int_buf_add_len(&prf_inbuf, "\001", 1);
-    krb5int_buf_add(&prf_inbuf, pepper);
+    k5_buf_init_dynamic(&prf_inbuf);
+    k5_buf_add_len(&prf_inbuf, "\001", 1);
+    k5_buf_add(&prf_inbuf, pepper);
     retval = krb5_c_prf_length( context, k->enctype, &prflen);
     if (retval)
         goto cleanup;
@@ -59,12 +59,12 @@ prf_plus(krb5_context context, krb5_keyblock *k, const char *pepper,
     buffer = k5alloc(iterations * prflen, &retval);
     if (retval)
         goto cleanup;
-    if (krb5int_buf_len(&prf_inbuf) == -1) {
+    if (k5_buf_len(&prf_inbuf) == -1) {
         retval = ENOMEM;
         goto cleanup;
     }
-    in_data.length = (krb5_int32) krb5int_buf_len(&prf_inbuf);
-    in_data.data = krb5int_buf_data(&prf_inbuf);
+    in_data.length = (krb5_int32)k5_buf_len(&prf_inbuf);
+    in_data.data = k5_buf_data(&prf_inbuf);
     out_data.length = prflen;
     out_data.data = buffer;
 
@@ -82,7 +82,7 @@ prf_plus(krb5_context context, krb5_keyblock *k, const char *pepper,
 
 cleanup:
     free(buffer);
-    krb5int_free_buf(&prf_inbuf);
+    k5_free_buf(&prf_inbuf);
     return retval;
 }
 
diff --git a/src/lib/gssapi/generic/gssapiP_generic.h b/src/lib/gssapi/generic/gssapiP_generic.h
index 63b7bf4da..ebc9096b6 100644
--- a/src/lib/gssapi/generic/gssapiP_generic.h
+++ b/src/lib/gssapi/generic/gssapiP_generic.h
@@ -276,8 +276,8 @@ k5buf_to_gss(OM_uint32 *minor,
              gss_buffer_t output_buffer)
 {
     OM_uint32 status = GSS_S_COMPLETE;
-    char *bp = krb5int_buf_data(input_k5buf);
-    output_buffer->length = krb5int_buf_len(input_k5buf);
+    char *bp = k5_buf_data(input_k5buf);
+    output_buffer->length = k5_buf_len(input_k5buf);
 #if defined(_WIN32) || defined(DEBUG_GSSALLOC)
     if (output_buffer->length > 0) {
         output_buffer->value = gssalloc_malloc(output_buffer->length);
@@ -290,7 +290,7 @@ k5buf_to_gss(OM_uint32 *minor,
     } else {
         output_buffer->value = NULL;
     }
-    krb5int_free_buf(input_k5buf);
+    k5_free_buf(input_k5buf);
 #else
     output_buffer->value = bp;
     /*
diff --git a/src/lib/gssapi/generic/oid_ops.c b/src/lib/gssapi/generic/oid_ops.c
index a03b6f8da..1229f3842 100644
--- a/src/lib/gssapi/generic/oid_ops.c
+++ b/src/lib/gssapi/generic/oid_ops.c
@@ -257,8 +257,8 @@ generic_gss_oid_to_str(OM_uint32 *minor_status,
 
     cp = (unsigned char *) oid->elements;
     number = (unsigned long) cp[0];
-    krb5int_buf_init_dynamic(&buf);
-    krb5int_buf_add(&buf, "{ ");
+    k5_buf_init_dynamic(&buf);
+    k5_buf_add(&buf, "{ ");
     number = 0;
     cp = (unsigned char *) oid->elements;
     first = 1;
@@ -267,16 +267,16 @@ generic_gss_oid_to_str(OM_uint32 *minor_status,
         if ((cp[i] & 0x80) == 0) {
             if (first) {
                 n = (number < 40) ? 0 : (number < 80) ? 1 : 2;
-                krb5int_buf_add_fmt(&buf, "%lu %lu ", n, number - (n * 40));
+                k5_buf_add_fmt(&buf, "%lu %lu ", n, number - (n * 40));
                 first = 0;
             } else {
-                krb5int_buf_add_fmt(&buf, "%lu ", number);
+                k5_buf_add_fmt(&buf, "%lu ", number);
             }
             number = 0;
         }
     }
-    krb5int_buf_add_len(&buf, "}\0", 2);
-    if (krb5int_buf_data(&buf) == NULL) {
+    k5_buf_add_len(&buf, "}\0", 2);
+    if (k5_buf_data(&buf) == NULL) {
         *minor_status = ENOMEM;
         return(GSS_S_FAILURE);
     }
diff --git a/src/lib/gssapi/mechglue/g_export_cred.c b/src/lib/gssapi/mechglue/g_export_cred.c
index de2e98d66..16d1ebef4 100644
--- a/src/lib/gssapi/mechglue/g_export_cred.c
+++ b/src/lib/gssapi/mechglue/g_export_cred.c
@@ -73,7 +73,7 @@ gss_export_cred(OM_uint32 * minor_status, gss_cred_id_t cred_handle,
     if (status != GSS_S_COMPLETE)
         return status;
 
-    krb5int_buf_init_dynamic(&buf);
+    k5_buf_init_dynamic(&buf);
 
     cred = (gss_union_cred_t) cred_handle;
     for (i = 0; i < cred->count; i++) {
@@ -98,21 +98,21 @@ gss_export_cred(OM_uint32 * minor_status, gss_cred_id_t cred_handle,
 
         /* Append the mech OID and token to buf. */
         store_32_be(public_oid->length, lenbuf);
-        krb5int_buf_add_len(&buf, lenbuf, 4);
-        krb5int_buf_add_len(&buf, public_oid->elements, public_oid->length);
+        k5_buf_add_len(&buf, lenbuf, 4);
+        k5_buf_add_len(&buf, public_oid->elements, public_oid->length);
         store_32_be(mech_token.length, lenbuf);
-        krb5int_buf_add_len(&buf, lenbuf, 4);
-        krb5int_buf_add_len(&buf, mech_token.value, mech_token.length);
+        k5_buf_add_len(&buf, lenbuf, 4);
+        k5_buf_add_len(&buf, mech_token.value, mech_token.length);
         gss_release_buffer(&tmpmin, &mech_token);
     }
 
-    if (krb5int_buf_data(&buf) == NULL) {
+    if (k5_buf_data(&buf) == NULL) {
         *minor_status = ENOMEM;
         return GSS_S_FAILURE;
     }
     return k5buf_to_gss(minor_status, &buf, token);
 
 error:
-    krb5int_free_buf(&buf);
+    k5_free_buf(&buf);
     return status;
 }
diff --git a/src/lib/kadm5/alt_prof.c b/src/lib/kadm5/alt_prof.c
index 07158fcd5..bd1b8c82a 100644
--- a/src/lib/kadm5/alt_prof.c
+++ b/src/lib/kadm5/alt_prof.c
@@ -75,16 +75,16 @@ krb5_aprof_init(char *fname, char *envname, krb5_pointer *acontextp)
         return ret;
     if (envname == NULL || (kdc_config = getenv(envname)) == NULL)
         kdc_config = fname;
-    krb5int_buf_init_dynamic(&buf);
+    k5_buf_init_dynamic(&buf);
     if (kdc_config)
-        krb5int_buf_add(&buf, kdc_config);
+        k5_buf_add(&buf, kdc_config);
     for (i = 0; filenames[i] != NULL; i++) {
-        if (krb5int_buf_len(&buf) > 0)
-            krb5int_buf_add(&buf, ":");
-        krb5int_buf_add(&buf, filenames[i]);
+        if (k5_buf_len(&buf) > 0)
+            k5_buf_add(&buf, ":");
+        k5_buf_add(&buf, filenames[i]);
     }
     krb5_free_config_files(filenames);
-    profile_path = krb5int_buf_data(&buf);
+    profile_path = k5_buf_data(&buf);
     if (profile_path == NULL)
         return ENOMEM;
     profile = (profile_t) NULL;
diff --git a/src/lib/kadm5/str_conv.c b/src/lib/kadm5/str_conv.c
index cdd2786c1..a490f14c0 100644
--- a/src/lib/kadm5/str_conv.c
+++ b/src/lib/kadm5/str_conv.c
@@ -183,18 +183,18 @@ krb5_flags_to_string(flags, sep, buffer, buflen)
 
     pflags = 0;
     sepstring = (sep) ? sep : flags_default_sep;
-    krb5int_buf_init_fixed(&buf, buffer, buflen);
+    k5_buf_init_fixed(&buf, buffer, buflen);
     /* Blast through the table matching all we can */
     for (i=0; i<flags_table_nents; i++) {
         if (flags & flags_table[i].fl_flags) {
-            if (krb5int_buf_len(&buf) > 0)
-                krb5int_buf_add(&buf, sepstring);
-            krb5int_buf_add(&buf, _(flags_table[i].fl_output));
+            if (k5_buf_len(&buf) > 0)
+                k5_buf_add(&buf, sepstring);
+            k5_buf_add(&buf, _(flags_table[i].fl_output));
             /* Keep track of what we matched */
             pflags |= flags_table[i].fl_flags;
         }
     }
-    if (krb5int_buf_data(&buf) == NULL)
+    if (k5_buf_data(&buf) == NULL)
         return(ENOMEM);
 
     /* See if there's any leftovers */
diff --git a/src/lib/kdb/kdb5.c b/src/lib/kdb/kdb5.c
index e1ee5f9ff..e1a7c5d91 100644
--- a/src/lib/kdb/kdb5.c
+++ b/src/lib/kdb/kdb5.c
@@ -2101,37 +2101,37 @@ krb5_dbe_set_string(krb5_context context, krb5_db_entry *entry,
     code = begin_attrs(context, entry, &pos, &end);
     if (code)
         return code;
-    krb5int_buf_init_dynamic(&buf);
+    k5_buf_init_dynamic(&buf);
     while (next_attr(&pos, end, &mapkey, &mapval)) {
         if (strcmp(mapkey, key) == 0) {
             if (value != NULL) {
-                krb5int_buf_add_len(&buf, mapkey, strlen(mapkey) + 1);
-                krb5int_buf_add_len(&buf, value, strlen(value) + 1);
+                k5_buf_add_len(&buf, mapkey, strlen(mapkey) + 1);
+                k5_buf_add_len(&buf, value, strlen(value) + 1);
             }
             found = TRUE;
         } else {
-            krb5int_buf_add_len(&buf, mapkey, strlen(mapkey) + 1);
-            krb5int_buf_add_len(&buf, mapval, strlen(mapval) + 1);
+            k5_buf_add_len(&buf, mapkey, strlen(mapkey) + 1);
+            k5_buf_add_len(&buf, mapval, strlen(mapval) + 1);
         }
     }
 
     /* If key wasn't found in the map, add a new entry for it. */
     if (!found && value != NULL) {
-        krb5int_buf_add_len(&buf, key, strlen(key) + 1);
-        krb5int_buf_add_len(&buf, value, strlen(value) + 1);
+        k5_buf_add_len(&buf, key, strlen(key) + 1);
+        k5_buf_add_len(&buf, value, strlen(value) + 1);
     }
 
-    len = krb5int_buf_len(&buf);
+    len = k5_buf_len(&buf);
     if (len == -1)
         return ENOMEM;
     if (len > 65535)
         return KRB5_KDB_STRINGS_TOOLONG;
     tl_data.tl_data_type = KRB5_TL_STRING_ATTRS;
-    tl_data.tl_data_contents = (krb5_octet *)krb5int_buf_data(&buf);
+    tl_data.tl_data_contents = (krb5_octet *)k5_buf_data(&buf);
     tl_data.tl_data_length = len;
 
     code = krb5_dbe_update_tl_data(context, entry, &tl_data);
-    krb5int_free_buf(&buf);
+    k5_free_buf(&buf);
     return code;
 }
 
diff --git a/src/lib/krb5/krb/chpw.c b/src/lib/krb5/krb/chpw.c
index beb77cb98..76f415d4b 100644
--- a/src/lib/krb5/krb/chpw.c
+++ b/src/lib/krb5/krb/chpw.c
@@ -382,8 +382,8 @@ struct ad_policy_info {
 static void
 add_spaces(struct k5buf *buf)
 {
-    if (krb5int_buf_len(buf) > 0)
-        krb5int_buf_add(buf, "  ");
+    if (k5_buf_len(buf) > 0)
+        k5_buf_add(buf, "  ");
 }
 
 static krb5_error_code
@@ -422,52 +422,48 @@ decode_ad_policy_info(const krb5_data *data, char **msg_out)
     /* Check that we processed exactly the expected number of bytes. */
     assert(p == data->data + AD_POLICY_INFO_LENGTH);
 
-    krb5int_buf_init_dynamic(&buf);
+    k5_buf_init_dynamic(&buf);
 
     /*
      * Update src/tests/misc/test_chpw_message.c if changing these strings!
      */
 
     if (policy.password_properties & AD_POLICY_COMPLEX) {
-        krb5int_buf_add(&buf,
-                        _("The password must include numbers or symbols.  "
-                          "Don't include any part of your name in the "
-                          "password."));
+        k5_buf_add(&buf, _("The password must include numbers or symbols.  "
+                           "Don't include any part of your name in the "
+                           "password."));
     }
     if (policy.min_length_password > 0) {
         add_spaces(&buf);
-        krb5int_buf_add_fmt(&buf,
-                            ngettext("The password must contain at least %d "
-                                     "character.",
-                                     "The password must contain at least %d "
-                                     "characters.",
-                                     policy.min_length_password),
-                            policy.min_length_password);
+        k5_buf_add_fmt(&buf, ngettext("The password must contain at least %d "
+                                      "character.",
+                                      "The password must contain at least %d "
+                                      "characters.",
+                                      policy.min_length_password),
+                       policy.min_length_password);
     }
     if (policy.password_history) {
         add_spaces(&buf);
-        krb5int_buf_add_fmt(&buf,
-                            ngettext("The password must be different from the "
-                                     "previous password.",
-                                     "The password must be different from the "
-                                     "previous %d passwords.",
-                                     policy.password_history),
-                            policy.password_history);
+        k5_buf_add_fmt(&buf, ngettext("The password must be different from "
+                                      "the previous password.",
+                                      "The password must be different from "
+                                      "the previous %d passwords.",
+                                      policy.password_history),
+                       policy.password_history);
     }
     if (policy.min_passwordage) {
         password_days = policy.min_passwordage / AD_POLICY_TIME_TO_DAYS;
         if (password_days == 0)
             password_days = 1;
         add_spaces(&buf);
-        krb5int_buf_add_fmt(&buf,
-                            ngettext("The password can only be changed once a "
-                                     "day.",
-                                     "The password can only be changed every "
-                                     "%d days.", (int)password_days),
-                            (int)password_days);
+        k5_buf_add_fmt(&buf, ngettext("The password can only be changed once "
+                                      "a day.",
+                                      "The password can only be changed every "
+                                      "%d days.", (int)password_days),
+                       (int)password_days);
     }
 
-    msg = krb5int_buf_data(&buf);
+    msg = k5_buf_data(&buf);
     if (msg == NULL)
         return ENOMEM;
 
diff --git a/src/lib/krb5/krb/gic_opt.c b/src/lib/krb5/krb/gic_opt.c
index 7a8750d1f..dddabf7e1 100644
--- a/src/lib/krb5/krb/gic_opt.c
+++ b/src/lib/krb5/krb/gic_opt.c
@@ -437,17 +437,17 @@ krb5_get_init_creds_opt_set_fast_ccache(krb5_context context,
     struct k5buf buf;
     char *cc_name;
 
-    krb5int_buf_init_dynamic(&buf);
-    krb5int_buf_add(&buf, krb5_cc_get_type(context, ccache));
-    krb5int_buf_add(&buf, ":");
-    krb5int_buf_add(&buf, krb5_cc_get_name(context, ccache));
-    cc_name = krb5int_buf_data(&buf);
+    k5_buf_init_dynamic(&buf);
+    k5_buf_add(&buf, krb5_cc_get_type(context, ccache));
+    k5_buf_add(&buf, ":");
+    k5_buf_add(&buf, krb5_cc_get_name(context, ccache));
+    cc_name = k5_buf_data(&buf);
     if (cc_name)
         retval = krb5_get_init_creds_opt_set_fast_ccache_name(context, opt,
                                                               cc_name);
     else
         retval = ENOMEM;
-    krb5int_free_buf(&buf);
+    k5_free_buf(&buf);
     return retval;
 }
 
diff --git a/src/lib/krb5/krb/srv_rcache.c b/src/lib/krb5/krb/srv_rcache.c
index d474fb61a..1b0a91a28 100644
--- a/src/lib/krb5/krb/srv_rcache.c
+++ b/src/lib/krb5/krb/srv_rcache.c
@@ -48,22 +48,22 @@ krb5_get_server_rcache(krb5_context context, const krb5_data *piece,
 
     cachetype = krb5_rc_default_type(context);
 
-    krb5int_buf_init_dynamic(&buf);
-    krb5int_buf_add(&buf, cachetype);
-    krb5int_buf_add(&buf, ":");
+    k5_buf_init_dynamic(&buf);
+    k5_buf_add(&buf, cachetype);
+    k5_buf_add(&buf, ":");
     for (i = 0; i < piece->length; i++) {
         if (piece->data[i] == '-')
-            krb5int_buf_add(&buf, "--");
+            k5_buf_add(&buf, "--");
         else if (!isvalidrcname((int) piece->data[i]))
-            krb5int_buf_add_fmt(&buf, "-%03o", piece->data[i]);
+            k5_buf_add_fmt(&buf, "-%03o", piece->data[i]);
         else
-            krb5int_buf_add_len(&buf, &piece->data[i], 1);
+            k5_buf_add_len(&buf, &piece->data[i], 1);
     }
 #ifdef HAVE_GETEUID
-    krb5int_buf_add_fmt(&buf, "_%lu", uid);
+    k5_buf_add_fmt(&buf, "_%lu", uid);
 #endif
 
-    cachename = krb5int_buf_data(&buf);
+    cachename = k5_buf_data(&buf);
     if (cachename == NULL)
         return ENOMEM;
 
diff --git a/src/lib/krb5/os/an_to_ln.c b/src/lib/krb5/os/an_to_ln.c
index 0f2600c28..54b98f61a 100644
--- a/src/lib/krb5/os/an_to_ln.c
+++ b/src/lib/krb5/os/an_to_ln.c
@@ -506,11 +506,11 @@ aname_get_selstring(krb5_context context, krb5_const_principal aname,
         return KRB5_LNAME_NOTRANS;
     current++;
 
-    krb5int_buf_init_dynamic(&selstring);
+    k5_buf_init_dynamic(&selstring);
     while (1) {
         /* Copy in literal characters up to the next $ or ]. */
         nlit = strcspn(current, "$]");
-        krb5int_buf_add_len(&selstring, current, nlit);
+        k5_buf_add_len(&selstring, current, nlit);
         current += nlit;
         if (*current != '$')
             break;
@@ -525,16 +525,16 @@ aname_get_selstring(krb5_context context, krb5_const_principal aname,
             : krb5_princ_realm(context, aname);
         if (!datap)
             break;
-        krb5int_buf_add_len(&selstring, datap->data, datap->length);
+        k5_buf_add_len(&selstring, datap->data, datap->length);
     }
 
     /* Check that we hit a ']' and not the end of the string. */
     if (*current != ']') {
-        krb5int_free_buf(&selstring);
+        k5_free_buf(&selstring);
         return KRB5_CONFIG_BADFORMAT;
     }
 
-    str = krb5int_buf_data(&selstring);
+    str = k5_buf_data(&selstring);
     if (str == NULL)
         return ENOMEM;
 
diff --git a/src/lib/krb5/os/dnsglue.c b/src/lib/krb5/os/dnsglue.c
index 6d1189699..028d9c536 100644
--- a/src/lib/krb5/os/dnsglue.c
+++ b/src/lib/krb5/os/dnsglue.c
@@ -350,11 +350,11 @@ krb5_try_realm_txt_rr(const char *prefix, const char *name, char **realm)
      * Form our query, and send it via DNS
      */
 
-    krb5int_buf_init_fixed(&buf, host, sizeof(host));
+    k5_buf_init_fixed(&buf, host, sizeof(host));
     if (name == NULL || name[0] == '\0') {
-        krb5int_buf_add(&buf, prefix);
+        k5_buf_add(&buf, prefix);
     } else {
-        krb5int_buf_add_fmt(&buf, "%s.%s", prefix, name);
+        k5_buf_add_fmt(&buf, "%s.%s", prefix, name);
 
         /* Realm names don't (normally) end with ".", but if the query
            doesn't end with "." and doesn't get an answer as is, the
@@ -366,11 +366,11 @@ krb5_try_realm_txt_rr(const char *prefix, const char *name, char **realm)
            the local domain or domain search lists to be expanded.
         */
 
-        len = krb5int_buf_len(&buf);
+        len = k5_buf_len(&buf);
         if (len > 0 && host[len - 1] != '.')
-            krb5int_buf_add(&buf, ".");
+            k5_buf_add(&buf, ".");
     }
-    if (krb5int_buf_data(&buf) == NULL)
+    if (k5_buf_data(&buf) == NULL)
         return KRB5_ERR_HOST_REALM_UNKNOWN;
     ret = krb5int_dns_init(&ds, host, C_IN, T_TXT);
     if (ret < 0)
diff --git a/src/lib/krb5/os/dnssrv.c b/src/lib/krb5/os/dnssrv.c
index 4332ac70d..33ee0e7e9 100644
--- a/src/lib/krb5/os/dnssrv.c
+++ b/src/lib/krb5/os/dnssrv.c
@@ -80,9 +80,9 @@ krb5int_make_srv_query_realm(const krb5_data *realm,
 
     if (memchr(realm->data, 0, realm->length))
         return 0;
-    krb5int_buf_init_fixed(&buf, host, sizeof(host));
-    krb5int_buf_add_fmt(&buf, "%s.%s.", service, protocol);
-    krb5int_buf_add_len(&buf, realm->data, realm->length);
+    k5_buf_init_fixed(&buf, host, sizeof(host));
+    k5_buf_add_fmt(&buf, "%s.%s.", service, protocol);
+    k5_buf_add_len(&buf, realm->data, realm->length);
 
     /* Realm names don't (normally) end with ".", but if the query
        doesn't end with "." and doesn't get an answer as is, the
@@ -93,11 +93,11 @@ krb5int_make_srv_query_realm(const krb5_data *realm,
        a search on the prefix alone then the intention is to allow
        the local domain or domain search lists to be expanded.  */
 
-    len = krb5int_buf_len(&buf);
+    len = k5_buf_len(&buf);
     if (len > 0 && host[len - 1] != '.')
-        krb5int_buf_add(&buf, ".");
+        k5_buf_add(&buf, ".");
 
-    if (krb5int_buf_data(&buf) == NULL)
+    if (k5_buf_data(&buf) == NULL)
         return 0;
 
 #ifdef TEST
diff --git a/src/lib/krb5/os/expand_path.c b/src/lib/krb5/os/expand_path.c
index 2da145fd6..3d23849ba 100644
--- a/src/lib/krb5/os/expand_path.c
+++ b/src/lib/krb5/os/expand_path.c
@@ -465,7 +465,7 @@ k5_expand_path_tokens_extra(krb5_context context, const char *path_in,
 
     *path_out = NULL;
 
-    krb5int_buf_init_dynamic(&buf);
+    k5_buf_init_dynamic(&buf);
 
     /* Count extra tokens. */
     va_start(ap, path_out);
@@ -497,10 +497,10 @@ k5_expand_path_tokens_extra(krb5_context context, const char *path_in,
          * If there are no more tokens, we can finish up. */
         tok_begin = strstr(path_left, "%{");
         if (tok_begin == NULL) {
-            krb5int_buf_add(&buf, path_left);
+            k5_buf_add(&buf, path_left);
             break;
         }
-        krb5int_buf_add_len(&buf, path_left, tok_begin - path_left);
+        k5_buf_add_len(&buf, path_left, tok_begin - path_left);
 
         /* Find the end of this token. */
         tok_end = strchr(tok_begin, '}');
@@ -515,12 +515,12 @@ k5_expand_path_tokens_extra(krb5_context context, const char *path_in,
                            &tok_val);
         if (ret)
             goto cleanup;
-        krb5int_buf_add(&buf, tok_val);
+        k5_buf_add(&buf, tok_val);
         free(tok_val);
         path_left = tok_end + 1;
     }
 
-    path = krb5int_buf_data(&buf);
+    path = k5_buf_data(&buf);
     if (path == NULL) {
         ret = ENOMEM;
         goto cleanup;
@@ -539,7 +539,7 @@ k5_expand_path_tokens_extra(krb5_context context, const char *path_in,
 
 cleanup:
     if (*path_out == NULL)
-        krb5int_free_buf(&buf);
+        k5_free_buf(&buf);
     free_extra_tokens(extra_tokens);
     return 0;
 }
diff --git a/src/lib/krb5/os/sendto_kdc.c b/src/lib/krb5/os/sendto_kdc.c
index 8488f6d6e..edc4a6e3a 100644
--- a/src/lib/krb5/os/sendto_kdc.c
+++ b/src/lib/krb5/os/sendto_kdc.c
@@ -193,27 +193,27 @@ krb5int_debug_fprint (const char *fmt, ...)
         case 'A':
             /* %A => addrinfo */
             ai = va_arg(args, struct addrinfo *);
-            krb5int_buf_init_dynamic(&buf);
+            k5_buf_init_dynamic(&buf);
             if (ai->ai_socktype == SOCK_DGRAM)
-                krb5int_buf_add(&buf, "dgram");
+                k5_buf_add(&buf, "dgram");
             else if (ai->ai_socktype == SOCK_STREAM)
-                krb5int_buf_add(&buf, "stream");
+                k5_buf_add(&buf, "stream");
             else
-                krb5int_buf_add_fmt(&buf, "socktype%d", ai->ai_socktype);
+                k5_buf_add_fmt(&buf, "socktype%d", ai->ai_socktype);
 
             if (0 != getnameinfo (ai->ai_addr, ai->ai_addrlen,
                                   addrbuf, sizeof (addrbuf),
                                   portbuf, sizeof (portbuf),
                                   NI_NUMERICHOST | NI_NUMERICSERV)) {
                 if (ai->ai_addr->sa_family == AF_UNSPEC)
-                    krb5int_buf_add(&buf, " AF_UNSPEC");
+                    k5_buf_add(&buf, " AF_UNSPEC");
                 else
-                    krb5int_buf_add_fmt(&buf, " af%d", ai->ai_addr->sa_family);
+                    k5_buf_add_fmt(&buf, " af%d", ai->ai_addr->sa_family);
             } else
-                krb5int_buf_add_fmt(&buf, " %s.%s", addrbuf, portbuf);
-            if (krb5int_buf_data(&buf))
-                putstr(krb5int_buf_data(&buf));
-            krb5int_free_buf(&buf);
+                k5_buf_add_fmt(&buf, " %s.%s", addrbuf, portbuf);
+            if (k5_buf_data(&buf))
+                putstr(k5_buf_data(&buf));
+            k5_free_buf(&buf);
             break;
         case 'D':
             /* %D => krb5_data * */
diff --git a/src/lib/krb5/os/trace.c b/src/lib/krb5/os/trace.c
index 8f9ba04d9..21fe1052c 100644
--- a/src/lib/krb5/os/trace.c
+++ b/src/lib/krb5/os/trace.c
@@ -64,15 +64,15 @@ buf_add_printable_len(struct k5buf *buf, const char *p, size_t len)
     size_t i;
 
     if (buf_is_printable(p, len)) {
-        krb5int_buf_add_len(buf, p, len);
+        k5_buf_add_len(buf, p, len);
     } else {
         for (i = 0; i < len; i++) {
             if (buf_is_printable(p + i, 1)) {
-                krb5int_buf_add_len(buf, p + i, 1);
+                k5_buf_add_len(buf, p + i, 1);
             } else {
                 snprintf(text, sizeof(text), "\\x%02x",
                          (unsigned)(p[i] & 0xff));
-                krb5int_buf_add_len(buf, text, 4);
+                k5_buf_add_len(buf, text, 4);
             }
         }
     }
@@ -145,11 +145,11 @@ trace_format(krb5_context context, const char *fmt, va_list ap)
     krb5_creds *creds;
     krb5_enctype *etypes, etype;
 
-    krb5int_buf_init_dynamic(&buf);
+    k5_buf_init_dynamic(&buf);
     while (TRUE) {
         /* Advance to the next word in braces. */
         len = strcspn(fmt, "{");
-        krb5int_buf_add_len(&buf, fmt, len);
+        k5_buf_add_len(&buf, fmt, len);
         if (fmt[len] == '\0')
             break;
         fmt += len + 1;
@@ -162,9 +162,9 @@ trace_format(krb5_context context, const char *fmt, va_list ap)
 
         /* Process the format word. */
         if (strcmp(tmpbuf, "int") == 0) {
-            krb5int_buf_add_fmt(&buf, "%d", va_arg(ap, int));
+            k5_buf_add_fmt(&buf, "%d", va_arg(ap, int));
         } else if (strcmp(tmpbuf, "long") == 0) {
-            krb5int_buf_add_fmt(&buf, "%ld", va_arg(ap, long));
+            k5_buf_add_fmt(&buf, "%ld", va_arg(ap, long));
         } else if (strcmp(tmpbuf, "str") == 0) {
             p = va_arg(ap, const char *);
             buf_add_printable(&buf, (p == NULL) ? "(null)" : p);
@@ -172,57 +172,57 @@ trace_format(krb5_context context, const char *fmt, va_list ap)
             len = va_arg(ap, size_t);
             p = va_arg(ap, const char *);
             if (p == NULL && len != 0)
-                krb5int_buf_add(&buf, "(null)");
+                k5_buf_add(&buf, "(null)");
             else
                 buf_add_printable_len(&buf, p, len);
         } else if (strcmp(tmpbuf, "hexlenstr") == 0) {
             len = va_arg(ap, size_t);
             p = va_arg(ap, const char *);
             if (p == NULL && len != 0)
-                krb5int_buf_add(&buf, "(null)");
+                k5_buf_add(&buf, "(null)");
             else {
                 for (i = 0; i < len; i++)
-                    krb5int_buf_add_fmt(&buf, "%02X", (unsigned char) p[i]);
+                    k5_buf_add_fmt(&buf, "%02X", (unsigned char)p[i]);
             }
         } else if (strcmp(tmpbuf, "hashlenstr") == 0) {
             len = va_arg(ap, size_t);
             p = va_arg(ap, const char *);
             if (p == NULL && len != 0)
-                krb5int_buf_add(&buf, "(null)");
+                k5_buf_add(&buf, "(null)");
             else {
                 str = hash_bytes(context, p, len);
                 if (str != NULL)
-                    krb5int_buf_add(&buf, str);
+                    k5_buf_add(&buf, str);
                 free(str);
             }
         } else if (strcmp(tmpbuf, "connstate") == 0) {
             cs = va_arg(ap, struct conn_state *);
             if (cs->socktype == SOCK_DGRAM)
-                krb5int_buf_add(&buf, "dgram");
+                k5_buf_add(&buf, "dgram");
             else if (cs->socktype == SOCK_STREAM)
-                krb5int_buf_add(&buf, "stream");
+                k5_buf_add(&buf, "stream");
             else
-                krb5int_buf_add_fmt(&buf, "socktype%d", cs->socktype);
+                k5_buf_add_fmt(&buf, "socktype%d", cs->socktype);
 
             if (getnameinfo((struct sockaddr *)&cs->addr, cs->addrlen,
                             addrbuf, sizeof(addrbuf), portbuf, sizeof(portbuf),
                             NI_NUMERICHOST|NI_NUMERICSERV) != 0) {
                 if (cs->family == AF_UNSPEC)
-                    krb5int_buf_add(&buf, " AF_UNSPEC");
+                    k5_buf_add(&buf, " AF_UNSPEC");
                 else
-                    krb5int_buf_add_fmt(&buf, " af%d", cs->family);
+                    k5_buf_add_fmt(&buf, " af%d", cs->family);
             } else
-                krb5int_buf_add_fmt(&buf, " %s:%s", addrbuf, portbuf);
+                k5_buf_add_fmt(&buf, " %s:%s", addrbuf, portbuf);
         } else if (strcmp(tmpbuf, "data") == 0) {
             d = va_arg(ap, krb5_data *);
             if (d == NULL || (d->length != 0 && d->data == NULL))
-                krb5int_buf_add(&buf, "(null)");
+                k5_buf_add(&buf, "(null)");
             else
                 buf_add_printable_len(&buf, d->data, d->length);
         } else if (strcmp(tmpbuf, "hexdata") == 0) {
             d = va_arg(ap, krb5_data *);
             if (d == NULL)
-                krb5int_buf_add(&buf, "(null)");
+                k5_buf_add(&buf, "(null)");
             else
                 subfmt(context, &buf, "{hexlenstr}", d->length, d->data);
         } else if (strcmp(tmpbuf, "errno") == 0) {
@@ -234,17 +234,16 @@ trace_format(krb5_context context, const char *fmt, va_list ap)
 #endif
             if (p == NULL)
                 p = strerror(err);
-            krb5int_buf_add_fmt(&buf, "%d/%s", err, p);
+            k5_buf_add_fmt(&buf, "%d/%s", err, p);
         } else if (strcmp(tmpbuf, "kerr") == 0) {
             kerr = va_arg(ap, krb5_error_code);
             p = krb5_get_error_message(context, kerr);
-            krb5int_buf_add_fmt(&buf, "%ld/%s", (long) kerr,
-                                kerr ? p : "Success");
+            k5_buf_add_fmt(&buf, "%ld/%s", (long)kerr, kerr ? p : "Success");
             krb5_free_error_message(context, p);
         } else if (strcmp(tmpbuf, "keyblock") == 0) {
             keyblock = va_arg(ap, const krb5_keyblock *);
             if (keyblock == NULL)
-                krb5int_buf_add(&buf, "(null)");
+                k5_buf_add(&buf, "(null)");
             else {
                 subfmt(context, &buf, "{etype}/{hashlenstr}",
                        keyblock->enctype, keyblock->length,
@@ -253,7 +252,7 @@ trace_format(krb5_context context, const char *fmt, va_list ap)
         } else if (strcmp(tmpbuf, "key") == 0) {
             key = va_arg(ap, krb5_key);
             if (key == NULL)
-                krb5int_buf_add(&buf, "(null)");
+                k5_buf_add(&buf, "(null)");
             else
                 subfmt(context, &buf, "{keyblock}", &key->keyblock);
         } else if (strcmp(tmpbuf, "cksum") == 0) {
@@ -264,52 +263,52 @@ trace_format(krb5_context context, const char *fmt, va_list ap)
         } else if (strcmp(tmpbuf, "princ") == 0) {
             princ = va_arg(ap, krb5_principal);
             if (krb5_unparse_name(context, princ, &str) == 0) {
-                krb5int_buf_add(&buf, str);
+                k5_buf_add(&buf, str);
                 krb5_free_unparsed_name(context, str);
             }
         } else if (strcmp(tmpbuf, "ptype") == 0) {
             p = principal_type_string(va_arg(ap, krb5_int32));
-            krb5int_buf_add(&buf, p);
+            k5_buf_add(&buf, p);
         } else if (strcmp(tmpbuf, "patypes") == 0) {
             padata = va_arg(ap, krb5_pa_data **);
             if (padata == NULL || *padata == NULL)
-                krb5int_buf_add(&buf, "(empty)");
+                k5_buf_add(&buf, "(empty)");
             for (; padata != NULL && *padata != NULL; padata++) {
-                krb5int_buf_add_fmt(&buf, "%d", (int) (*padata)->pa_type);
+                k5_buf_add_fmt(&buf, "%d", (int)(*padata)->pa_type);
                 if (*(padata + 1) != NULL)
-                    krb5int_buf_add(&buf, ", ");
+                    k5_buf_add(&buf, ", ");
             }
         } else if (strcmp(tmpbuf, "etype") == 0) {
             etype = va_arg(ap, krb5_enctype);
             if (krb5_enctype_to_name(etype, TRUE, tmpbuf, sizeof(tmpbuf)) == 0)
-                krb5int_buf_add(&buf, tmpbuf);
+                k5_buf_add(&buf, tmpbuf);
             else
-                krb5int_buf_add_fmt(&buf, "%d", (int) etype);
+                k5_buf_add_fmt(&buf, "%d", (int)etype);
         } else if (strcmp(tmpbuf, "etypes") == 0) {
             etypes = va_arg(ap, krb5_enctype *);
             if (etypes == NULL || *etypes == 0)
-                krb5int_buf_add(&buf, "(empty)");
+                k5_buf_add(&buf, "(empty)");
             for (; etypes != NULL && *etypes != 0; etypes++) {
                 subfmt(context, &buf, "{etype}", *etypes);
                 if (*(etypes + 1) != 0)
-                    krb5int_buf_add(&buf, ", ");
+                    k5_buf_add(&buf, ", ");
             }
         } else if (strcmp(tmpbuf, "ccache") == 0) {
             ccache = va_arg(ap, krb5_ccache);
-            krb5int_buf_add(&buf, krb5_cc_get_type(context, ccache));
-            krb5int_buf_add(&buf, ":");
-            krb5int_buf_add(&buf, krb5_cc_get_name(context, ccache));
+            k5_buf_add(&buf, krb5_cc_get_type(context, ccache));
+            k5_buf_add(&buf, ":");
+            k5_buf_add(&buf, krb5_cc_get_name(context, ccache));
         } else if (strcmp(tmpbuf, "keytab") == 0) {
             keytab = va_arg(ap, krb5_keytab);
             if (krb5_kt_get_name(context, keytab, tmpbuf, sizeof(tmpbuf)) == 0)
-                krb5int_buf_add(&buf, tmpbuf);
+                k5_buf_add(&buf, tmpbuf);
         } else if (strcmp(tmpbuf, "creds") == 0) {
             creds = va_arg(ap, krb5_creds *);
             subfmt(context, &buf, "{princ} -> {princ}",
                    creds->client, creds->server);
         }
     }
-    return krb5int_buf_data(&buf);
+    return k5_buf_data(&buf);
 }
 
 /* Allows trace_format formatters to be represented in terms of other
@@ -323,7 +322,7 @@ subfmt(krb5_context context, struct k5buf *buf, const char *fmt, ...)
     va_start(ap, fmt);
     str = trace_format(context, fmt, ap);
     if (str != NULL)
-        krb5int_buf_add(buf, str);
+        k5_buf_add(buf, str);
     free(str);
     va_end(ap);
 }
diff --git a/src/lib/krb5/rcache/rc_dfl.c b/src/lib/krb5/rcache/rc_dfl.c
index 2981985ea..12e2a5d42 100644
--- a/src/lib/krb5/rcache/rc_dfl.c
+++ b/src/lib/krb5/rcache/rc_dfl.c
@@ -670,11 +670,11 @@ krb5_rc_io_store(krb5_context context, struct dfl_data *t,
          */
 
         /* Format the extension value so we know its length. */
-        krb5int_buf_init_dynamic(&extbuf);
-        krb5int_buf_add_fmt(&extbuf, "HASH:%s %lu:%s %lu:%s", rep->msghash,
-                            (unsigned long) clientlen, rep->client,
-                            (unsigned long) serverlen, rep->server);
-        extstr = krb5int_buf_data(&extbuf);
+        k5_buf_init_dynamic(&extbuf);
+        k5_buf_add_fmt(&extbuf, "HASH:%s %lu:%s %lu:%s", rep->msghash,
+                       (unsigned long)clientlen, rep->client,
+                       (unsigned long)serverlen, rep->server);
+        extstr = k5_buf_data(&extbuf);
         if (!extstr)
             return KRB5_RC_MALLOC;
 
@@ -682,35 +682,35 @@ krb5_rc_io_store(krb5_context context, struct dfl_data *t,
          * Put the extension value into the server field of a
          * regular-format record, with an empty client field.
          */
-        krb5int_buf_init_dynamic(&buf);
+        k5_buf_init_dynamic(&buf);
         len = 1;
-        krb5int_buf_add_len(&buf, (char *) &len, sizeof(len));
-        krb5int_buf_add_len(&buf, "", 1);
+        k5_buf_add_len(&buf, (char *)&len, sizeof(len));
+        k5_buf_add_len(&buf, "", 1);
         len = strlen(extstr) + 1;
-        krb5int_buf_add_len(&buf, (char *) &len, sizeof(len));
-        krb5int_buf_add_len(&buf, extstr, len);
-        krb5int_buf_add_len(&buf, (char *) &rep->cusec, sizeof(rep->cusec));
-        krb5int_buf_add_len(&buf, (char *) &rep->ctime, sizeof(rep->ctime));
+        k5_buf_add_len(&buf, (char *)&len, sizeof(len));
+        k5_buf_add_len(&buf, extstr, len);
+        k5_buf_add_len(&buf, (char *)&rep->cusec, sizeof(rep->cusec));
+        k5_buf_add_len(&buf, (char *)&rep->ctime, sizeof(rep->ctime));
         free(extstr);
     } else  /* No extension record needed. */
-        krb5int_buf_init_dynamic(&buf);
+        k5_buf_init_dynamic(&buf);
 
     len = clientlen + 1;
-    krb5int_buf_add_len(&buf, (char *) &len, sizeof(len));
-    krb5int_buf_add_len(&buf, rep->client, len);
+    k5_buf_add_len(&buf, (char *)&len, sizeof(len));
+    k5_buf_add_len(&buf, rep->client, len);
     len = serverlen + 1;
-    krb5int_buf_add_len(&buf, (char *) &len, sizeof(len));
-    krb5int_buf_add_len(&buf, rep->server, len);
-    krb5int_buf_add_len(&buf, (char *) &rep->cusec, sizeof(rep->cusec));
-    krb5int_buf_add_len(&buf, (char *) &rep->ctime, sizeof(rep->ctime));
+    k5_buf_add_len(&buf, (char *)&len, sizeof(len));
+    k5_buf_add_len(&buf, rep->server, len);
+    k5_buf_add_len(&buf, (char *)&rep->cusec, sizeof(rep->cusec));
+    k5_buf_add_len(&buf, (char *)&rep->ctime, sizeof(rep->ctime));
 
-    bufptr = krb5int_buf_data(&buf);
-    buflen = krb5int_buf_len(&buf);
+    bufptr = k5_buf_data(&buf);
+    buflen = k5_buf_len(&buf);
     if (bufptr == NULL || buflen < 0)
         return KRB5_RC_MALLOC;
 
     ret = krb5_rc_io_write(context, &t->d, bufptr, buflen);
-    krb5int_free_buf(&buf);
+    k5_free_buf(&buf);
     return ret;
 }