Merge branch 'master' into 1.1

[tinc] / src / protocol_auth.c

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index 8d4dfb9..6059096 100644 (file)
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -261,7 +261,7 @@ bool send_challenge(connection_t *c) {
 bool challenge_h(connection_t *c, char *request) {
        char buffer[MAX_STRING_SIZE];
        size_t len = rsa_size(&myself->connection->rsa);
-       size_t digestlen = digest_length(&c->outdigest);
+       size_t digestlen = digest_length(&c->indigest);
        char digest[digestlen];
 
        if(sscanf(request, "%*d " MAX_STRING, buffer) != 1) {
@@ -452,7 +452,7 @@ bool ack_h(connection_t *c, char *request) {
        if(get_config_int(lookup_config(c->config_tree, "PMTU"), &mtu) && mtu < n->mtu)
                n->mtu = mtu;
 
-       if(get_config_int(lookup_config(myself->connection->config_tree, "PMTU"), &mtu) && mtu < n->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)) {