Replace pointers to cipher_t/digest_t in connection_t with structs.

[tinc] / src / protocol_auth.c

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index fc39b64..d4bb407 100644 (file)
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -26,7 +26,6 @@
 #include "control_common.h"
 #include "cipher.h"
 #include "crypto.h"
-#include "device.h"
 #include "digest.h"
 #include "ecdsa.h"
 #include "edge.h"
@@ -37,7 +36,6 @@
 #include "net.h"
 #include "netutl.h"
 #include "node.h"
-#include "prf.h"
 #include "protocol.h"
 #include "rsa.h"
 #include "script.h"
@@ -70,7 +68,7 @@ static bool send_proxyrequest(connection_t *c) {
                        return false;
                }
 
-               char s4req[9 + (proxyuser ? strlen(proxyuser) : 0)];
+               uint8_t s4req[9 + (proxyuser ? strlen(proxyuser) : 0)];
                s4req[0] = 4;
                s4req[1] = 1;
                memcpy(s4req + 2, &c->address.in.sin_port, 2);
@@ -86,15 +84,15 @@ static bool send_proxyrequest(connection_t *c) {
        }
 
        case PROXY_SOCKS5: {
-               int len = 3 + 6 + (c->address.sa.sa_family == AF_INET ? 4 : 16);
+               size_t len = 3 + 6 + (c->address.sa.sa_family == AF_INET ? 4 : 16);
                c->tcplen = 2;
 
                if(proxypass) {
                        len += 3 + strlen(proxyuser) + strlen(proxypass);
                }
 
-               char s5req[len];
-               int i = 0;
+               uint8_t s5req[len];
+               size_t i = 0;
                s5req[i++] = 5;
                s5req[i++] = 1;
 
@@ -429,7 +427,7 @@ bool id_h(connection_t *c, const char *request) {
 
        if(bypass_security) {
                if(!c->config_tree) {
-                       init_configuration(&c->config_tree);
+                       c->config_tree = create_configuration();
                }
 
                c->allow_request = ACK;
@@ -446,7 +444,7 @@ bool id_h(connection_t *c, const char *request) {
        }
 
        if(!c->config_tree) {
-               init_configuration(&c->config_tree);
+               c->config_tree = create_configuration();
 
                if(!read_host_config(c->config_tree, c->name, false)) {
                        logger(DEBUG_ALWAYS, LOG_ERR, "Peer %s had unknown identity (%s)", c->hostname, c->name);
@@ -510,23 +508,25 @@ bool send_metakey(connection_t *c) {
           by Cipher.
        */
 
-       int keylen = cipher_keylength(myself->incipher);
+       size_t keylen = cipher_keylength(myself->incipher);
+       const char *cipher_name;
 
        if(keylen <= 16) {
-               c->outcipher = cipher_open_by_name("aes-128-cfb");
+               cipher_name = "aes-128-cfb";
        } else if(keylen <= 24) {
-               c->outcipher = cipher_open_by_name("aes-192-cfb");
+               cipher_name = "aes-192-cfb";
        } else {
-               c->outcipher = cipher_open_by_name("aes-256-cfb");
+               cipher_name = "aes-256-cfb";
        }
 
-       if(!c) {
+       if(!cipher_open_by_name(&c->outcipher, cipher_name)) {
                return false;
        }
 
-       c->outbudget = cipher_budget(c->outcipher);
+       c->outbudget = cipher_budget(&c->outcipher);
 
-       if(!(c->outdigest = digest_open_by_name("sha256", -1))) {
+       if(!digest_open_by_name(&c->outdigest, "sha256", DIGEST_ALGO_SIZE)) {
+               cipher_close(&c->outcipher);
                return false;
        }
 
@@ -551,7 +551,7 @@ bool send_metakey(connection_t *c) {
 
        key[0] &= 0x7F;
 
-       if(!cipher_set_key_from_rsa(c->outcipher, key, len, true)) {
+       if(!cipher_set_key_from_rsa(&c->outcipher, key, len, true)) {
                return false;
        }
 
@@ -579,8 +579,8 @@ bool send_metakey(connection_t *c) {
        /* Send the meta key */
 
        bool result = send_request(c, "%d %d %d %d %d %s", METAKEY,
-                                  cipher_get_nid(c->outcipher),
-                                  digest_get_nid(c->outdigest), c->outmaclength,
+                                  cipher_get_nid(&c->outcipher),
+                                  digest_get_nid(&c->outdigest), c->outmaclength,
                                   c->outcompression, hexkey);
 
        c->status.encryptout = true;
@@ -629,7 +629,7 @@ bool metakey_h(connection_t *c, const char *request) {
        /* Check and lookup cipher and digest algorithms */
 
        if(cipher) {
-               if(!(c->incipher = cipher_open_by_nid(cipher)) || !cipher_set_key_from_rsa(c->incipher, key, len, false)) {
+               if(!cipher_open_by_nid(&c->incipher, cipher) || !cipher_set_key_from_rsa(&c->incipher, key, len, false)) {
                        logger(DEBUG_ALWAYS, LOG_ERR, "Error during initialisation of cipher from %s (%s)", c->name, c->hostname);
                        return false;
                }
@@ -638,10 +638,10 @@ bool metakey_h(connection_t *c, const char *request) {
                return false;
        }
 
-       c->inbudget = cipher_budget(c->incipher);
+       c->inbudget = cipher_budget(&c->incipher);
 
        if(digest) {
-               if(!(c->indigest = digest_open_by_nid(digest, -1))) {
+               if(!digest_open_by_nid(&c->indigest, digest, DIGEST_ALGO_SIZE)) {
                        logger(DEBUG_ALWAYS, LOG_ERR, "Error during initialisation of digest from %s (%s)", c->name, c->hostname);
                        return false;
                }
@@ -715,12 +715,12 @@ bool challenge_h(connection_t *c, const char *request) {
 
 bool send_chal_reply(connection_t *c) {
        const size_t len = rsa_size(myself->connection->rsa);
-       size_t digestlen = digest_length(c->indigest);
+       size_t digestlen = digest_length(&c->indigest);
        char digest[digestlen * 2 + 1];
 
        /* Calculate the hash from the challenge we received */
 
-       if(!digest_create(c->indigest, c->mychallenge, len, digest)) {
+       if(!digest_create(&c->indigest, c->mychallenge, len, digest)) {
                return false;
        }
 
@@ -751,7 +751,7 @@ bool chal_reply_h(connection_t *c, const char *request) {
 
        /* Check if the length of the hash is all right */
 
-       if(inlen != digest_length(c->outdigest)) {
+       if(inlen != digest_length(&c->outdigest)) {
                logger(DEBUG_ALWAYS, LOG_ERR, "Possible intruder %s (%s): %s", c->name, c->hostname, "wrong challenge reply length");
                return false;
        }
@@ -759,7 +759,7 @@ bool chal_reply_h(connection_t *c, const char *request) {
 
        /* Verify the hash */
 
-       if(!digest_verify(c->outdigest, c->hischallenge, rsa_size(c->rsa), hishash)) {
+       if(!digest_verify(&c->outdigest, c->hischallenge, rsa_size(c->rsa), hishash)) {
                logger(DEBUG_ALWAYS, LOG_ERR, "Possible intruder %s (%s): %s", c->name, c->hostname, "wrong challenge reply");
                return false;
        }
@@ -847,7 +847,7 @@ bool send_ack(connection_t *c) {
        /* Estimate weight */
 
        gettimeofday(&now, NULL);
-       c->estimated_weight = (now.tv_sec - c->start.tv_sec) * 1000 + (now.tv_usec - c->start.tv_usec) / 1000;
+       c->estimated_weight = (int)((now.tv_sec - c->start.tv_sec) * 1000 + (now.tv_usec - c->start.tv_usec) / 1000);
 
        /* Check some options */
 
@@ -871,7 +871,7 @@ bool send_ack(connection_t *c) {
        }
 
        if(!get_config_int(lookup_config(c->config_tree, "Weight"), &c->estimated_weight)) {
-               get_config_int(lookup_config(config_tree, "Weight"), &c->estimated_weight);
+               get_config_int(lookup_config(&config_tree, "Weight"), &c->estimated_weight);
        }
 
        return send_request(c, "%d %s %d %x", ACK, myport, c->estimated_weight, (c->options & 0xffffff) | (experimental ? (PROT_MINOR << 24) : 0));
@@ -892,19 +892,19 @@ static void send_everything(connection_t *c) {
        }
 
        if(tunnelserver) {
-               for splay_each(subnet_t, s, myself->subnet_tree) {
+               for splay_each(subnet_t, s, &myself->subnet_tree) {
                        send_add_subnet(c, s);
                }
 
                return;
        }
 
-       for splay_each(node_t, n, node_tree) {
-               for splay_each(subnet_t, s, n->subnet_tree) {
+       for splay_each(node_t, n, &node_tree) {
+               for splay_each(subnet_t, s, &n->subnet_tree) {
                        send_add_subnet(c, s);
                }
 
-               for splay_each(edge_t, e, n->edge_tree) {
+               for splay_each(edge_t, e, &n->edge_tree) {
                        send_add_edge(c, e);
                }
        }
@@ -1011,7 +1011,7 @@ bool ack_h(connection_t *c, const char *request) {
                n->mtu = mtu;
        }
 
-       if(get_config_int(lookup_config(config_tree, "PMTU"), &mtu) && mtu < n->mtu) {
+       if(get_config_int(lookup_config(&config_tree, "PMTU"), &mtu) && mtu < n->mtu) {
                n->mtu = mtu;
        }