X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet_setup.c;h=5eddb1a76c3f2d7d04152cd72a4716e720cc9491;hp=8eb3e6056449a33043f9a84af7b0fe3102ee48f1;hb=d2f8d0920226e4d8edd3efa3c18b46b783aacea0;hpb=aaa17884166350b60ab5896bcf408eea665a0404

diff --git a/src/net_setup.c b/src/net_setup.c
index 8eb3e605..5eddb1a7 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -76,7 +76,7 @@ bool read_rsa_public_key(connection_t *c) {
 	/* First, check for simple PublicKey statement */
 
 	if(get_config_string(lookup_config(c->config_tree, "PublicKey"), &key)) {
-		if(BN_hex2bn(&n, key) != strlen(key)) {
+		if((size_t)BN_hex2bn(&n, key) != strlen(key)) {
 			free(key);
 			logger(LOG_ERR, "Invalid PublicKey for %s!", c->name);
 			return false;
@@ -191,7 +191,7 @@ static bool read_rsa_private_key(void) {
 		myself->connection->rsa_key = RSA_new();
 
 //		RSA_blinding_on(myself->connection->rsa_key, NULL);
-		if(BN_hex2bn(&d, key) != strlen(key)) {
+		if((size_t)BN_hex2bn(&d, key) != strlen(key)) {
 			logger(LOG_ERR, "Invalid PrivateKey for myself!");
 			free(key);
 			return false;
@@ -205,7 +205,7 @@ static bool read_rsa_private_key(void) {
 			return false;
 		}
 
-		if(BN_hex2bn(&n, pubkey) != strlen(pubkey)) {
+		if((size_t)BN_hex2bn(&n, pubkey) != strlen(pubkey)) {
 			free(pubkey);
 			BN_free(d);
 			logger(LOG_ERR, "Invalid PublicKey for myself!");
@@ -239,7 +239,7 @@ static bool read_rsa_private_key(void) {
 		return false;
 	}
 
-#if !defined(HAVE_MINGW) && !defined(HAVE_CYGWIN)
+#if !defined(HAVE_MINGW) && !defined(HAVE___CYGWIN32__)
 	struct stat s;
 
 	if(!fstat(fileno(fp), &s)) {
@@ -388,8 +388,8 @@ static bool setup_myself(void) {
 	char *address = NULL;
 	char *proxy = NULL;
 	char *space;
-	char *envp[5] = {NULL};
-	struct addrinfo *ai, *aip, hint = {0};
+	char *envp[5] = {};
+	struct addrinfo *ai, *aip, hint = {};
 	bool choice;
 	int i, err;
 	int replaywin_int;
@@ -860,7 +860,7 @@ static bool setup_myself(void) {
 #ifdef HAVE_MINGW
 	Sleep(1000);
 #endif
-#ifdef HAVE_CYGWIN
+#ifdef HAVE___CYGWIN32__
 	sleep(1);
 #endif
 	execute_script("tinc-up", envp);
@@ -1068,7 +1068,7 @@ bool setup_network(void) {
 void close_network_connections(void) {
 	avl_node_t *node, *next;
 	connection_t *c;
-	char *envp[5] = {NULL};
+	char *envp[5] = {};
 	int i;
 
 	for(node = connection_tree->head; node; node = next) {