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.

2 files changed, 11 insertions, 11 deletions

diff --git a/src/lib/crypto/crypto_tests/t_hmac.c b/src/lib/crypto/crypto_tests/t_hmac.c
index 02168e5c75..cd79dc3eeb 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 1d0a01b648..e6d990cef7 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;
 }