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

use unsigned/size_t where approprite

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@22895 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2008-04-07 18:52:20 +00:00
parent a8c1ee8494
commit fe5323f0e5
17 changed files with 56 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
appl/telnet/libtelnet/auth-proto.h
View File

@@ -61,7 +61,7 @@ Authenticator *findauthenticator (int, int);
int auth_wait (char *, size_t);
void auth_disable_name (char *);
void auth_finished (Authenticator *, int);
void auth_gen_printsub (unsigned char *, int, unsigned char *, size_t);
void auth_gen_printsub (unsigned char *, size_t, unsigned char *, size_t);
void auth_init (const char *, int);
void auth_is (unsigned char *, int);
void auth_name(unsigned char*, int);
@@ -69,7 +69,7 @@ void auth_reply (unsigned char *, int);
void auth_request (void);
void auth_send (unsigned char *, int);
void auth_send_retry (void);
void auth_printsub(unsigned char*, int, unsigned char*, size_t);
void auth_printsub(unsigned char*, size_t, unsigned char*, size_t);
int getauthmask(char *type, int *maskp);
int auth_enable(char *type);
int auth_disable(char *type);
@@ -85,7 +85,7 @@ int unsafe_send (Authenticator *);
void unsafe_is (Authenticator *, unsigned char *, int);
void unsafe_reply (Authenticator *, unsigned char *, int);
int unsafe_status (Authenticator *, char *, int);
void unsafe_printsub (unsigned char *, int, unsigned char *, int);
void unsafe_printsub (unsigned char *, size_t, unsigned char *, size_t);
#endif
#ifdef SRA
@@ -94,7 +94,7 @@ int sra_send (Authenticator *);
void sra_is (Authenticator *, unsigned char *, int);
void sra_reply (Authenticator *, unsigned char *, int);
int sra_status (Authenticator *, char *, int);
void sra_printsub (unsigned char *, int, unsigned char *, int);
void sra_printsub (unsigned char *, size_t, unsigned char *, size_t);
#endif
#ifdef KRB4
@@ -104,7 +104,7 @@ int kerberos4_send_oneway (Authenticator *);
void kerberos4_is (Authenticator *, unsigned char *, int);
void kerberos4_reply (Authenticator *, unsigned char *, int);
int kerberos4_status (Authenticator *, char *, size_t, int);
void kerberos4_printsub (unsigned char *, int, unsigned char *, int);
void kerberos4_printsub (unsigned char *, size_t, unsigned char *, size_t);
int kerberos4_forward(Authenticator *ap, void *);
#endif
@@ -115,7 +115,7 @@ int kerberos5_send_oneway (Authenticator *);
void kerberos5_is (Authenticator *, unsigned char *, int);
void kerberos5_reply (Authenticator *, unsigned char *, int);
int kerberos5_status (Authenticator *, char *, size_t, int);
void kerberos5_printsub (unsigned char *, int, unsigned char *, int);
void kerberos5_printsub (unsigned char *, size_t, unsigned char *, size_t);
int kerberos5_set_forward(int);
int kerberos5_set_forwardable(int);
#endif

5
appl/telnet/libtelnet/auth.c
View File

