projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GitHub CI: run most tests as a non-privileged user.
[tinc]
/
src
/
utils.c
diff --git
a/src/utils.c
b/src/utils.c
index
857d47e
..
f14094f
100644
(file)
--- a/
src/utils.c
+++ b/
src/utils.c
@@
-54,7
+54,7
@@
static int charhex2bin(char c) {
}
size_t hex2bin(const char *src, void *vdst, size_t length) {
}
size_t hex2bin(const char *src, void *vdst, size_t length) {
-
char
*dst = vdst;
+
uint8_t
*dst = vdst;
size_t i;
for(i = 0; i < length && isxdigit(src[i * 2]) && isxdigit(src[i * 2 + 1]); i++) {
size_t i;
for(i = 0; i < length && isxdigit(src[i * 2]) && isxdigit(src[i * 2 + 1]); i++) {
@@
-67,7
+67,8
@@
size_t hex2bin(const char *src, void *vdst, size_t length) {
size_t bin2hex(const void *vsrc, char *dst, size_t length) {
const char *src = vsrc;
size_t bin2hex(const void *vsrc, char *dst, size_t length) {
const char *src = vsrc;
- for(size_t i = length; i-- > 0;) {
+ for(size_t i = length; i > 0;) {
+ --i;
dst[i * 2 + 1] = hexadecimals[(unsigned char) src[i] & 15];
dst[i * 2] = hexadecimals[(unsigned char) src[i] >> 4];
}
dst[i * 2 + 1] = hexadecimals[(unsigned char) src[i] & 15];
dst[i * 2] = hexadecimals[(unsigned char) src[i] >> 4];
}
@@
-173,11
+174,7
@@
size_t b64encode_urlsafe(const void *src, char *dst, size_t length) {
return b64encode_internal(src, dst, length, base64_urlsafe);
}
return b64encode_internal(src, dst, length, base64_urlsafe);
}
-#if defined(HAVE_MINGW) || defined(HAVE_CYGWIN)
-#ifdef HAVE_CYGWIN
-#include <w32api/windows.h>
-#endif
-
+#ifdef HAVE_MINGW
const char *winerror(int err) {
static char buf[1024], *ptr;
const char *winerror(int err) {
static char buf[1024], *ptr;