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.

10 files changed, 28 insertions, 31 deletions

diff --git a/src/lib/gssapi/generic/gssapiP_generic.h b/src/lib/gssapi/generic/gssapiP_generic.h
index 706805d57..16da0fb83 100644
--- a/src/lib/gssapi/generic/gssapiP_generic.h
+++ b/src/lib/gssapi/generic/gssapiP_generic.h
@@ -47,7 +47,6 @@
 
 #include "k5-platform.h"
 #include "k5-buf.h"
-typedef UINT64_TYPE gssint_uint64;
 
 /** helper macros **/
 
@@ -173,10 +172,10 @@ OM_uint32 g_display_com_err_status (OM_uint32 *minor_status,
                                     OM_uint32 status_value,
                                     gss_buffer_t status_string);
 
-gss_int32 g_order_init (void **queue, gssint_uint64 seqnum,
+gss_int32 g_order_init (void **queue, uint64_t seqnum,
                         int do_replay, int do_sequence, int wide);
 
-gss_int32 g_order_check (void **queue, gssint_uint64 seqnum);
+gss_int32 g_order_check (void **queue, uint64_t seqnum);
 
 void g_order_free (void **queue);
 
diff --git a/src/lib/gssapi/generic/util_ordering.c b/src/lib/gssapi/generic/util_ordering.c
index 95609a992..9a1ce8966 100644
--- a/src/lib/gssapi/generic/util_ordering.c
+++ b/src/lib/gssapi/generic/util_ordering.c
@@ -39,14 +39,14 @@ typedef struct _queue {
     int do_sequence;
     int start;
     int length;
-    gssint_uint64 firstnum;
+    uint64_t firstnum;
     /* Stored as deltas from firstnum.  This way, the high bit won't
        overflow unless we've actually gone through 2**n messages, or
        gotten something *way* out of sequence.  */
-    gssint_uint64 elem[QUEUE_LENGTH];
+    uint64_t elem[QUEUE_LENGTH];
     /* All ones for 64-bit sequence numbers; 32 ones for 32-bit
        sequence numbers.  */
-    gssint_uint64 mask;
+    uint64_t mask;
 } queue;
 
 /* rep invariant:
@@ -58,7 +58,7 @@ typedef struct _queue {
 #define QELEM(q,i) ((q)->elem[(i)%QSIZE(q)])
 
 static void
-queue_insert(queue *q, int after, gssint_uint64 seqnum)
+queue_insert(queue *q, int after, uint64_t seqnum)
 {
     /* insert.  this is not the fastest way, but it's easy, and it's
        optimized for insert at end, which is the common case */
@@ -89,7 +89,7 @@ queue_insert(queue *q, int after, gssint_uint64 seqnum)
 }
 
 gss_int32
