projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove vendored LZ4
[tinc]
/
src
/
utils.c
diff --git
a/src/utils.c
b/src/utils.c
index
d0d1062
..
8b0cd6e
100644
(file)
--- a/
src/utils.c
+++ b/
src/utils.c
@@
-45,11
+45,13
@@
static const char base64_decode[256] = {
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
};
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
};
-static int charhex2bin(char c) {
- if(isdigit(c)) {
- return c - '0';
+static uint8_t charhex2bin(char c) {
+ uint8_t cu = (uint8_t) c;
+
+ if(isdigit(cu)) {
+ return cu - '0';
} else {
} else {
- return toupper(c) - 'A' + 10;
+ return toupper(c
u
) - 'A' + 10;
}
}
}
}
@@
-57,7
+59,7
@@
size_t hex2bin(const char *src, void *vdst, size_t length) {
uint8_t *dst = vdst;
size_t i;
uint8_t *dst = vdst;
size_t i;
- for(i = 0; i < length && isxdigit(
src[i * 2]) && isxdigit(
src[i * 2 + 1]); i++) {
+ for(i = 0; i < length && isxdigit(
(uint8_t) src[i * 2]) && isxdigit((uint8_t)
src[i * 2 + 1]); i++) {
dst[i] = charhex2bin(src[i * 2]) * 16 + charhex2bin(src[i * 2 + 1]);
}
dst[i] = charhex2bin(src[i * 2]) * 16 + charhex2bin(src[i * 2 + 1]);
}
@@
-77,7
+79,7
@@
size_t bin2hex(const void *vsrc, char *dst, size_t length) {
return length * 2;
}
return length * 2;
}
-size_t b64decode(const char *src, void *dst, size_t length) {
+size_t b64decode
_tinc
(const char *src, void *dst, size_t length) {
size_t i;
uint32_t triplet = 0;
unsigned char *udst = (unsigned char *)dst;
size_t i;
uint32_t triplet = 0;
unsigned char *udst = (unsigned char *)dst;
@@
-117,7
+119,7
@@
size_t b64decode(const char *src, void *dst, size_t length) {
}
}
}
}
-static size_t b64encode_internal(const void *src, char *dst, size_t length, const char *alphabet) {
+static size_t b64encode_
tinc_
internal(const void *src, char *dst, size_t length, const char *alphabet) {
uint32_t triplet;
const unsigned char *usrc = (unsigned char *)src;
size_t si = length / 3 * 3;
uint32_t triplet;
const unsigned char *usrc = (unsigned char *)src;
size_t si = length / 3 * 3;
@@
-166,12
+168,12
@@
static size_t b64encode_internal(const void *src, char *dst, size_t length, cons
return length;
}
return length;
}
-size_t b64encode(const void *src, char *dst, size_t length) {
- return b64encode_internal(src, dst, length, base64_original);
+size_t b64encode
_tinc
(const void *src, char *dst, size_t length) {
+ return b64encode_
tinc_
internal(src, dst, length, base64_original);
}
}
-size_t b64encode_urlsafe(const void *src, char *dst, size_t length) {
- return b64encode_internal(src, dst, length, base64_urlsafe);
+size_t b64encode_
tinc_
urlsafe(const void *src, char *dst, size_t length) {
+ return b64encode_
tinc_
internal(src, dst, length, base64_urlsafe);
}
#ifdef HAVE_MINGW
}
#ifdef HAVE_MINGW
@@
-193,24
+195,13
@@
const char *winerror(int err) {
}
#endif
}
#endif
-unsigned int bitfield_to_int(const void *bitfield, size_t size) {
- unsigned int value = 0;
-
- if(size > sizeof(value)) {
- size = sizeof(value);
- }
-
- memcpy(&value, bitfield, size);
- return value;
-}
-
bool check_id(const char *id) {
if(!id || !*id) {
return false;
}
for(; *id; id++)
bool check_id(const char *id) {
if(!id || !*id) {
return false;
}
for(; *id; id++)
- if(!isalnum(*id) && *id != '_') {
+ if(!isalnum(
(uint8_t)
*id) && *id != '_') {
return false;
}
return false;
}
@@
-223,7
+214,7
@@
bool check_netname(const char *netname, bool strict) {
}
for(const char *c = netname; *c; c++) {
}
for(const char *c = netname; *c; c++) {
- if(iscntrl(*c)) {
+ if(iscntrl(
(uint8_t)
*c)) {
return false;
}
return false;
}
@@
-269,7
+260,7
@@
char *replace_name(const char *name) {
ret_name = xstrdup(envname);
for(char *c = ret_name; *c; c++)
ret_name = xstrdup(envname);
for(char *c = ret_name; *c; c++)
- if(!isalnum(*c)) {
+ if(!isalnum(
(uint8_t)
*c)) {
*c = '_';
}
} else {
*c = '_';
}
} else {
@@
-302,7
+293,7
@@
FILE *fopenmask(const char *filename, const char *mode, mode_t perms) {
#ifdef HAVE_FCHMOD
#ifdef HAVE_FCHMOD
- if(
(perms & 0444) && f
) {
+ if(
perms & 0444
) {
fchmod(fileno(f), perms);
}
fchmod(fileno(f), perms);
}