Eliminate internal fixed-width type wrappers

Directly use stdint.h names for integer types in preference to the
various internal names we have made up for them.

5 files changed, 16 insertions, 19 deletions

diff --git a/src/lib/krb5/krb/authdata.h b/src/lib/krb5/krb/authdata.h
index 77db5fc4b..46b699ca9 100644
--- a/src/lib/krb5/krb/authdata.h
+++ b/src/lib/krb5/krb/authdata.h
@@ -51,7 +51,7 @@ krb5int_authdata_verify(krb5_context context,
 typedef struct _PAC_INFO_BUFFER {
     krb5_ui_4 ulType;
     krb5_ui_4 cbBufferSize;
-    krb5_ui_8 Offset;
+    uint64_t Offset;
 } PAC_INFO_BUFFER;
 
 typedef struct _PACTYPE {
@@ -100,8 +100,7 @@ k5_pac_add_buffer(krb5_context context,
                   krb5_data *out_data);
 
 krb5_error_code
-k5_seconds_since_1970_to_time(krb5_timestamp elapsedSeconds,
-                              krb5_ui_8 *ntTime);
+k5_seconds_since_1970_to_time(krb5_timestamp elapsedSeconds, uint64_t *ntTime);
 
 
 #endif /* !KRB_AUTHDATA_H */
diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c
index 252596d14..6801bb1d6 100644
--- a/src/lib/krb5/krb/init_ctx.c
+++ b/src/lib/krb5/krb/init_ctx.c
@@ -150,7 +150,7 @@ krb5_init_context_profile(profile_t profile, krb5_flags flags,
        of using uint64_t, the possibility does exist that we're
        wrong.  */
     {
-        krb5_ui_8 i64;
+        uint64_t i64;
         assert(sizeof(i64) == 8);
         i64 = 0, i64--, i64 >>= 62;
         assert(i64 == 3);
diff --git a/src/lib/krb5/krb/pac.c b/src/lib/krb5/krb/pac.c
index cc6f200c6..2458695b1 100644
--- a/src/lib/krb5/krb/pac.c
+++ b/src/lib/krb5/krb/pac.c
@@ -375,10 +375,9 @@ krb5_pac_parse(krb5_context context,
 }
 
 static krb5_error_code
-k5_time_to_seconds_since_1970(krb5_int64 ntTime,
-                              krb5_timestamp *elapsedSeconds)
+k5_time_to_seconds_since_1970(int64_t ntTime, krb5_timestamp *elapsedSeconds)
 {
-    krb5_ui_8 abstime;
+    uint64_t abstime;
 
     ntTime /= 10000000;
 
@@ -393,8 +392,7 @@ k5_time_to_seconds_since_1970(krb5_int64 ntTime,
 }
 
 krb5_error_code
-k5_seconds_since_1970_to_time(krb5_timestamp elapsedSeconds,
-                              krb5_ui_8 *ntTime)
+k5_seconds_since_1970_to_time(krb5_timestamp elapsedSeconds, uint64_t *ntTime)
 {
     *ntTime = elapsedSeconds;
 
@@ -418,7 +416,7 @@ k5_pac_validate_client(krb5_context context,
     unsigned char *p;
     krb5_timestamp pac_authtime;
     krb5_ui_2 pac_princname_length;
-    krb5_int64 pac_nt_authtime;
+    int64_t pac_nt_authtime;
     krb5_principal pac_principal;
 
     ret = k5_pac_locate_buffer(context, pac, KRB5_PAC_CLIENT_INFO,
diff --git a/src/lib/krb5/krb/pac_sign.c b/src/lib/krb5/krb/pac_sign.c
index 20535816d..d40df45f9 100644
--- a/src/lib/krb5/krb/pac_sign.c
+++ b/src/lib/krb5/krb/pac_sign.c
@@ -40,7 +40,7 @@ k5_insert_client_info(krb5_context context,
     char *princ_name_utf8 = NULL;
     unsigned char *princ_name_ucs2 = NULL, *p;
     size_t princ_name_ucs2_len = 0;
-    krb5_ui_8 nt_authtime;
+    uint64_t nt_authtime;
 
     /* If we already have a CLIENT_INFO buffer, then just validate it */
     if (k5_pac_locate_buffer(context, pac, KRB5_PAC_CLIENT_INFO,
diff --git a/src/lib/krb5/krb/serialize.c b/src/lib/krb5/krb/serialize.c
index 9ad2d22b6..6d60f2265 100644
--- a/src/lib/krb5/krb/serialize.c
+++ b/src/lib/krb5/krb/serialize.c
@@ -192,12 +192,12 @@ krb5_ser_pack_int32(krb5_int32 iarg, krb5_octet **bufp, size_t *remainp)
  *                                Update buffer pointer and remaining space.
  */
 krb5_error_code KRB5_CALLCONV
-krb5_ser_pack_int64(krb5_int64 iarg, krb5_octet **bufp, size_t *remainp)
+krb5_ser_pack_int64(int64_t iarg, krb5_octet **bufp, size_t *remainp)
 {
-    if (*remainp >= sizeof(krb5_int64)) {
+    if (*remainp >= sizeof(int64_t)) {
         store_64_be(iarg, (unsigned char *)*bufp);
-        *bufp += sizeof(krb5_int64);
-        *remainp -= sizeof(krb5_int64);
+        *bufp += sizeof(int64_t);
+        *remainp -= sizeof(int64_t);
         return(0);
     }
     else
@@ -240,12 +240,12 @@ krb5_ser_unpack_int32(krb5_int32 *intp, krb5_octet **bufp, size_t *remainp)
  * krb5_ser_unpack_int64()      - Unpack an 8-byte integer if it's there.
  */
 krb5_error_code KRB5_CALLCONV
-krb5_ser_unpack_int64(krb5_int64 *intp, krb5_octet **bufp, size_t *remainp)
+krb5_ser_unpack_int64(int64_t *intp, krb5_octet **bufp, size_t *remainp)
 {
-    if (*remainp >= sizeof(krb5_int64)) {
+    if (*remainp >= sizeof(int64_t)) {
         *intp = load_64_be((unsigned char *)*bufp);
-        *bufp += sizeof(krb5_int64);
-        *remainp -= sizeof(krb5_int64);
+        *bufp += sizeof(int64_t);
+        *remainp -= sizeof(int64_t);
         return(0);
     }
     else