Merge branch 'master' into 1.1

[meshlink] / src / protocol_auth.c

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index 3fd80c47b944981a900f9409751bdec8bf00a907..790d324d0b054457a9d2e42f848d141dc3cf43fe 100644 (file)
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -65,7 +65,7 @@ static bool send_proxyrequest(connection_t *c) {
                        memcpy(s4req + 2, &c->address.in.sin_port, 2);
                        memcpy(s4req + 4, &c->address.in.sin_addr, 4);
                        if(proxyuser)
-                               strcpy(s4req + 8, proxyuser);
+                               memcpy(s4req + 8, proxyuser, strlen(proxyuser));
                        s4req[sizeof s4req - 1] = 0;
                        c->tcplen = 8;
                        return send_meta(c, s4req, sizeof s4req);
@@ -83,10 +83,10 @@ static bool send_proxyrequest(connection_t *c) {
                                s5req[i++] = 2;
                                s5req[i++] = 1;
                                s5req[i++] = strlen(proxyuser);
-                               strcpy(s5req + i, proxyuser);
+                               memcpy(s5req + i, proxyuser, strlen(proxyuser));
                                i += strlen(proxyuser);
                                s5req[i++] = strlen(proxypass);
-                               strcpy(s5req + i, proxypass);
+                               memcpy(s5req + i, proxypass, strlen(proxypass));
                                i += strlen(proxypass);
                                c->tcplen += 2;
                        } else {
@@ -626,9 +626,6 @@ bool ack_h(connection_t *c, const char *request) {
                        c->options &= ~OPTION_CLAMP_MSS;
        }
 
-       if(c->protocol_minor > 0)
-               c->node->status.ecdh = true;
-
        /* Activate this connection */
 
        c->allow_request = ALL;