9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #175 from staticfox/datatypes

Browse source 
Move away from BSD data types
This commit is contained in:
William Pitcock 2016-03-23 18:28:01 -05:00
commit 5ee46e5127
4 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/match.h
View file

@ -46,8 +46,8 @@ extern int match_ips(const char *mask, const char *name);
/* /*
* comp_with_mask - compares to IP address * comp_with_mask - compares to IP address
*/ */
int comp_with_mask(void *addr, void *dest, u_int mask); int comp_with_mask(void *addr, void *dest, unsigned int mask);
int comp_with_mask_sock(struct sockaddr *addr, struct sockaddr *dest, u_int mask); int comp_with_mask_sock(struct sockaddr *addr, struct sockaddr *dest, unsigned int mask);
/* /*
* collapse - collapse a string in place, converts multiple adjacent *'s * collapse - collapse a string in place, converts multiple adjacent *'s

8
ircd/chmode.c
View file

@ -535,9 +535,9 @@ check_forward(struct Client *source_p, struct Channel *chptr,
static char * static char *
fix_key(char *arg) fix_key(char *arg)
{ {
u_char *s, *t, c; unsigned char *s, *t, c;
for(s = t = (u_char *) arg; (c = *s); s++) for(s = t = (unsigned char *) arg; (c = *s); s++)
{ {
c &= 0x7f; c &= 0x7f;
if(c != ':' && c != ',' && c > ' ') if(c != ':' && c != ',' && c > ' ')
@ -558,9 +558,9 @@ fix_key(char *arg)
static char * static char *
fix_key_remote(char *arg) fix_key_remote(char *arg)
{ {
u_char *s, *t, c; unsigned char *s, *t, c;
for(s = t = (u_char *) arg; (c = *s); s++) for(s = t = (unsigned char *) arg; (c = *s); s++)
{ {
c &= 0x7f; c &= 0x7f;
if((c != 0x0a) && (c != ':') && (c != ',') && (c != 0x0d) && (c != ' ')) if((c != 0x0a) && (c != ':') && (c != ',') && (c != 0x0d) && (c != ' '))

6
ircd/match.c
View file

@ -308,13 +308,13 @@ match_esc(const char *mask, const char *name)
return 0; return 0;
} }
int comp_with_mask(void *addr, void *dest, u_int mask) int comp_with_mask(void *addr, void *dest, unsigned int mask)
{ {
if (memcmp(addr, dest, mask / 8) == 0) if (memcmp(addr, dest, mask / 8) == 0)
{ {
int n = mask / 8; int n = mask / 8;
int m = ((-1) << (8 - (mask % 8))); int m = ((-1) << (8 - (mask % 8)));
if (mask % 8 == 0 || (((u_char *) addr)[n] & m) == (((u_char *) dest)[n] & m)) if (mask % 8 == 0 || (((unsigned char *) addr)[n] & m) == (((unsigned char *) dest)[n] & m))
{ {
return (1); return (1);
} }
@ -322,7 +322,7 @@ int comp_with_mask(void *addr, void *dest, u_int mask)
return (0); return (0);
} }
int comp_with_mask_sock(struct sockaddr *addr, struct sockaddr *dest, u_int mask) int comp_with_mask_sock(struct sockaddr *addr, struct sockaddr *dest, unsigned int mask)
{ {
void *iaddr = NULL; void *iaddr = NULL;
void *idest = NULL; void *idest = NULL;

38
librb/src/crypt.c
View file

@ -1072,8 +1072,8 @@ rb_md5_crypt(const char *pw, const char *salt)
MD5_CTX ctx,ctx1; MD5_CTX ctx,ctx1;
unsigned long l; unsigned long l;
int sl, pl; int sl, pl;
u_int i; unsigned int i;
u_char final[MD5_SIZE]; unsigned char final[MD5_SIZE];
static const char *sp, *ep; static const char *sp, *ep;
static char passwd[120], *p; static char passwd[120], *p;
static const char *magic = "$1$"; static const char *magic = "$1$";
@ -1095,23 +1095,23 @@ rb_md5_crypt(const char *pw, const char *salt)
MD5Init(&ctx); MD5Init(&ctx);
/* The password first, since that is what is most unknown */ /* The password first, since that is what is most unknown */
MD5Update(&ctx, (const u_char *)pw, strlen(pw)); MD5Update(&ctx, (const unsigned char *)pw, strlen(pw));
/* Then our magic string */ /* Then our magic string */
MD5Update(&ctx, (const u_char *)magic, strlen(magic)); MD5Update(&ctx, (const unsigned char *)magic, strlen(magic));
/* Then the raw salt */ /* Then the raw salt */
MD5Update(&ctx, (const u_char *)sp, (u_int)sl); MD5Update(&ctx, (const unsigned char *)sp, (unsigned int)sl);
/* Then just as many characters of the MD5(pw,salt,pw) */ /* Then just as many characters of the MD5(pw,salt,pw) */
MD5Init(&ctx1); MD5Init(&ctx1);
MD5Update(&ctx1, (const u_char *)pw, strlen(pw)); MD5Update(&ctx1, (const unsigned char *)pw, strlen(pw));
MD5Update(&ctx1, (const u_char *)sp, (u_int)sl); MD5Update(&ctx1, (const unsigned char *)sp, (unsigned int)sl);
MD5Update(&ctx1, (const u_char *)pw, strlen(pw)); MD5Update(&ctx1, (const unsigned char *)pw, strlen(pw));
MD5Final(final, &ctx1); MD5Final(final, &ctx1);
for(pl = (int)strlen(pw); pl > 0; pl -= MD5_SIZE) for(pl = (int)strlen(pw); pl > 0; pl -= MD5_SIZE)
MD5Update(&ctx, (const u_char *)final, MD5Update(&ctx, (const unsigned char *)final,
(u_int)(pl > MD5_SIZE ? MD5_SIZE : pl)); (unsigned int)(pl > MD5_SIZE ? MD5_SIZE : pl));
/* Don't leave anything around in vm they could use. */ /* Don't leave anything around in vm they could use. */
memset(final, 0, sizeof(final)); memset(final, 0, sizeof(final));
@ -1119,13 +1119,13 @@ rb_md5_crypt(const char *pw, const char *salt)
/* Then something really weird... */ /* Then something really weird... */
for (i = strlen(pw); i; i >>= 1) for (i = strlen(pw); i; i >>= 1)
if(i & 1) if(i & 1)
MD5Update(&ctx, (const u_char *)final, 1); MD5Update(&ctx, (const unsigned char *)final, 1);
else else
MD5Update(&ctx, (const u_char *)pw, 1); MD5Update(&ctx, (const unsigned char *)pw, 1);
/* Now make the output string */ /* Now make the output string */
rb_strlcpy(passwd, magic, sizeof(passwd)); rb_strlcpy(passwd, magic, sizeof(passwd));
strncat(passwd, sp, (u_int)sl); strncat(passwd, sp, (unsigned int)sl);
rb_strlcat(passwd, "$", sizeof(passwd)); rb_strlcat(passwd, "$", sizeof(passwd));
MD5Final(final, &ctx); MD5Final(final, &ctx);
@ -1138,20 +1138,20 @@ rb_md5_crypt(const char *pw, const char *salt)
for(i = 0; i < 1000; i++) { for(i = 0; i < 1000; i++) {
MD5Init(&ctx1); MD5Init(&ctx1);
if(i & 1) if(i & 1)
MD5Update(&ctx1, (const u_char *)pw, strlen(pw)); MD5Update(&ctx1, (const unsigned char *)pw, strlen(pw));
else else
MD5Update(&ctx1, (const u_char *)final, MD5_SIZE); MD5Update(&ctx1, (const unsigned char *)final, MD5_SIZE);
if(i % 3) if(i % 3)
MD5Update(&ctx1, (const u_char *)sp, (u_int)sl); MD5Update(&ctx1, (const unsigned char *)sp, (unsigned int)sl);
if(i % 7) if(i % 7)
MD5Update(&ctx1, (const u_char *)pw, strlen(pw)); MD5Update(&ctx1, (const unsigned char *)pw, strlen(pw));
if(i & 1) if(i & 1)
MD5Update(&ctx1, (const u_char *)final, MD5_SIZE); MD5Update(&ctx1, (const unsigned char *)final, MD5_SIZE);
else else
MD5Update(&ctx1, (const u_char *)pw, strlen(pw)); MD5Update(&ctx1, (const unsigned char *)pw, strlen(pw));
MD5Final(final, &ctx1); MD5Final(final, &ctx1);
} }