Rename u_intXX_t to uintXX_t
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17442 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -199,7 +199,7 @@ ipv4_mask_boundary(krb5_context context, const krb5_address *inaddr,
|
||||
unsigned long len, krb5_address *low, krb5_address *high)
|
||||
{
|
||||
unsigned long ia;
|
||||
u_int32_t l, h, m = 0xffffffff;
|
||||
uint32_t l, h, m = 0xffffffff;
|
||||
|
||||
if (len > 32) {
|
||||
krb5_set_error_string(context, "IPv4 prefix too large (%ld)", len);
|
||||
@@ -391,7 +391,7 @@ ipv6_mask_boundary(krb5_context context, const krb5_address *inaddr,
|
||||
unsigned long len, krb5_address *low, krb5_address *high)
|
||||
{
|
||||
struct in6_addr addr, laddr, haddr;
|
||||
u_int32_t m;
|
||||
uint32_t m;
|
||||
int i, sub_len;
|
||||
|
||||
if (len > 128) {
|
||||
|
@@ -271,7 +271,7 @@ process_reply (krb5_context context,
|
||||
krb5_error_code ret;
|
||||
u_char reply[1024 * 3];
|
||||
ssize_t len;
|
||||
u_int16_t pkt_len, pkt_ver;
|
||||
uint16_t pkt_len, pkt_ver;
|
||||
krb5_data ap_rep_data;
|
||||
int save_errno;
|
||||
|
||||
|
@@ -62,8 +62,8 @@ _krb5_crc_init_table(void)
|
||||
flag = 1;
|
||||
}
|
||||
|
||||
u_int32_t
|
||||
_krb5_crc_update (const char *p, size_t len, u_int32_t res)
|
||||
uint32_t
|
||||
_krb5_crc_update (const char *p, size_t len, uint32_t res)
|
||||
{
|
||||
while (len--)
|
||||
res = table[(res ^ *p++) & 0xFF] ^ (res >> 8);
|
||||
|
@@ -602,7 +602,7 @@ AES_string_to_key(krb5_context context,
|
||||
krb5_keyblock *key)
|
||||
{
|
||||
krb5_error_code ret;
|
||||
u_int32_t iter;
|
||||
uint32_t iter;
|
||||
struct encryption_type *et;
|
||||
struct key_data kd;
|
||||
|
||||
@@ -611,7 +611,7 @@ AES_string_to_key(krb5_context context,
|
||||
else if (opaque.length == 4) {
|
||||
unsigned long v;
|
||||
_krb5_get_int(opaque.data, &v, 4);
|
||||
iter = ((u_int32_t)v);
|
||||
iter = ((uint32_t)v);
|
||||
} else
|
||||
return KRB5_PROG_KEYTYPE_NOSUPP; /* XXX */
|
||||
|
||||
@@ -1296,7 +1296,7 @@ CRC32_checksum(krb5_context context,
|
||||
unsigned usage,
|
||||
Checksum *C)
|
||||
{
|
||||
u_int32_t crc;
|
||||
uint32_t crc;
|
||||
unsigned char *r = C->checksum.data;
|
||||
_krb5_crc_init_table ();
|
||||
crc = _krb5_crc_update (data, len, 0);
|
||||
@@ -4282,7 +4282,7 @@ _krb5_pk_octetstring2key(krb5_context context,
|
||||
static krb5_error_code
|
||||
krb5_get_keyid(krb5_context context,
|
||||
krb5_keyblock *key,
|
||||
u_int32_t *keyid)
|
||||
uint32_t *keyid)
|
||||
{
|
||||
MD5_CTX md5;
|
||||
unsigned char tmp[16];
|
||||
@@ -4300,7 +4300,7 @@ krb5_crypto_debug(krb5_context context,
|
||||
size_t len,
|
||||
krb5_keyblock *key)
|
||||
{
|
||||
u_int32_t keyid;
|
||||
uint32_t keyid;
|
||||
char *kt;
|
||||
krb5_get_keyid(context, key, &keyid);
|
||||
krb5_enctype_to_string(context, key->keytype, &kt);
|
||||
|
@@ -38,11 +38,11 @@ RCSID("$Id$");
|
||||
krb5_error_code KRB5_LIB_FUNCTION
|
||||
krb5_generate_seq_number(krb5_context context,
|
||||
const krb5_keyblock *key,
|
||||
u_int32_t *seqno)
|
||||
uint32_t *seqno)
|
||||
{
|
||||
krb5_error_code ret;
|
||||
krb5_keyblock *subkey;
|
||||
u_int32_t q;
|
||||
uint32_t q;
|
||||
u_char *p;
|
||||
int i;
|
||||
|
||||
|
@@ -53,7 +53,7 @@ typedef struct krb5_kcmcache {
|
||||
|
||||
#define KCMCACHE(X) ((krb5_kcmcache *)(X)->data.data)
|
||||
#define CACHENAME(X) (KCMCACHE(X)->name)
|
||||
#define KCMCURSOR(C) (*(u_int32_t *)(C))
|
||||
#define KCMCURSOR(C) (*(uint32_t *)(C))
|
||||
|
||||
static krb5_error_code
|
||||
try_door(krb5_context context, const krb5_kcmcache *k,
|
||||
@@ -903,7 +903,7 @@ _krb5_kcm_noop(krb5_context context,
|
||||
krb5_error_code
|
||||
_krb5_kcm_chmod(krb5_context context,
|
||||
krb5_ccache id,
|
||||
u_int16_t mode)
|
||||
uint16_t mode)
|
||||
{
|
||||
krb5_error_code ret;
|
||||
krb5_kcmcache *k = KCMCACHE(id);
|
||||
@@ -944,8 +944,8 @@ _krb5_kcm_chmod(krb5_context context,
|
||||
krb5_error_code
|
||||
_krb5_kcm_chown(krb5_context context,
|
||||
krb5_ccache id,
|
||||
u_int32_t uid,
|
||||
u_int32_t gid)
|
||||
uint32_t uid,
|
||||
uint32_t gid)
|
||||
{
|
||||
krb5_error_code ret;
|
||||
krb5_kcmcache *k = KCMCACHE(id);
|
||||
|
@@ -119,7 +119,7 @@
|
||||
struct ktext {
|
||||
unsigned int length; /* Length of the text */
|
||||
unsigned char dat[MAX_KTXT_LEN]; /* The data itself */
|
||||
u_int32_t mbz; /* zero to catch runaway strings */
|
||||
uint32_t mbz; /* zero to catch runaway strings */
|
||||
};
|
||||
|
||||
struct credentials {
|
||||
@@ -157,11 +157,11 @@ struct _krb5_krb_auth_data {
|
||||
char *pname; /* Principal's name */
|
||||
char *pinst; /* His Instance */
|
||||
char *prealm; /* His Realm */
|
||||
u_int32_t checksum; /* Data checksum (opt) */
|
||||
uint32_t checksum; /* Data checksum (opt) */
|
||||
krb5_keyblock session; /* Session Key */
|
||||
unsigned char life; /* Life of ticket */
|
||||
u_int32_t time_sec; /* Time ticket issued */
|
||||
u_int32_t address; /* Address in ticket */
|
||||
uint32_t time_sec; /* Time ticket issued */
|
||||
uint32_t address; /* Address in ticket */
|
||||
};
|
||||
|
||||
time_t _krb5_krb_life_to_time (int, int);
|
||||
|
@@ -64,7 +64,7 @@ typedef int32_t krb5_error_code;
|
||||
|
||||
typedef int krb5_kvno;
|
||||
|
||||
typedef u_int32_t krb5_flags;
|
||||
typedef uint32_t krb5_flags;
|
||||
|
||||
typedef void *krb5_pointer;
|
||||
typedef const void *krb5_const_pointer;
|
||||
@@ -487,7 +487,7 @@ typedef struct krb5_keytab_entry {
|
||||
krb5_principal principal;
|
||||
krb5_kvno vno;
|
||||
krb5_keyblock keyblock;
|
||||
u_int32_t timestamp;
|
||||
uint32_t timestamp;
|
||||
} krb5_keytab_entry;
|
||||
|
||||
typedef struct krb5_kt_cursor {
|
||||
@@ -531,7 +531,7 @@ typedef struct krb5_keytab_key_proc_args krb5_keytab_key_proc_args;
|
||||
typedef struct krb5_replay_data {
|
||||
krb5_timestamp timestamp;
|
||||
int32_t usec;
|
||||
u_int32_t seq;
|
||||
uint32_t seq;
|
||||
} krb5_replay_data;
|
||||
|
||||
/* flags for krb5_auth_con_setflags */
|
||||
@@ -564,8 +564,8 @@ typedef struct krb5_auth_context_data {
|
||||
krb5_keyblock *local_subkey;
|
||||
krb5_keyblock *remote_subkey;
|
||||
|
||||
u_int32_t local_seqnumber;
|
||||
u_int32_t remote_seqnumber;
|
||||
uint32_t local_seqnumber;
|
||||
uint32_t remote_seqnumber;
|
||||
|
||||
krb5_authenticator authenticator;
|
||||
|
||||
|
@@ -84,7 +84,7 @@ enum {
|
||||
};
|
||||
|
||||
typedef int32_t cc_int32;
|
||||
typedef u_int32_t cc_uint32;
|
||||
typedef uint32_t cc_uint32;
|
||||
typedef struct cc_context_t *cc_context_t;
|
||||
typedef struct cc_ccache_t *cc_ccache_t;
|
||||
typedef struct cc_ccache_iterator_t *cc_ccache_iterator_t;
|
||||
|
@@ -126,15 +126,15 @@ Kerberos 5 Library (libkrb5, -lkrb5)
|
||||
.Ft krb5_error_code
|
||||
.Fn krb5_ret_int32 "krb5_storage *sp" "int32_t *value"
|
||||
.Ft krb5_error_code
|
||||
.Fn krb5_ret_uint32 "krb5_storage *sp" "u_int32_t *value"
|
||||
.Fn krb5_ret_uint32 "krb5_storage *sp" "uint32_t *value"
|
||||
.Ft krb5_error_code
|
||||
.Fn krb5_store_uint32 "krb5_storage *sp" "u_int32_t value"
|
||||
.Fn krb5_store_uint32 "krb5_storage *sp" "uint32_t value"
|
||||
.Ft krb5_error_code
|
||||
.Fn krb5_store_int16 "krb5_storage *sp" "int16_t value"
|
||||
.Ft krb5_error_code
|
||||
.Fn krb5_ret_int16 "krb5_storage *sp" "int16_t *value"
|
||||
.Ft krb5_error_code
|
||||
.Fn krb5_store_uint16 "krb5_storage *sp" "u_int16_t value"
|
||||
.Fn krb5_store_uint16 "krb5_storage *sp" "uint16_t value"
|
||||
.Ft krb5_error_code
|
||||
.Fn krb5_ret_uint16 "krb5_storage *sp" "u_int16_t *value"
|
||||
.Ft krb5_error_code
|
||||
|
@@ -41,8 +41,8 @@ krb5_read_message (krb5_context context,
|
||||
krb5_data *data)
|
||||
{
|
||||
krb5_error_code ret;
|
||||
u_int32_t len;
|
||||
u_int8_t buf[4];
|
||||
uint32_t len;
|
||||
uint8_t buf[4];
|
||||
|
||||
krb5_data_zero(data);
|
||||
|
||||
|
@@ -77,7 +77,7 @@ krb5_recvauth_match_version(krb5_context context,
|
||||
const char *version = KRB5_SENDAUTH_VERSION;
|
||||
char her_version[sizeof(KRB5_SENDAUTH_VERSION)];
|
||||
char *her_appl_version;
|
||||
u_int32_t len;
|
||||
uint32_t len;
|
||||
u_char repl;
|
||||
krb5_data data;
|
||||
krb5_flags ap_options;
|
||||
|
@@ -78,7 +78,7 @@ krb5_sendauth(krb5_context context,
|
||||
krb5_creds **out_creds)
|
||||
{
|
||||
krb5_error_code ret;
|
||||
u_int32_t len, net_len;
|
||||
uint32_t len, net_len;
|
||||
const char *version = KRB5_SENDAUTH_VERSION;
|
||||
u_char repl;
|
||||
krb5_data ap_req, error_data;
|
||||
|
@@ -463,10 +463,10 @@ _krb5_krb_create_ciph(krb5_context context,
|
||||
const char *service,
|
||||
const char *instance,
|
||||
const char *realm,
|
||||
u_int32_t life,
|
||||
uint32_t life,
|
||||
unsigned char kvno,
|
||||
const krb5_data *ticket,
|
||||
u_int32_t kdc_time,
|
||||
uint32_t kdc_time,
|
||||
const krb5_keyblock *key,
|
||||
krb5_data *enc_data)
|
||||
{
|
||||
@@ -523,7 +523,7 @@ _krb5_krb_create_auth_reply(krb5_context context,
|
||||
const char *prealm,
|
||||
int32_t time_ws,
|
||||
int n,
|
||||
u_int32_t x_date,
|
||||
uint32_t x_date,
|
||||
unsigned char kvno,
|
||||
const krb5_data *cipher,
|
||||
krb5_data *data)
|
||||
@@ -573,8 +573,8 @@ _krb5_krb_cr_err_reply(krb5_context context,
|
||||
const char *name,
|
||||
const char *inst,
|
||||
const char *realm,
|
||||
u_int32_t time_ws,
|
||||
u_int32_t e,
|
||||
uint32_t time_ws,
|
||||
uint32_t e,
|
||||
const char *e_string,
|
||||
krb5_data *data)
|
||||
{
|
||||
@@ -744,9 +744,9 @@ _krb5_krb_rd_req(krb5_context context,
|
||||
int8_t pvno;
|
||||
int8_t type;
|
||||
int8_t s_kvno;
|
||||
u_int8_t ticket_length;
|
||||
u_int8_t eaut_length;
|
||||
u_int8_t time_5ms;
|
||||
uint8_t ticket_length;
|
||||
uint8_t eaut_length;
|
||||
uint8_t time_5ms;
|
||||
char *realm = NULL;
|
||||
char *sname = NULL;
|
||||
char *sinstance = NULL;
|
||||
@@ -754,7 +754,7 @@ _krb5_krb_rd_req(krb5_context context,
|
||||
char *r_name = NULL;
|
||||
char *r_instance = NULL;
|
||||
|
||||
u_int32_t r_time_sec; /* Coarse time from authenticator */
|
||||
uint32_t r_time_sec; /* Coarse time from authenticator */
|
||||
unsigned long delta_t; /* Time in authenticator - local time */
|
||||
long tkt_age; /* Age of ticket */
|
||||
|
||||
|
@@ -40,8 +40,8 @@ krb5_write_message (krb5_context context,
|
||||
krb5_pointer p_fd,
|
||||
krb5_data *data)
|
||||
{
|
||||
u_int32_t len;
|
||||
u_int8_t buf[4];
|
||||
uint32_t len;
|
||||
uint8_t buf[4];
|
||||
int ret;
|
||||
|
||||
len = data->length;
|
||||
|
Reference in New Issue
Block a user