Remove most of the configuration options.

[meshlink] / src / protocol_auth.c

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index 670bfbc23ee0cc48e908d481e150186dfa634db6..1a79264d133c82c41c7d9d64e37e3066552cf067 100644 (file)
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -37,6 +37,7 @@
 #include "sptps.h"
 #include "utils.h"
 #include "xalloc.h"
+#include "ed25519/sha512.h"
 
 ecdsa_t *invitation_key = NULL;
 
@@ -182,17 +183,14 @@ static bool receive_invitation_sptps(void *handle, uint8_t type, const char *dat
                return false;
 
        // Recover the filename from the cookie and the key
-       digest_t *digest = digest_open_by_name("sha256", 18);
-       if(!digest)
-               abort();
        char *fingerprint = ecdsa_get_base64_public_key(invitation_key);
+       char hash[64];
        char hashbuf[18 + strlen(fingerprint)];
        char cookie[25];
        memcpy(hashbuf, data, 18);
        memcpy(hashbuf + 18, fingerprint, sizeof hashbuf - 18);
-       digest_create(digest, hashbuf, sizeof hashbuf, cookie);
-       b64encode_urlsafe(cookie, cookie, 18);
-       digest_close(digest);
+       sha512(hashbuf, sizeof hashbuf, hash);
+       b64encode_urlsafe(hash, cookie, 18);
        free(fingerprint);
 
        char filename[PATH_MAX], usedname[PATH_MAX];
@@ -349,8 +347,6 @@ bool id_h(connection_t *c, const char *request) {
                return false;
        }
 
-       c->allow_request = METAKEY;
-
        c->allow_request = ACK;
        char label[25 + strlen(myself->name) + strlen(c->name)];
 
@@ -376,23 +372,9 @@ bool send_ack(connection_t *c) {
 
        /* Check some options */
 
-       if((get_config_bool(lookup_config(c->config_tree, "IndirectData"), &choice) && choice) || myself->options & OPTION_INDIRECT)
-               c->options |= OPTION_INDIRECT;
-
-       if((get_config_bool(lookup_config(c->config_tree, "TCPOnly"), &choice) && choice) || myself->options & OPTION_TCPONLY)
-               c->options |= OPTION_TCPONLY | OPTION_INDIRECT;
-
        if(myself->options & OPTION_PMTU_DISCOVERY)
                c->options |= OPTION_PMTU_DISCOVERY;
 
-       choice = myself->options & OPTION_CLAMP_MSS;
-       get_config_bool(lookup_config(c->config_tree, "ClampMSS"), &choice);
-       if(choice)
-               c->options |= OPTION_CLAMP_MSS;
-
-       if(!get_config_int(lookup_config(c->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) | (PROT_MINOR << 24));
 }
 
@@ -467,19 +449,6 @@ bool ack_h(connection_t *c, const char *request) {
        }
        c->options |= options;
 
-       if(get_config_int(lookup_config(c->config_tree, "PMTU"), &mtu) && mtu < n->mtu)
-               n->mtu = mtu;
-
-       if(get_config_int(lookup_config(config_tree, "PMTU"), &mtu) && mtu < n->mtu)
-               n->mtu = mtu;
-
-       if(get_config_bool(lookup_config(c->config_tree, "ClampMSS"), &choice)) {
-               if(choice)
-                       c->options |= OPTION_CLAMP_MSS;
-               else
-                       c->options &= ~OPTION_CLAMP_MSS;
-       }
-
        /* Activate this connection */
 
        c->allow_request = ALL;