oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Rename u_intXX_t to uintXX_t

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17450 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-05-05 11:11:43 +00:00
parent f7a60ed8e3
commit 5118c90498
25 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
appl/ftp/ftp/krb4.c
View File

@@ -121,7 +121,7 @@ krb4_adat(void *app_data, void *buf, size_t len)
AUTH_DAT auth_dat;
char *p;
int kerror;
u_int32_t cs;
uint32_t cs;
char msg[35]; /* size of encrypted block */
int tmp_len;
struct krb4_data *d = app_data;
@@ -240,7 +240,7 @@ krb4_auth(void *app_data, char *host)
KTEXT_ST adat;
MSG_DAT msg_data;
int checksum;
u_int32_t cs;
uint32_t cs;
struct krb4_data *d = app_data;
struct sockaddr_in *localaddr = (struct sockaddr_in *)LOCAL_ADDR;
struct sockaddr_in *remoteaddr = (struct sockaddr_in *)REMOTE_ADDR;

6
appl/kx/common.c
View File

@@ -37,7 +37,7 @@ RCSID("$Id$");
char x_socket[MaxPathLen];
u_int32_t display_num;
uint32_t display_num;
char display[MaxPathLen];
int display_size = sizeof(display);
char xauthfile[MaxPathLen];
@@ -782,7 +782,7 @@ suspicious_address (int sock, struct sockaddr *addr)
#ifndef KRB4
int
krb_get_int(void *f, u_int32_t *to, int size, int lsb)
krb_get_int(void *f, uint32_t *to, int size, int lsb)
{
int i;
unsigned char *from = (unsigned char *)f;
@@ -799,7 +799,7 @@ krb_get_int(void *f, u_int32_t *to, int size, int lsb)
}
int
krb_put_int(u_int32_t from, void *to, size_t rem, int size)
krb_put_int(uint32_t from, void *to, size_t rem, int size)
{
int i;
unsigned char *p = (unsigned char *)to;

2
appl/kx/krb5.c
View File

@@ -352,7 +352,7 @@ krb5_make_context (kx_context *kc)
int
recv_v5_auth (kx_context *kc, int sock, u_char *buf)
{
u_int32_t len;
uint32_t len;
krb5_error_code ret;
krb5_principal server;
krb5_auth_context auth_context = NULL;

8
appl/kx/kx.c
View File

@@ -208,7 +208,7 @@ doit_passive (kx_context *kc)
int otherside;
u_char msg[1024], *p;
int len;
u_int32_t tmp;
uint32_t tmp;
const char *host = kc->host;
otherside = connect_host (kc);
@@ -352,7 +352,7 @@ doit_active (kx_context *kc)
char *str;
int i;
size_t rem;
u_int32_t other_port;
uint32_t other_port;
int error;
const char *host = kc->host;
@@ -417,7 +417,7 @@ doit_active (kx_context *kc)
err (1, "read from %s", host);
p = (u_char *)msg;
if (*p == ERROR) {
u_int32_t u32;
uint32_t u32;
p++;
p += krb_get_int (p, &u32, 4, 0);
@@ -478,7 +478,7 @@ doit_active (kx_context *kc)
err (1, "read from %s", host);
p = (u_char *)msg;
if (*p == ERROR) {
u_int32_t val;
uint32_t val;
p++;
p += krb_get_int (p, &val, 4, 0);

6
appl/kx/kx.h
View File

@@ -147,7 +147,7 @@ struct x_socket {
};
extern char x_socket[];
extern u_int32_t display_num;
extern uint32_t display_num;
extern char display[];
extern int display_size;
extern char xauthfile[];
@@ -259,9 +259,9 @@ __attribute__ ((format (printf, 3, 4)))
#ifndef KRB4
int
krb_get_int(void *f, u_int32_t *to, int size, int lsb);
krb_get_int(void *f, uint32_t *to, int size, int lsb);
int
krb_put_int(u_int32_t from, void *to, size_t rem, int size);
krb_put_int(uint32_t from, void *to, size_t rem, int size);
#endif

2
appl/kx/kxd.c
View File

@@ -119,7 +119,7 @@ recv_conn (int sock, kx_context *kc,
int ret = 1;
int flags;
int len;
u_int32_t tmp32;
uint32_t tmp32;
memset(kc, 0, sizeof(*kc));
*nsockets = 0;

4
appl/popper/auth_krb4.c
View File

@@ -43,7 +43,7 @@ RCSID("$Id$");
struct krb4_state {
int stage;
u_int32_t nonce;
uint32_t nonce;
};
static int
@@ -128,7 +128,7 @@ krb4_loop(POP *p, void *state,
}
if(ks->stage == 2) {
u_int32_t nonce_reply;
uint32_t nonce_reply;
/* C -> S: nonce | bit | max segment | username */
if (input_length % 8 != 0) {

2
appl/popper/pop_init.c
View File

@@ -103,7 +103,7 @@ krb5_authenticate (POP *p, int s, u_char *buf, struct sockaddr *addr)
{
krb5_error_code ret;
krb5_auth_context auth_context = NULL;
u_int32_t len;
uint32_t len;
krb5_ticket *ticket;
char *server;

2
appl/rsh/common.c
View File

@@ -82,7 +82,7 @@ do_read (int fd, void *buf, size_t sz, void *ivec)
#ifdef KRB5
if(auth_method == AUTH_KRB5) {
krb5_error_code ret;
u_int32_t len, outer_len;
uint32_t len, outer_len;
int status;
krb5_data data;
void *edata;

2
appl/rsh/rshd.c
View File

@@ -314,7 +314,7 @@ recv_krb5_auth (int s, u_char *buf,
char **server_username,
char **cmd)
{
u_int32_t len;
uint32_t len;
krb5_auth_context auth_context = NULL;
krb5_ticket *ticket;
krb5_error_code status;

4
appl/telnet/libtelnet/kerberos.c
View File

@@ -652,7 +652,7 @@ static int
unpack_cred(unsigned char *buf, int len, CREDENTIALS *cred)
{
char *p = (char*)buf;
u_int32_t tmp;
uint32_t tmp;
strncpy (cred->service, p, ANAME_SZ);
cred->service[ANAME_SZ - 1] = '\0';
@@ -676,7 +676,7 @@ unpack_cred(unsigned char *buf, int len, CREDENTIALS *cred)
p += cred->ticket_st.length;
p += krb_get_int(p, &tmp, 4, 0);
cred->ticket_st.mbz = 0;
p += krb_get_int(p, (u_int32_t *)&cred->issue_date, 4, 0);
p += krb_get_int(p, (uint32_t *)&cred->issue_date, 4, 0);
strncpy (cred->pname, p, ANAME_SZ);
cred->pname[ANAME_SZ - 1] = '\0';

4
appl/test/gss_common.c
View File

@@ -39,7 +39,7 @@ RCSID("$Id$");
void
write_token (int sock, gss_buffer_t buf)
{
u_int32_t len, net_len;
uint32_t len, net_len;
OM_uint32 min_stat;
len = buf->length;
@@ -69,7 +69,7 @@ enet_read(int fd, void *buf, size_t len)
void
read_token (int sock, gss_buffer_t buf)
{
u_int32_t len, net_len;
uint32_t len, net_len;
enet_read (sock, &net_len, 4);
len = ntohl(net_len);

4
appl/test/nt_gss_common.c
View File

@@ -51,7 +51,7 @@ void
nt_write_token (int sock, gss_buffer_t buf)
{
unsigned char net_len[4];
u_int32_t len;
uint32_t len;
OM_uint32 min_stat;
len = buf->length;
@@ -77,7 +77,7 @@ void
nt_read_token (int sock, gss_buffer_t buf)
{
unsigned char net_len[4];
u_int32_t len;
uint32_t len;
if (read(sock, net_len, 4) != 4)
err (1, "read");

2
appl/test/tcp_client.c
View File

@@ -44,7 +44,7 @@ proto (int sock, const char *hostname, const char *service)
krb5_principal server;
krb5_data data;
krb5_data packet;
u_int32_t len, net_len;
uint32_t len, net_len;
status = krb5_auth_con_init (context, &auth_context);
if (status)

2
appl/test/tcp_server.c
View File

@@ -47,7 +47,7 @@ proto (int sock, const char *service)
char hostname[MAXHOSTNAMELEN];
krb5_data packet;
krb5_data data;
u_int32_t len, net_len;
uint32_t len, net_len;
ssize_t n;
status = krb5_auth_con_init (context, &auth_context);

2
lib/des/aes.h
View File

@@ -54,7 +54,7 @@
#define AES_DECRYPT 0
typedef struct aes_key {
u_int32_t key[(AES_MAXNR+1)*4];
uint32_t key[(AES_MAXNR+1)*4];
int rounds;
} AES_KEY;

4
lib/des/hash.h
View File

@@ -61,8 +61,8 @@
#define CRAYFIX(X) (X)
#endif
static inline u_int32_t
cshift (u_int32_t x, unsigned int n)
static inline uint32_t
cshift (uint32_t x, unsigned int n)
{
x = CRAYFIX(x);
return CRAYFIX((x << n) | (x >> (32 - n)));

2
lib/des/md4.h
View File

@@ -49,7 +49,7 @@
struct md4 {
unsigned int sz[2];
u_int32_t counter[4];
uint32_t counter[4];
unsigned char save[64];
};

4
lib/des/md5.h
View File

@@ -49,7 +49,7 @@
struct md5 {
unsigned int sz[2];
u_int32_t counter[4];
uint32_t counter[4];
unsigned char save[64];
};
@@ -57,6 +57,6 @@ typedef struct md5 MD5_CTX;
void MD5_Init (struct md5 *m);
void MD5_Update (struct md5 *m, const void *p, size_t len);
void MD5_Final (void *res, struct md5 *m); /* u_int32_t res[4] */
void MD5_Final (void *res, struct md5 *m); /* uint32_t res[4] */
#endif /* HEIM_MD5_H */

8
lib/des/rijndael-alg-fst.h
View File

@@ -38,9 +38,9 @@
#define RIJNDAEL_MAXKB (256/8)
#define RIJNDAEL_MAXNR 14
int rijndaelKeySetupEnc(u_int32_t rk[/*4*(Nr + 1)*/], const u_int8_t cipherKey[], int keyBits);
int rijndaelKeySetupDec(u_int32_t rk[/*4*(Nr + 1)*/], const u_int8_t cipherKey[], int keyBits);
void rijndaelEncrypt(const u_int32_t rk[/*4*(Nr + 1)*/], int Nr, const u_int8_t pt[16], u_int8_t ct[16]);
void rijndaelDecrypt(const u_int32_t rk[/*4*(Nr + 1)*/], int Nr, const u_int8_t ct[16], u_int8_t pt[16]);
int rijndaelKeySetupEnc(uint32_t rk[/*4*(Nr + 1)*/], const uint8_t cipherKey[], int keyBits);
int rijndaelKeySetupDec(uint32_t rk[/*4*(Nr + 1)*/], const uint8_t cipherKey[], int keyBits);
void rijndaelEncrypt(const uint32_t rk[/*4*(Nr + 1)*/], int Nr, const uint8_t pt[16], uint8_t ct[16]);
void rijndaelDecrypt(const uint32_t rk[/*4*(Nr + 1)*/], int Nr, const uint8_t ct[16], uint8_t pt[16]);
#endif /* __RIJNDAEL_ALG_FST_H */

4
lib/des/sha.h
View File

@@ -52,7 +52,7 @@
struct sha {
unsigned int sz[2];
u_int32_t counter[5];
uint32_t counter[5];
unsigned char save[64];
};
@@ -70,7 +70,7 @@ void SHA1_Final (void *res, struct sha *m);
struct hc_sha256state {
unsigned int sz[2];
u_int32_t counter[8];
uint32_t counter[8];
unsigned char save[64];
};

6
lib/gssapi/gssapi.h
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997 - 2003 Kungliga Tekniska H<>gskolan
* Copyright (c) 1997 - 2006 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
@@ -47,9 +47,9 @@
* Now define the three implementation-dependent types.
*/
typedef u_int32_t OM_uint32;
typedef uint32_t OM_uint32;
typedef u_int32_t gss_uint32;
typedef uint32_t gss_uint32;
/*
* This is to avoid having to include <krb5.h>

6
lib/gssapi/krb5/gssapi.h
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997 - 2003 Kungliga Tekniska H<>gskolan
* Copyright (c) 1997 - 2006 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
@@ -47,9 +47,9 @@
* Now define the three implementation-dependent types.
*/
typedef u_int32_t OM_uint32;
typedef uint32_t OM_uint32;
typedef u_int32_t gss_uint32;
typedef uint32_t gss_uint32;
/*
* This is to avoid having to include <krb5.h>

20
lib/kadm5/admin.h
View File

@@ -140,7 +140,7 @@ typedef struct _kadm5_principal_ent_t {
krb5_kvno mkvno;
char * policy;
u_int32_t aux_attributes;
uint32_t aux_attributes;
krb5_deltat max_renewable_life;
krb5_timestamp last_success;
@@ -155,12 +155,12 @@ typedef struct _kadm5_principal_ent_t {
typedef struct _kadm5_policy_ent_t {
char *policy;
u_int32_t pw_min_life;
u_int32_t pw_max_life;
u_int32_t pw_min_length;
u_int32_t pw_min_classes;
u_int32_t pw_history_num;
u_int32_t policy_refcnt;
uint32_t pw_min_life;
uint32_t pw_max_life;
uint32_t pw_min_length;
uint32_t pw_min_classes;
uint32_t pw_history_num;
uint32_t policy_refcnt;
} kadm5_policy_ent_rec, *kadm5_policy_ent_t;
#define KADM5_CONFIG_REALM (1 << 0)
@@ -196,7 +196,7 @@ typedef struct {
}krb5_key_salt_tuple;
typedef struct _kadm5_config_params {
u_int32_t mask;
uint32_t mask;
/* Client and server fields */
char *realm;
@@ -228,7 +228,7 @@ kadm5_decrypt_key(void *server_handle,
kadm5_ret_t
kadm5_create_policy(void *server_handle,
kadm5_policy_ent_t policy, u_int32_t mask);
kadm5_policy_ent_t policy, uint32_t mask);
kadm5_ret_t
kadm5_delete_policy(void *server_handle, char *policy);
@@ -237,7 +237,7 @@ kadm5_delete_policy(void *server_handle, char *policy);
kadm5_ret_t
kadm5_modify_policy(void *server_handle,
kadm5_policy_ent_t policy,
u_int32_t mask);
uint32_t mask);
kadm5_ret_t
kadm5_get_policy(void *server_handle, char *policy, kadm5_policy_ent_t ent);

10
lib/kadm5/private.h
View File

@@ -39,15 +39,15 @@
struct kadm_func {
kadm5_ret_t (*chpass_principal) (void *, krb5_principal, const char*);
kadm5_ret_t (*create_principal) (void*, kadm5_principal_ent_t,
u_int32_t, const char*);
uint32_t, const char*);
kadm5_ret_t (*delete_principal) (void*, krb5_principal);
kadm5_ret_t (*destroy) (void*);
kadm5_ret_t (*flush) (void*);
kadm5_ret_t (*get_principal) (void*, krb5_principal,
kadm5_principal_ent_t, u_int32_t);
kadm5_principal_ent_t, uint32_t);
kadm5_ret_t (*get_principals) (void*, const char*, char***, int*);
kadm5_ret_t (*get_privs) (void*, u_int32_t*);
kadm5_ret_t (*modify_principal) (void*, kadm5_principal_ent_t, u_int32_t);
kadm5_ret_t (*get_privs) (void*, uint32_t*);
kadm5_ret_t (*modify_principal) (void*, kadm5_principal_ent_t, uint32_t);
kadm5_ret_t (*randkey_principal) (void*, krb5_principal,
krb5_keyblock**, int*);
kadm5_ret_t (*rename_principal) (void*, krb5_principal, krb5_principal);
@@ -73,7 +73,7 @@ typedef struct kadm5_log_peer {
typedef struct kadm5_log_context {
char *log_file;
int log_fd;
u_int32_t version;
uint32_t version;
struct sockaddr_un socket_name;
int socket_fd;
} kadm5_log_context;