Fix building with --disable-legacy-protocol.

[tinc] / src / protocol_auth.c

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index 9d61ab8..f78e272 100644 (file)
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -176,6 +176,8 @@ bool send_id(connection_t *c) {
 }
 
 static bool finalize_invitation(connection_t *c, const char *data, uint16_t len) {
+       (void)len;
+
        if(strchr(data, '\n')) {
                logger(DEBUG_ALWAYS, LOG_ERR, "Received invalid key from invited node %s (%s)!\n", c->name, c->hostname);
                return false;
@@ -405,10 +407,7 @@ bool id_h(connection_t *c, const char *request) {
                        return false;
                }
        } else {
-               if(c->name) {
-                       free(c->name);
-               }
-
+               free(c->name);
                c->name = xstrdup(name);
        }
 
@@ -487,11 +486,8 @@ bool id_h(connection_t *c, const char *request) {
        }
 }
 
+#ifndef DISABLE_LEGACY
 bool send_metakey(connection_t *c) {
-#ifdef DISABLE_LEGACY
-       return false;
-#else
-
        if(!myself->connection->rsa) {
                logger(DEBUG_CONNECTIONS, LOG_ERR, "Peer %s (%s) uses legacy protocol which we don't support", c->name, c->hostname);
                return false;
@@ -581,14 +577,9 @@ bool send_metakey(connection_t *c) {
 
        c->status.encryptout = true;
        return result;
-#endif
 }
 
 bool metakey_h(connection_t *c, const char *request) {
-#ifdef DISABLE_LEGACY
-       return false;
-#else
-
        if(!myself->connection->rsa) {
                return false;
        }
@@ -606,7 +597,7 @@ bool metakey_h(connection_t *c, const char *request) {
 
        /* Convert the challenge from hexadecimal back to binary */
 
-       int inlen = hex2bin(hexkey, enckey, sizeof(enckey));
+       size_t inlen = hex2bin(hexkey, enckey, sizeof(enckey));
 
        /* Check if the length of the meta key is all right */
 
@@ -656,13 +647,9 @@ bool metakey_h(connection_t *c, const char *request) {
        c->allow_request = CHALLENGE;
 
        return send_challenge(c);
-#endif
 }
 
 bool send_challenge(connection_t *c) {
-#ifdef DISABLE_LEGACY
-       return false;
-#else
        const size_t len = rsa_size(c->rsa);
        char buffer[len * 2 + 1];
 
@@ -679,14 +666,9 @@ bool send_challenge(connection_t *c) {
        /* Send the challenge */
 
        return send_request(c, "%d %s", CHALLENGE, buffer);
-#endif
 }
 
 bool challenge_h(connection_t *c, const char *request) {
-#ifdef DISABLE_LEGACY
-       return false;
-#else
-
        if(!myself->connection->rsa) {
                return false;
        }
@@ -721,8 +703,6 @@ bool challenge_h(connection_t *c, const char *request) {
        } else {
                return true;
        }
-
-#endif
 }
 
 bool send_chal_reply(connection_t *c) {
@@ -749,9 +729,6 @@ bool send_chal_reply(connection_t *c) {
 }
 
 bool chal_reply_h(connection_t *c, const char *request) {
-#ifdef DISABLE_LEGACY
-       return false;
-#else
        char hishash[MAX_STRING_SIZE];
 
        if(sscanf(request, "%*d " MAX_STRING, hishash) != 1) {
@@ -762,7 +739,7 @@ bool chal_reply_h(connection_t *c, const char *request) {
 
        /* Convert the hash to binary format */
 
-       int inlen = hex2bin(hishash, hishash, sizeof(hishash));
+       size_t inlen = hex2bin(hishash, hishash, sizeof(hishash));
 
        /* Check if the length of the hash is all right */
 
@@ -792,13 +769,9 @@ bool chal_reply_h(connection_t *c, const char *request) {
        }
 
        return send_ack(c);
-#endif
 }
 
 static bool send_upgrade(connection_t *c) {
-#ifdef DISABLE_LEGACY
-       return false;
-#else
        /* Special case when protocol_minor is 1: the other end is Ed25519 capable,
         * but doesn't know our key yet. So send it now. */
 
@@ -811,8 +784,46 @@ static bool send_upgrade(connection_t *c) {
        bool result = send_request(c, "%d %s", ACK, pubkey);
        free(pubkey);
        return result;
-#endif
 }
+#else
+bool send_metakey(connection_t *c) {
+       (void)c;
+       return false;
+}
+
+bool metakey_h(connection_t *c, const char *request) {
+       (void)c;
+       (void)request;
+       return false;
+}
+
+bool send_challenge(connection_t *c) {
+       (void)c;
+       return false;
+}
+
+bool challenge_h(connection_t *c, const char *request) {
+       (void)c;
+       (void)request;
+       return false;
+}
+
+bool send_chal_reply(connection_t *c) {
+       (void)c;
+       return false;
+}
+
+bool chal_reply_h(connection_t *c, const char *request) {
+       (void)c;
+       (void)request;
+       return false;
+}
+
+static bool send_upgrade(connection_t *c) {
+       (void)c;
+       return false;
+}
+#endif
 
 bool send_ack(connection_t *c) {
        if(c->protocol_minor == 1) {