@@ -627,7 +627,8 @@ auth_debug(int mode)
}
void
auth_printsub(unsigned char *data, int cnt, unsigned char *buf, size_t buflen)
auth_printsub(unsigned char *data, size_t cnt,
unsigned char *buf, size_t buflen)
{
Authenticator *ap;
@@ -638,7 +639,7 @@ auth_printsub(unsigned char *data, int cnt, unsigned char *buf, size_t buflen)
}
void
auth_gen_printsub(unsigned char *data, int cnt,
auth_gen_printsub(unsigned char *data, size_t cnt,
unsigned char *buf, size_t buflen)
{
unsigned char *cp;

2
appl/telnet/libtelnet/auth.h
View File

@@ -72,7 +72,7 @@ typedef struct XauthP {
void (*is) (struct XauthP *, unsigned char *, int);
void (*reply) (struct XauthP *, unsigned char *, int);
int (*status) (struct XauthP *, char *, size_t, int);
void (*printsub) (unsigned char *, int, unsigned char *, int);
void (*printsub) (unsigned char *, size_t, unsigned char *, size_t);
} Authenticator;
#include "auth-proto.h"

8
appl/telnet/libtelnet/enc-proto.h
View File

@@ -81,12 +81,12 @@ void encrypt_dec_keyid(unsigned char*, int);
void encrypt_display(void);
void encrypt_enc_keyid(unsigned char*, int);
void encrypt_end(void);
void encrypt_gen_printsub(unsigned char*, int, unsigned char*, int);
void encrypt_gen_printsub(unsigned char*, size_t, unsigned char*, size_t);
void encrypt_init(const char*, int);
void encrypt_is(unsigned char*, int);
void encrypt_list_types(void);
void encrypt_not(void);
void encrypt_printsub(unsigned char*, int, unsigned char*, int);
void encrypt_printsub(unsigned char*, size_t, unsigned char*, size_t);
void encrypt_reply(unsigned char*, int);
void encrypt_request_end(void);
void encrypt_request_start(unsigned char*, int);
@@ -118,7 +118,7 @@ int cfb64_is (unsigned char *, int);
int cfb64_reply (unsigned char *, int);
void cfb64_session (Session_Key *, int);
int cfb64_keyid (int, unsigned char *, int *);
void cfb64_printsub (unsigned char *, int, unsigned char *, int);
void cfb64_printsub (unsigned char *, size_t, unsigned char *, size_t);
void ofb64_encrypt (unsigned char *, int);
int ofb64_decrypt (int);
@@ -128,6 +128,6 @@ int ofb64_is (unsigned char *, int);
int ofb64_reply (unsigned char *, int);
void ofb64_session (Session_Key *, int);
int ofb64_keyid (int, unsigned char *, int *);
void ofb64_printsub (unsigned char *, int, unsigned char *, int);
void ofb64_printsub (unsigned char *, size_t, unsigned char *, size_t);
#endif

16
appl/telnet/libtelnet/enc_des.c
View File

@@ -124,8 +124,8 @@ int fb64_reply (unsigned char *, int, struct fb *);
static void fb64_session (Session_Key *, int, struct fb *);
void fb64_stream_key (DES_cblock, struct stinfo *);
int fb64_keyid (int, unsigned char *, int *, struct fb *);
void fb64_printsub(unsigned char *, int ,
unsigned char *, int , char *);
void fb64_printsub(unsigned char *, size_t ,
unsigned char *, size_t , char *);
void cfb64_init(int server)
{
@@ -456,8 +456,8 @@ int fb64_keyid(int dir, unsigned char *kp, int *lenp, struct fb *fbp)
return(fbp->state[dir-1] = state);
}
void fb64_printsub(unsigned char *data, int cnt,
unsigned char *buf, int buflen, char *type)
void fb64_printsub(unsigned char *data, size_t cnt,
unsigned char *buf, size_t buflen, char *type)
{
char lbuf[32];
int i;
@@ -497,14 +497,14 @@ void fb64_printsub(unsigned char *data, int cnt,
}
}
void cfb64_printsub(unsigned char *data, int cnt,
unsigned char *buf, int buflen)
void cfb64_printsub(unsigned char *data, size_t cnt,
unsigned char *buf, size_t buflen)
{
fb64_printsub(data, cnt, buf, buflen, "CFB64");
}
void ofb64_printsub(unsigned char *data, int cnt,
unsigned char *buf, int buflen)
void ofb64_printsub(unsigned char *data, size_t cnt,
unsigned char *buf, size_t buflen)
{
fb64_printsub(data, cnt, buf, buflen, "OFB64");
}

7
appl/telnet/libtelnet/encrypt.c
View File

@@ -965,8 +965,8 @@ encrypt_debug(int mode)
encrypt_debug_mode = mode;
}
void encrypt_gen_printsub(unsigned char *data, int cnt,
unsigned char *buf, int buflen)
void encrypt_gen_printsub(unsigned char *data, size_t cnt,
unsigned char *buf, size_t buflen)
{
char tbuf[16], *cp;
@@ -986,7 +986,8 @@ void encrypt_gen_printsub(unsigned char *data, int cnt,
}
void
encrypt_printsub(unsigned char *data, int cnt, unsigned char *buf, int buflen)
encrypt_printsub(unsigned char *data, size_t cnt,
unsigned char *buf, size_t buflen)
{
Encryptions *ep;
int type = data[1];

2
appl/telnet/libtelnet/encrypt.h
View File

@@ -85,7 +85,7 @@ typedef struct {
int (*reply) (unsigned char *, int);
void (*session) (Session_Key *, int);
int (*keyid) (int, unsigned char *, int *);
void (*printsub) (unsigned char *, int, unsigned char *, int);
void (*printsub) (unsigned char *, size_t, unsigned char *, size_t);
} Encryptions;
#define SK_DES 1 /* Matched Kerberos v5 KEYTYPE_DES */

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

@@ -537,7 +537,8 @@ kerberos4_status(Authenticator *ap, char *name, size_t name_sz, int level)
#define ADDC(buf, len, c) if ((len) > 0) {*(buf)++ = (c); --(len);}
void
kerberos4_printsub(unsigned char *data, int cnt, unsigned char *buf, int buflen)
kerberos4_printsub(unsigned char *data, size_t cnt,
unsigned char *buf, size_t buflen)
{
int i;

3
appl/telnet/libtelnet/kerberos5.c
View File

@@ -722,7 +722,8 @@ kerberos5_status(Authenticator *ap, char *name, size_t name_sz, int level)
#define ADDC(buf, len, c) if ((len) > 0) {*(buf)++ = (c); --(len);}
void
kerberos5_printsub(unsigned char *data, int cnt, unsigned char *buf, int buflen)
kerberos5_printsub(unsigned char *data, size_t cnt,
unsigned char *buf, size_t buflen)
{
int i;

5
appl/telnet/libtelnet/krb4encpwd.c
View File

@@ -348,9 +348,8 @@ krb4encpwd_status(ap, name, name_sz, level)
#define ADDC(buf, len, c) if ((len) > 0) {*(buf)++ = (c); --(len);}
void
krb4encpwd_printsub(data, cnt, buf, buflen)
unsigned char *data, *buf;
int cnt, buflen;
krb4encpwd_printsub(unsigned char *data, size_t cnt,
unsigned char *buf, size_t buflen)
{
int i;

2
appl/telnet/libtelnet/misc-proto.h
View File

@@ -75,5 +75,5 @@ void net_encrypt (void);
int telnet_spin (void);
char *telnet_getenv (const char *);
char *telnet_gets (char *, char *, int, int);
void printsub(int direction, unsigned char *pointer, int length);
void printsub(int direction, unsigned char *pointer, size_t);
#endif

7
appl/telnet/libtelnet/rsaencpwd.c
View File

@@ -403,11 +403,10 @@ rsaencpwd_status(ap, name, name_sz, level)
#define ADDC(buf, len, c) if ((len) > 0) {*(buf)++ = (c); --(len);}
void
rsaencpwd_printsub(data, cnt, buf, buflen)
unsigned char *data, *buf;
int cnt, buflen;
rsaencpwd_printsub(unsigned char *data, size_t cnt,
unsigned char * buf, size_t buflen)
{
int i;
size_t i;
buf[buflen-1] = '\0'; /* make sure it's NULL terminated */
buflen -= 1;

7
appl/telnet/libtelnet/spx.c
View File

@@ -526,11 +526,10 @@ spx_status(ap, name, name_sz, level)
#define ADDC(buf, len, c) if ((len) > 0) {*(buf)++ = (c); --(len);}
void
spx_printsub(data, cnt, buf, buflen)
unsigned char *data, *buf;
int cnt, buflen;
spx_printsub(unsigned char *data, size_t cnt,
unsigned char *buf, size_t buflen)
{
int i;
size_t i;
buf[buflen-1] = '\0'; /* make sure it's NULL terminated */
buflen -= 1;

3
appl/telnet/telnet/externs.h
View File

@@ -291,7 +291,6 @@ void xmitEC(void);
void Dump (char, unsigned char *, int);
void printoption (char *, int, int);
void printsub (int, unsigned char *, int);
void sendnaws (void);
void setconnmode (int);
void setcommandmode (void);
@@ -360,7 +359,7 @@ void SetNetTrace(char *file);
void Dump(char direction, unsigned char *buffer, int length);
void printoption(char *direction, int cmd, int option);
void optionstatus(void);
void printsub(int direction, unsigned char *pointer, int length);
void printsub(int direction, unsigned char *pointer, size_t length);
void EmptyTerminal(void);
void SetForExit(void);
void Exit(int returnCode);

10
appl/telnet/telnet/utilities.c
View File

@@ -249,7 +249,7 @@ optionstatus(void)
}
void
printsub(int direction, unsigned char *pointer, int length)
printsub(int direction, unsigned char *pointer, size_t length)
{
int i;
unsigned char buf[512];
@@ -295,7 +295,9 @@ printsub(int direction, unsigned char *pointer, int length)
fprintf(NetTrace, "TERMINAL-TYPE ");
switch (pointer[1]) {
case TELQUAL_IS:
fprintf(NetTrace, "IS \"%.*s\"", length-2, (char *)pointer+2);
fprintf(NetTrace, "IS \"%.*s\"",
(int)(length-2),
(char *)pointer+2);
break;
case TELQUAL_SEND:
fprintf(NetTrace, "SEND");
@@ -315,7 +317,7 @@ printsub(int direction, unsigned char *pointer, int length)
switch (pointer[1]) {
case TELQUAL_IS:
fprintf(NetTrace, " IS ");
fprintf(NetTrace, "%.*s", length-2, (char *)pointer+2);
fprintf(NetTrace, "%.*s", (int)(length-2), (char *)pointer+2);
break;
default:
if (pointer[1] == 1)
@@ -696,7 +698,7 @@ printsub(int direction, unsigned char *pointer, int length)
fprintf(NetTrace, "X-DISPLAY-LOCATION ");
switch (pointer[1]) {
case TELQUAL_IS:
fprintf(NetTrace, "IS \"%.*s\"", length-2, (char *)pointer+2);
fprintf(NetTrace, "IS \"%.*s\"", (int)(length-2), (char *)pointer+2);
break;
case TELQUAL_SEND:
fprintf(NetTrace, "SEND");

4
appl/telnet/telnetd/ext.h
View File

@@ -147,8 +147,8 @@ void putstr (char *s);
void putchr (int cc);
void putf (char *cp, char *where);
void printoption (char *fmt, int option);
void printsub (int direction, unsigned char *pointer, int length);
void printdata (char *tag, char *ptr, int cnt);
void printsub (int direction, unsigned char *pointer, size_t length);
void printdata (char *tag, char *ptr, size_t cnt);
int login_tty(int t);
#ifdef ENCRYPTION

14
appl/telnet/telnetd/utility.c
View File

@@ -532,7 +532,7 @@ printoption(char *fmt, int option)
}
void
printsub(int direction, unsigned char *pointer, int length)
printsub(int direction, unsigned char *pointer, size_t length)
/* '<' or '>' */
/* where suboption data sits */
/* length of suboption data */
@@ -587,7 +587,7 @@ printsub(int direction, unsigned char *pointer, int length)
switch (pointer[1]) {
case TELQUAL_IS:
output_data("IS \"%.*s\"",
length-2,
(int)(length-2),
(char *)pointer+2);
break;
case TELQUAL_SEND:
@@ -606,7 +606,7 @@ printsub(int direction, unsigned char *pointer, int length)
}
switch (pointer[1]) {
case TELQUAL_IS:
output_data(" IS %.*s", length-2, (char *)pointer+2);
output_data(" IS %.*s", (int)(length-2), (char *)pointer+2);
break;
default:
if (pointer[1] == 1)
@@ -884,7 +884,7 @@ printsub(int direction, unsigned char *pointer, int length)
switch (pointer[1]) {
case TELQUAL_IS:
output_data("IS \"%.*s\"",
length-2,
(int)(length-2),
(char *)pointer+2);
break;
case TELQUAL_SEND:
@@ -1019,7 +1019,7 @@ printsub(int direction, unsigned char *pointer, int length)
case TELQUAL_NAME:
i = 2;
output_data(" NAME \"%.*s\"",
length - 2,
(int)(length - 2),
pointer);
break;
@@ -1130,9 +1130,9 @@ printsub(int direction, unsigned char *pointer, int length)
* Dump a data buffer in hex and ascii to the output data stream.
*/
void
printdata(char *tag, char *ptr, int cnt)
printdata(char *tag, char *ptr, size_t cnt)
{
int i;
size_t i;
char xbuf[30];
while (cnt) {