-g_order_init(void **vqueue, gssint_uint64 seqnum,
+g_order_init(void **vqueue, uint64_t seqnum,
              int do_replay, int do_sequence, int wide_nums)
 {
     queue *q;
@@ -105,23 +105,23 @@ g_order_init(void **vqueue, gssint_uint64 seqnum,
 
     q->do_replay = do_replay;
     q->do_sequence = do_sequence;
-    q->mask = wide_nums ? ~(gssint_uint64)0 : 0xffffffffUL;
+    q->mask = wide_nums ? ~(uint64_t)0 : 0xffffffffUL;
 
     q->start = 0;
     q->length = 1;
     q->firstnum = seqnum;
-    q->elem[q->start] = ((gssint_uint64)0 - 1) & q->mask;
+    q->elem[q->start] = ((uint64_t)0 - 1) & q->mask;
 
     *vqueue = (void *) q;
     return(0);
 }
 
 gss_int32
-g_order_check(void **vqueue, gssint_uint64 seqnum)
+g_order_check(void **vqueue, uint64_t seqnum)
 {
     queue *q;
     int i;
-    gssint_uint64 expected;
+    uint64_t expected;
 
     q = (queue *) (*vqueue);
 
diff --git a/src/lib/gssapi/krb5/gssapiP_krb5.h b/src/lib/gssapi/krb5/gssapiP_krb5.h
index 8e4f6d947..ef71a5aa3 100644
--- a/src/lib/gssapi/krb5/gssapiP_krb5.h
+++ b/src/lib/gssapi/krb5/gssapiP_krb5.h
@@ -221,8 +221,8 @@ typedef struct _krb5_gss_ctx_id_rec {
     /* XXX these used to be signed.  the old spec is inspecific, and
        the new spec specifies unsigned.  I don't believe that the change
        affects the wire encoding. */
-    gssint_uint64 seq_send;
-    gssint_uint64 seq_recv;
+    uint64_t seq_send;
+    uint64_t seq_recv;
     void *seqstate;
     krb5_context k5_context;
     krb5_auth_context auth_context;
diff --git a/src/lib/gssapi/krb5/gssapi_krb5.h b/src/lib/gssapi/krb5/gssapi_krb5.h
index 1271f27bb..3f4d0c0cf 100644
--- a/src/lib/gssapi/krb5/gssapi_krb5.h
+++ b/src/lib/gssapi/krb5/gssapi_krb5.h
@@ -93,8 +93,6 @@ GSS_DLLIMP extern const gss_OID_desc krb5_gss_oid_array[];
 #define gss_krb5_nt_machine_uid_name    gss_nt_machine_uid_name
 #define gss_krb5_nt_string_uid_name     gss_nt_string_uid_name
 
-typedef uint64_t gss_uint64;
-
 typedef struct gss_krb5_lucid_key {
     OM_uint32       type;           /* key encryption type */
     OM_uint32       length;         /* length of key data */
@@ -126,8 +124,8 @@ typedef struct gss_krb5_lucid_context_v1 {
                                        MUST be at beginning of struct! */
     OM_uint32       initiate;       /* Are we the initiator? */
     OM_uint32       endtime;        /* expiration time of context */
-    gss_uint64      send_seq;       /* sender sequence number */
-    gss_uint64      recv_seq;       /* receive sequence number */
+    uint64_t        send_seq;       /* sender sequence number */
+    uint64_t        recv_seq;       /* receive sequence number */
     OM_uint32       protocol;       /* 0: rfc1964,
                                        1: draft-ietf-krb-wg-gssapi-cfx-07 */
     /*
diff --git a/src/lib/gssapi/krb5/k5seal.c b/src/lib/gssapi/krb5/k5seal.c
index bd1e2a6d0..7665cbae9 100644
--- a/src/lib/gssapi/krb5/k5seal.c
+++ b/src/lib/gssapi/krb5/k5seal.c
@@ -55,7 +55,7 @@ static krb5_error_code
 make_seal_token_v1 (krb5_context context,
                     krb5_key enc,
                     krb5_key seq,
-                    gssint_uint64 *seqnum,
+                    uint64_t *seqnum,
                     int direction,
                     gss_buffer_t text,
                     gss_buffer_t token,
diff --git a/src/lib/gssapi/krb5/k5sealv3.c b/src/lib/gssapi/krb5/k5sealv3.c
index e4c2c2f8f..429dc8e33 100644
--- a/src/lib/gssapi/krb5/k5sealv3.c
+++ b/src/lib/gssapi/krb5/k5sealv3.c
@@ -305,7 +305,7 @@ gss_krb5int_unseal_token_v3(krb5_context *contextptr,
 {
     krb5_context context = *contextptr;
     krb5_data plain;
-    gssint_uint64 seqnum;
+    uint64_t seqnum;
     size_t ec, rrc;
     int key_usage;
     unsigned char acceptor_flag;
diff --git a/src/lib/gssapi/krb5/k5sealv3iov.c b/src/lib/gssapi/krb5/k5sealv3iov.c
index 8f6c4d441..1cf0c2e50 100644
--- a/src/lib/gssapi/krb5/k5sealv3iov.c
+++ b/src/lib/gssapi/krb5/k5sealv3iov.c
@@ -294,7 +294,7 @@ gss_krb5int_unseal_v3_iov(krb5_context context,
     size_t rrc, ec;
     size_t data_length, assoc_data_length;
     krb5_key key;
-    gssint_uint64 seqnum;
+    uint64_t seqnum;
     krb5_boolean valid;
     krb5_cksumtype cksumtype;
     int conf_flag = 0;
diff --git a/src/lib/gssapi/krb5/k5unseal.c b/src/lib/gssapi/krb5/k5unseal.c
index ca21d43a9..ef7a745ca 100644
--- a/src/lib/gssapi/krb5/k5unseal.c
+++ b/src/lib/gssapi/krb5/k5unseal.c
@@ -435,7 +435,7 @@ kg_unseal_v1(context, minor_status, ctx, ptr, bodysize, message_buffer,
         return(GSS_S_BAD_SIG);
     }
 
-    retval = g_order_check(&(ctx->seqstate), (gssint_uint64)seqnum);
+    retval = g_order_check(&(ctx->seqstate), (uint64_t)seqnum);
 
     /* success or ordering violation */
 
diff --git a/src/lib/gssapi/krb5/k5unsealiov.c b/src/lib/gssapi/krb5/k5unsealiov.c
index e34bda475..dc01180b1 100644
--- a/src/lib/gssapi/krb5/k5unsealiov.c
+++ b/src/lib/gssapi/krb5/k5unsealiov.c
@@ -280,7 +280,7 @@ kg_unseal_v1_iov(krb5_context context,
     }
 
     code = 0;
-    retval = g_order_check(&ctx->seqstate, (gssint_uint64)seqnum);
+    retval = g_order_check(&ctx->seqstate, (uint64_t)seqnum);
 
 cleanup:
     krb5_free_checksum_contents(context, &md5cksum);
diff --git a/src/lib/gssapi/krb5/ser_sctx.c b/src/lib/gssapi/krb5/ser_sctx.c
index cba5ae2b1..8f86acc95 100644
--- a/src/lib/gssapi/krb5/ser_sctx.c
+++ b/src/lib/gssapi/krb5/ser_sctx.c
@@ -262,8 +262,8 @@ kg_ctx_size(kcontext, arg, sizep)
      *  krb5_int32      for endtime.
      *  krb5_int32      for renew_till.
      *  krb5_int32      for flags.
-     *  krb5_int64      for seq_send.
-     *  krb5_int64      for seq_recv.
+     *  int64_t         for seq_send.
+     *  int64_t         for seq_recv.
      *  ...             for seqstate
      *  ...             for auth_context
      *  ...             for mech_used
@@ -279,7 +279,7 @@ kg_ctx_size(kcontext, arg, sizep)
     kret = EINVAL;
     if ((ctx = (krb5_gss_ctx_id_rec *) arg)) {
         required = 21*sizeof(krb5_int32);
-        required += 2*sizeof(krb5_int64);
+        required += 2*sizeof(int64_t);
         required += sizeof(ctx->seed);
 
         kret = 0;
@@ -425,9 +425,9 @@ kg_ctx_externalize(kcontext, arg, buffer, lenremain)
                                        &bp, &remain);
             (void) krb5_ser_pack_int32((krb5_int32) ctx->krb_flags,
                                        &bp, &remain);
-            (void) (*kaccess.ser_pack_int64)((krb5_int64) ctx->seq_send,
+            (void) (*kaccess.ser_pack_int64)((int64_t) ctx->seq_send,
                                              &bp, &remain);
-            (void) (*kaccess.ser_pack_int64)((krb5_int64) ctx->seq_recv,
+            (void) (*kaccess.ser_pack_int64)((int64_t) ctx->seq_recv,
                                              &bp, &remain);
 
             /* Now dynamic data */
@@ -596,7 +596,7 @@ kg_ctx_internalize(kcontext, argp, buffer, lenremain)
 
         /* Get a context */
         if ((remain >= (17*sizeof(krb5_int32)
-                        + 2*sizeof(krb5_int64)
+                        + 2*sizeof(int64_t)
                         + sizeof(ctx->seed))) &&
             (ctx = (krb5_gss_ctx_id_rec *)
              xmalloc(sizeof(krb5_gss_ctx_id_rec)))) {
@@ -635,9 +635,9 @@ kg_ctx_internalize(kcontext, argp, buffer, lenremain)
             ctx->krb_times.renew_till = (krb5_timestamp) ibuf;
             (void) krb5_ser_unpack_int32(&ibuf, &bp, &remain);
             ctx->krb_flags = (krb5_flags) ibuf;
-            (void) (*kaccess.ser_unpack_int64)((krb5_int64 *)&ctx->seq_send,
+            (void) (*kaccess.ser_unpack_int64)((int64_t *)&ctx->seq_send,
                                                &bp, &remain);
-            kret = (*kaccess.ser_unpack_int64)((krb5_int64 *)&ctx->seq_recv,
+            kret = (*kaccess.ser_unpack_int64)((int64_t *)&ctx->seq_recv,
                                                &bp, &remain);
             if (kret) {
                 free(ctx);