X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Futils.c;h=3a3030d1ce3ebfcf8cd0b42e7a5193ab1185b669;hb=83fed21f2fa70088607843661871b723fe77c84b;hp=c2f4333fc783f3172dcf77bc2046b63a9de287d6;hpb=0289162552cd85375605044c696e2a3294e7aa9a;p=tinc

diff --git a/src/utils.c b/src/utils.c
index c2f4333f..3a3030d1 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -85,7 +85,7 @@ size_t b64decode_tinc(const char *src, void *dst, size_t length) {
 	unsigned char *udst = (unsigned char *)dst;
 
 	for(i = 0; i < length && src[i]; i++) {
-		triplet |= base64_decode[src[i] & 0xff] << (6 * (i & 3));
+		triplet |= (uint32_t)(base64_decode[src[i] & 0xff] << (6 * (i & 3)));
 
 		if((i & 3) == 3) {
 			if(triplet & 0xff000000U) {
@@ -294,29 +294,7 @@ char *replace_name(const char *name) {
 	return ret_name;
 }
 
-/* Open a file with the desired permissions, minus the umask.
-   Also, if we want to create an executable file, we call fchmod()
-   to set the executable bits. */
-
-FILE *fopenmask(const char *filename, const char *mode, mode_t perms) {
-	mode_t mask = umask(0);
-	perms &= ~mask;
-	umask(~perms & 0777);
-	FILE *f = fopen(filename, mode);
-
-	if(!f) {
-		fprintf(stderr, "Could not open %s: %s\n", filename, strerror(errno));
-		return NULL;
-	}
-
-#ifdef HAVE_FCHMOD
-
-	if(perms & 0444) {
-		fchmod(fileno(f), perms);
-	}
-
-#endif
-	umask(mask);
-	return f;
+bool string_eq(const char *first, const char *second) {
+	return !first == !second &&
+	       !(first && second && strcmp(first, second));
 }
-