/*
protocol_auth.c -- handle the meta-protocol, authentication
- Copyright (C) 1999-2002 Ivo Timmermans <ivo@o2w.nl>,
- 2000-2002 Guus Sliepen <guus@sliepen.eu.org>
+ Copyright (C) 1999-2005 Ivo Timmermans,
+ 2000-2012 Guus Sliepen <guus@tinc-vpn.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- $Id: protocol_auth.c,v 1.1.4.15 2002/09/09 19:39:59 guus Exp $
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "config.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <errno.h>
-
-#include <utils.h>
-#include <xalloc.h>
-#include <avl_tree.h>
-
-#include <openssl/sha.h>
-#include <openssl/rand.h>
-#include <openssl/evp.h>
-
-#ifndef HAVE_RAND_PSEUDO_BYTES
-#define RAND_pseudo_bytes RAND_bytes
-#endif
+#include "system.h"
+#include "splay_tree.h"
#include "conf.h"
-#include "net.h"
-#include "netutl.h"
-#include "protocol.h"
-#include "meta.h"
#include "connection.h"
-#include "node.h"
+#include "control.h"
+#include "control_common.h"
+#include "cipher.h"
+#include "crypto.h"
+#include "digest.h"
#include "edge.h"
#include "graph.h"
+#include "logger.h"
+#include "meta.h"
+#include "net.h"
+#include "netutl.h"
+#include "node.h"
+#include "prf.h"
+#include "protocol.h"
+#include "rsa.h"
+#include "sptps.h"
+#include "utils.h"
+#include "xalloc.h"
+
+static bool send_proxyrequest(connection_t *c) {
+ switch(proxytype) {
+ case PROXY_HTTP: {
+ char *host;
+ char *port;
+
+ sockaddr2str(&c->address, &host, &port);
+ send_request(c, "CONNECT %s:%s HTTP/1.1\r\n\r", host, port);
+ free(host);
+ free(port);
+ return true;
+ }
+ case PROXY_SOCKS4: {
+ if(c->address.sa.sa_family != AF_INET) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Cannot connect to an IPv6 host through a SOCKS 4 proxy!");
+ return false;
+ }
+ char s4req[9 + (proxyuser ? strlen(proxyuser) : 0)];
+ s4req[0] = 4;
+ s4req[1] = 1;
+ memcpy(s4req + 2, &c->address.in.sin_port, 2);
+ memcpy(s4req + 4, &c->address.in.sin_addr, 4);
+ if(proxyuser)
+ memcpy(s4req + 8, proxyuser, strlen(proxyuser));
+ s4req[sizeof s4req - 1] = 0;
+ c->tcplen = 8;
+ return send_meta(c, s4req, sizeof s4req);
+ }
+ case PROXY_SOCKS5: {
+ int 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;
+ s5req[i++] = 5;
+ s5req[i++] = 1;
+ if(proxypass) {
+ s5req[i++] = 2;
+ s5req[i++] = 1;
+ s5req[i++] = strlen(proxyuser);
+ memcpy(s5req + i, proxyuser, strlen(proxyuser));
+ i += strlen(proxyuser);
+ s5req[i++] = strlen(proxypass);
+ memcpy(s5req + i, proxypass, strlen(proxypass));
+ i += strlen(proxypass);
+ c->tcplen += 2;
+ } else {
+ s5req[i++] = 0;
+ }
+ s5req[i++] = 5;
+ s5req[i++] = 1;
+ s5req[i++] = 0;
+ if(c->address.sa.sa_family == AF_INET) {
+ s5req[i++] = 1;
+ memcpy(s5req + i, &c->address.in.sin_addr, 4);
+ i += 4;
+ memcpy(s5req + i, &c->address.in.sin_port, 2);
+ i += 2;
+ c->tcplen += 10;
+ } else if(c->address.sa.sa_family == AF_INET6) {
+ s5req[i++] = 3;
+ memcpy(s5req + i, &c->address.in6.sin6_addr, 16);
+ i += 16;
+ memcpy(s5req + i, &c->address.in6.sin6_port, 2);
+ i += 2;
+ c->tcplen += 22;
+ } else {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Address family %hx not supported for SOCKS 5 proxies!", c->address.sa.sa_family);
+ return false;
+ }
+ if(i > len)
+ abort();
+ return send_meta(c, s5req, sizeof s5req);
+ }
+ case PROXY_SOCKS4A:
+ logger(DEBUG_ALWAYS, LOG_ERR, "Proxy type not implemented yet");
+ return false;
+ case PROXY_EXEC:
+ return true;
+ default:
+ logger(DEBUG_ALWAYS, LOG_ERR, "Unknown proxy type");
+ return false;
+ }
+}
-#include "system.h"
+bool send_id(connection_t *c) {
+ gettimeofday(&c->start, NULL);
-int send_id(connection_t *c)
-{
- cp();
- return send_request(c, "%d %s %d", ID, myself->connection->name, myself->connection->protocol_version);
+ int minor = 0;
+
+ if(experimental) {
+ if(c->config_tree && !read_ecdsa_public_key(c))
+ minor = 1;
+ else
+ minor = myself->connection->protocol_minor;
+ }
+
+ if(proxytype)
+ if(!send_proxyrequest(c))
+ return false;
+
+ return send_request(c, "%d %s %d.%d", ID, myself->connection->name, myself->connection->protocol_major, minor);
}
-int id_h(connection_t *c)
-{
- char name[MAX_STRING_SIZE];
- int bla;
- cp();
- if(sscanf(c->buffer, "%*d "MAX_STRING" %d", name, &c->protocol_version) != 2)
- {
- syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ID", c->name, c->hostname);
- return -1;
- }
-
- /* Check if identity is a valid name */
-
- if(check_id(name))
- {
- syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ID", c->name, c->hostname, "invalid name");
- return -1;
- }
-
- /* If we set c->name in advance, make sure we are connected to the right host */
-
- if(c->name)
- {
- if(strcmp(c->name, name))
- {
- syslog(LOG_ERR, _("Peer %s is %s instead of %s"), c->hostname, name, c->name);
- return -1;
- }
- }
- else
- c->name = xstrdup(name);
-
- /* Check if version matches */
-
- if(c->protocol_version != myself->connection->protocol_version)
- {
- syslog(LOG_ERR, _("Peer %s (%s) uses incompatible version %d"),
- c->name, c->hostname, c->protocol_version);
- return -1;
- }
-
- if(bypass_security)
- {
- if(!c->config_tree)
- init_configuration(&c->config_tree);
- c->allow_request = ACK;
- return send_ack(c);
- }
-
- if(!c->config_tree)
- {
- init_configuration(&c->config_tree);
-
- bla = read_connection_config(c);
-
- if(bla)
- {
- syslog(LOG_ERR, _("Peer %s had unknown identity (%s)"), c->hostname, c->name);
- return -1;
- }
- }
-
- if(read_rsa_public_key(c))
- {
- return -1;
- }
-
- /* Check some options */
-
- if((get_config_bool(lookup_config(c->config_tree, "IndirectData"), &bla) && bla) || myself->options & OPTION_INDIRECT)
- c->options |= OPTION_INDIRECT;
-
- if((get_config_bool(lookup_config(c->config_tree, "TCPOnly"), &bla) && bla) || myself->options & OPTION_TCPONLY)
- c->options |= OPTION_TCPONLY | OPTION_INDIRECT;
-
- c->allow_request = METAKEY;
- cp();
- return send_metakey(c);
+bool id_h(connection_t *c, const char *request) {
+ char name[MAX_STRING_SIZE];
+
+ if(sscanf(request, "%*d " MAX_STRING " %d.%d", name, &c->protocol_major, &c->protocol_minor) < 2) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "ID", c->name,
+ c->hostname);
+ return false;
+ }
+
+ /* Check if this is a control connection */
+
+ if(name[0] == '^' && !strcmp(name + 1, controlcookie)) {
+ c->status.control = true;
+ c->allow_request = CONTROL;
+ c->last_ping_time = time(NULL) + 3600;
+
+ free(c->name);
+ c->name = xstrdup("<control>");
+
+ return send_request(c, "%d %d %d", ACK, TINC_CTL_VERSION_CURRENT, getpid());
+ }
+
+ /* Check if identity is a valid name */
+
+ if(!check_id(name)) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s): %s", "ID", c->name,
+ c->hostname, "invalid name");
+ return false;
+ }
+
+ /* If this is an outgoing connection, make sure we are connected to the right host */
+
+ if(c->outgoing) {
+ if(strcmp(c->name, name)) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Peer %s is %s instead of %s", c->hostname, name,
+ c->name);
+ return false;
+ }
+ } else {
+ if(c->name)
+ free(c->name);
+ c->name = xstrdup(name);
+ }
+
+ /* Check if version matches */
+
+ if(c->protocol_major != myself->connection->protocol_major) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Peer %s (%s) uses incompatible version %d.%d",
+ c->name, c->hostname, c->protocol_major, c->protocol_minor);
+ return false;
+ }
+
+ if(bypass_security) {
+ if(!c->config_tree)
+ init_configuration(&c->config_tree);
+ c->allow_request = ACK;
+ return send_ack(c);
+ }
+
+ if(!experimental)
+ c->protocol_minor = 0;
+
+ if(!c->config_tree) {
+ init_configuration(&c->config_tree);
+
+ if(!read_connection_config(c)) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Peer %s had unknown identity (%s)", c->hostname,
+ c->name);
+ return false;
+ }
+
+ if(experimental && c->protocol_minor >= 2) {
+ if(!read_ecdsa_public_key(c))
+ return false;
+ }
+ } else {
+ if(c->protocol_minor && !ecdsa_active(&c->ecdsa))
+ c->protocol_minor = 1;
+ }
+
+ c->allow_request = METAKEY;
+
+ if(c->protocol_minor >= 2) {
+ c->allow_request = ACK;
+ char label[25 + strlen(myself->name) + strlen(c->name)];
+
+ if(c->outgoing)
+ snprintf(label, sizeof label, "tinc TCP key expansion %s %s", myself->name, c->name);
+ else
+ snprintf(label, sizeof label, "tinc TCP key expansion %s %s", c->name, myself->name);
+
+ return sptps_start(&c->sptps, c, c->outgoing, false, myself->connection->ecdsa, c->ecdsa, label, sizeof label, send_meta_sptps, receive_meta_sptps);
+ } else {
+ return send_metakey(c);
+ }
}
-int send_metakey(connection_t *c)
-{
- char buffer[MAX_STRING_SIZE];
- int len, x;
- cp();
- len = RSA_size(c->rsa_key);
-
- /* Allocate buffers for the meta key */
-
- if(!c->outkey)
- c->outkey = xmalloc(len);
-
- if(!c->outctx)
- c->outctx = xmalloc(sizeof(*c->outctx));
- cp();
- /* Copy random data to the buffer */
-
- RAND_bytes(c->outkey, len);
-
- /* The message we send must be smaller than the modulus of the RSA key.
- By definition, for a key of k bits, the following formula holds:
-
- 2^(k-1) <= modulus < 2^(k)
-
- Where ^ means "to the power of", not "xor".
- This means that to be sure, we must choose our message < 2^(k-1).
- This can be done by setting the most significant bit to zero.
- */
-
- c->outkey[0] &= 0x7F;
-
- if(debug_lvl >= DEBUG_SCARY_THINGS)
- {
- bin2hex(c->outkey, buffer, len);
- buffer[len*2] = '\0';
- syslog(LOG_DEBUG, _("Generated random meta key (unencrypted): %s"), buffer);
- }
-
- /* Encrypt the random data
-
- We do not use one of the PKCS padding schemes here.
- This is allowed, because we encrypt a totally random string
- with a length equal to that of the modulus of the RSA key.
- */
-
- if(RSA_public_encrypt(len, c->outkey, buffer, c->rsa_key, RSA_NO_PADDING) != len)
- {
- syslog(LOG_ERR, _("Error during encryption of meta key for %s (%s)"), c->name, c->hostname);
- return -1;
- }
- cp();
- /* Convert the encrypted random data to a hexadecimal formatted string */
-
- bin2hex(buffer, buffer, len);
- buffer[len*2] = '\0';
-
- /* Send the meta key */
-
- x = send_request(c, "%d %d %d %d %d %s", METAKEY,
- c->outcipher?c->outcipher->nid:0, c->outdigest?c->outdigest->type:0,
- c->outmaclength, c->outcompression, buffer);
-
- /* Further outgoing requests are encrypted with the key we just generated */
-
- if(c->outcipher)
- {
- EVP_EncryptInit(c->outctx, c->outcipher,
- c->outkey + len - c->outcipher->key_len,
- c->outkey + len - c->outcipher->key_len - c->outcipher->iv_len);
-
- c->status.encryptout = 1;
- }
- cp();
- return x;
+bool send_metakey(connection_t *c) {
+ if(!read_rsa_public_key(c))
+ return false;
+
+ if(!cipher_open_blowfish_ofb(&c->outcipher))
+ return false;
+
+ if(!digest_open_sha1(&c->outdigest, -1))
+ return false;
+
+ size_t len = rsa_size(&c->rsa);
+ char key[len];
+ char enckey[len];
+ char hexkey[2 * len + 1];
+
+ /* Create a random key */
+
+ randomize(key, len);
+
+ /* The message we send must be smaller than the modulus of the RSA key.
+ By definition, for a key of k bits, the following formula holds:
+
+ 2^(k-1) <= modulus < 2^(k)
+
+ Where ^ means "to the power of", not "xor".
+ This means that to be sure, we must choose our message < 2^(k-1).
+ This can be done by setting the most significant bit to zero.
+ */
+
+ key[0] &= 0x7F;
+
+ cipher_set_key_from_rsa(&c->outcipher, key, len, true);
+
+ if(debug_level >= DEBUG_SCARY_THINGS) {
+ bin2hex(key, hexkey, len);
+ logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Generated random meta key (unencrypted): %s", hexkey);
+ }
+
+ /* Encrypt the random data
+
+ We do not use one of the PKCS padding schemes here.
+ This is allowed, because we encrypt a totally random string
+ with a length equal to that of the modulus of the RSA key.
+ */
+
+ if(!rsa_public_encrypt(&c->rsa, key, len, enckey)) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Error during encryption of meta key for %s (%s)", c->name, c->hostname);
+ return false;
+ }
+
+ /* Convert the encrypted random data to a hexadecimal formatted string */
+
+ bin2hex(enckey, hexkey, len);
+
+ /* 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,
+ c->outcompression, hexkey);
+
+ c->status.encryptout = true;
+ return result;
}
-int metakey_h(connection_t *c)
-{
- char buffer[MAX_STRING_SIZE];
- int cipher, digest, maclength, compression;
- int len;
- cp();
- if(sscanf(c->buffer, "%*d %d %d %d %d "MAX_STRING, &cipher, &digest, &maclength, &compression, buffer) != 5)
- {
- syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "METAKEY", c->name, c->hostname);
- return -1;
- }
- cp();
- len = RSA_size(myself->connection->rsa_key);
-
- /* Check if the length of the meta key is all right */
-
- if(strlen(buffer) != len*2)
- {
- syslog(LOG_ERR, _("Possible intruder %s (%s): %s"), c->name, c->hostname, "wrong keylength");
- return -1;
- }
-
- /* Allocate buffers for the meta key */
- cp();
- if(!c->inkey)
- c->inkey = xmalloc(len);
-
- if(!c->inctx)
- c->inctx = xmalloc(sizeof(*c->inctx));
-
- /* Convert the challenge from hexadecimal back to binary */
- cp();
- hex2bin(buffer,buffer,len);
-
- /* Decrypt the meta key */
- cp();
- if(RSA_private_decrypt(len, buffer, c->inkey, myself->connection->rsa_key, RSA_NO_PADDING) != len) /* See challenge() */
- {
- syslog(LOG_ERR, _("Error during encryption of meta key for %s (%s)"), c->name, c->hostname);
- return -1;
- }
-
- if(debug_lvl >= DEBUG_SCARY_THINGS)
- {
- bin2hex(c->inkey, buffer, len);
- buffer[len*2] = '\0';
- syslog(LOG_DEBUG, _("Received random meta key (unencrypted): %s"), buffer);
- }
-
- /* All incoming requests will now be encrypted. */
- cp();
- /* Check and lookup cipher and digest algorithms */
-
- if(cipher)
- {
- c->incipher = EVP_get_cipherbynid(cipher);
- if(!c->incipher)
- {
- syslog(LOG_ERR, _("%s (%s) uses unknown cipher!"), c->name, c->hostname);
- return -1;
+bool metakey_h(connection_t *c, const char *request) {
+ char hexkey[MAX_STRING_SIZE];
+ int cipher, digest, maclength, compression;
+ size_t len = rsa_size(&myself->connection->rsa);
+ char enckey[len];
+ char key[len];
+
+ if(sscanf(request, "%*d %d %d %d %d " MAX_STRING, &cipher, &digest, &maclength, &compression, hexkey) != 5) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "METAKEY", c->name, c->hostname);
+ return false;
}
- EVP_DecryptInit(c->inctx, c->incipher,
- c->inkey + len - c->incipher->key_len,
- c->inkey + len - c->incipher->key_len - c->incipher->iv_len);
-
- c->status.decryptin = 1;
- }
- else
- {
- c->incipher = NULL;
- }
-
- c->inmaclength = maclength;
-
- if(digest)
- {
- c->indigest = EVP_get_digestbynid(digest);
- if(!c->indigest)
- {
- syslog(LOG_ERR, _("Node %s (%s) uses unknown digest!"), c->name, c->hostname);
- return -1;
+ /* Convert the challenge from hexadecimal back to binary */
+
+ int inlen = hex2bin(hexkey, enckey, sizeof enckey);
+
+ /* Check if the length of the meta key is all right */
+
+ if(inlen != len) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Possible intruder %s (%s): %s", c->name, c->hostname, "wrong keylength");
+ return false;
}
-
- if(c->inmaclength > c->indigest->md_size || c->inmaclength < 0)
- {
- syslog(LOG_ERR, _("%s (%s) uses bogus MAC length!"), c->name, c->hostname);
- return -1;
+
+ /* Decrypt the meta key */
+
+ if(!rsa_private_decrypt(&myself->connection->rsa, enckey, len, key)) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Error during decryption of meta key for %s (%s)", c->name, c->hostname);
+ return false;
}
- }
- else
- {
- c->indigest = NULL;
- }
- c->incompression = compression;
+ if(debug_level >= DEBUG_SCARY_THINGS) {
+ bin2hex(key, hexkey, len);
+ logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Received random meta key (unencrypted): %s", hexkey);
+ }
- c->allow_request = CHALLENGE;
- cp();
- return send_challenge(c);
-}
+ /* Check and lookup cipher and digest algorithms */
-int send_challenge(connection_t *c)
-{
- char buffer[MAX_STRING_SIZE];
- int len, x;
- cp();
- /* CHECKME: what is most reasonable value for len? */
+ 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;
+ }
- len = RSA_size(c->rsa_key);
+ if(!digest_open_by_nid(&c->indigest, digest, -1)) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Error during initialisation of digest from %s (%s)", c->name, c->hostname);
+ return false;
+ }
- /* Allocate buffers for the challenge */
+ c->status.decryptin = true;
- if(!c->hischallenge)
- c->hischallenge = xmalloc(len);
- cp();
- /* Copy random data to the buffer */
+ c->allow_request = CHALLENGE;
- RAND_bytes(c->hischallenge, len);
+ return send_challenge(c);
+}
+
+bool send_challenge(connection_t *c) {
+ size_t len = rsa_size(&c->rsa);
+ char buffer[len * 2 + 1];
+
+ if(!c->hischallenge)
+ c->hischallenge = xrealloc(c->hischallenge, len);
+
+ /* Copy random data to the buffer */
+
+ randomize(c->hischallenge, len);
- cp();
- /* Convert to hex */
+ /* Convert to hex */
- bin2hex(c->hischallenge, buffer, len);
- buffer[len*2] = '\0';
+ bin2hex(c->hischallenge, buffer, len);
- cp();
- /* Send the challenge */
+ /* Send the challenge */
- x = send_request(c, "%d %s", CHALLENGE, buffer);
- cp();
- return x;
+ return send_request(c, "%d %s", CHALLENGE, buffer);
}
-int challenge_h(connection_t *c)
-{
- char buffer[MAX_STRING_SIZE];
- int len;
- cp();
- if(sscanf(c->buffer, "%*d "MAX_STRING, buffer) != 1)
- {
- syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "CHALLENGE", c->name, c->hostname);
- return -1;
- }
+bool challenge_h(connection_t *c, const char *request) {
+ char buffer[MAX_STRING_SIZE];
+ size_t len = rsa_size(&myself->connection->rsa);
+ size_t digestlen = digest_length(&c->indigest);
+ char digest[digestlen];
- len = RSA_size(myself->connection->rsa_key);
+ if(sscanf(request, "%*d " MAX_STRING, buffer) != 1) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "CHALLENGE", c->name, c->hostname);
+ return false;
+ }
+
+ /* Convert the challenge from hexadecimal back to binary */
+
+ int inlen = hex2bin(buffer, buffer, sizeof buffer);
- /* Check if the length of the challenge is all right */
+ /* Check if the length of the challenge is all right */
+
+ if(inlen != len) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Possible intruder %s (%s): %s", c->name, c->hostname, "wrong challenge length");
+ return false;
+ }
- if(strlen(buffer) != len*2)
- {
- syslog(LOG_ERR, _("Possible intruder %s (%s): %s"), c->name, c->hostname, "wrong challenge length");
- return -1;
- }
+ c->allow_request = CHAL_REPLY;
- /* Allocate buffers for the challenge */
+ /* Calculate the hash from the challenge we received */
- if(!c->mychallenge)
- c->mychallenge = xmalloc(len);
+ digest_create(&c->indigest, buffer, len, digest);
- /* Convert the challenge from hexadecimal back to binary */
+ /* Convert the hash to a hexadecimal formatted string */
- hex2bin(buffer,c->mychallenge,len);
+ bin2hex(digest, buffer, digestlen);
- c->allow_request = CHAL_REPLY;
+ /* Send the reply */
- /* Rest is done by send_chal_reply() */
- cp();
- return send_chal_reply(c);
+ return send_request(c, "%d %s", CHAL_REPLY, buffer);
}
-int send_chal_reply(connection_t *c)
-{
- char hash[EVP_MAX_MD_SIZE*2+1];
- EVP_MD_CTX ctx;
- cp();
- /* Calculate the hash from the challenge we received */
+bool chal_reply_h(connection_t *c, const char *request) {
+ char hishash[MAX_STRING_SIZE];
- EVP_DigestInit(&ctx, c->indigest);
- EVP_DigestUpdate(&ctx, c->mychallenge, RSA_size(myself->connection->rsa_key));
- EVP_DigestFinal(&ctx, hash, NULL);
+ if(sscanf(request, "%*d " MAX_STRING, hishash) != 1) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "CHAL_REPLY", c->name,
+ c->hostname);
+ return false;
+ }
+
+ /* Convert the hash to binary format */
+
+ int inlen = hex2bin(hishash, hishash, sizeof hishash);
- /* Convert the hash to a hexadecimal formatted string */
+ /* Check if the length of the hash is all right */
+
+ 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;
+ }
+
+
+ /* Verify the hash */
+
+ 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;
+ }
- bin2hex(hash,hash,c->indigest->md_size);
- hash[c->indigest->md_size*2] = '\0';
+ /* Identity has now been positively verified.
+ Send an acknowledgement with the rest of the information needed.
+ */
- /* Send the reply */
+ free(c->hischallenge);
+ c->hischallenge = NULL;
+ c->allow_request = ACK;
- cp();
- return send_request(c, "%d %s", CHAL_REPLY, hash);
+ return send_ack(c);
}
-int chal_reply_h(connection_t *c)
-{
- char hishash[MAX_STRING_SIZE];
- char myhash[EVP_MAX_MD_SIZE];
- EVP_MD_CTX ctx;
- cp();
- if(sscanf(c->buffer, "%*d "MAX_STRING, hishash) != 1)
- {
- syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "CHAL_REPLY", c->name, c->hostname);
- return -1;
- }
-
- /* Check if the length of the hash is all right */
-
- if(strlen(hishash) != c->outdigest->md_size*2)
- {
- syslog(LOG_ERR, _("Possible intruder %s (%s): %s"), c->name, c->hostname, _("wrong challenge reply length"));
- return -1;
- }
-
- /* Convert the hash to binary format */
-
- hex2bin(hishash, hishash, c->outdigest->md_size);
-
- /* Calculate the hash from the challenge we sent */
-
- EVP_DigestInit(&ctx, c->outdigest);
- EVP_DigestUpdate(&ctx, c->hischallenge, RSA_size(c->rsa_key));
- EVP_DigestFinal(&ctx, myhash, NULL);
-
- /* Verify the incoming hash with the calculated hash */
-
- if(memcmp(hishash, myhash, c->outdigest->md_size))
- {
- syslog(LOG_ERR, _("Possible intruder %s (%s): %s"), c->name, c->hostname, _("wrong challenge reply"));
- if(debug_lvl >= DEBUG_SCARY_THINGS)
- {
- bin2hex(myhash, hishash, SHA_DIGEST_LENGTH);
- hishash[SHA_DIGEST_LENGTH*2] = '\0';
- syslog(LOG_DEBUG, _("Expected challenge reply: %s"), hishash);
- }
- return -1;
- }
-
- /* Identity has now been positively verified.
- Send an acknowledgement with the rest of the information needed.
- */
-
- c->allow_request = ACK;
- cp();
- return send_ack(c);
+static bool send_upgrade(connection_t *c) {
+ /* Special case when protocol_minor is 1: the other end is ECDSA capable,
+ * but doesn't know our key yet. So send it now. */
+
+ char *pubkey = ecdsa_get_base64_public_key(&myself->connection->ecdsa);
+
+ if(!pubkey)
+ return false;
+
+ bool result = send_request(c, "%d %s", ACK, pubkey);
+ free(pubkey);
+ return result;
}
-int send_ack(connection_t *c)
-{
- /* ACK message contains rest of the information the other end needs
- to create node_t and edge_t structures. */
-
- int x;
- struct timeval now;
- cp();
- /* Estimate weight */
-
- gettimeofday(&now, NULL);
- c->estimated_weight = (now.tv_sec - c->start.tv_sec) * 1000 + (now.tv_usec - c->start.tv_usec) / 1000;
- x = send_request(c, "%d %s %d %lx", ACK, myport, c->estimated_weight, c->options);
- cp();
- return x;
+bool send_ack(connection_t *c) {
+ if(c->protocol_minor == 1)
+ return send_upgrade(c);
+
+ /* ACK message contains rest of the information the other end needs
+ to create node_t and edge_t structures. */
+
+ struct timeval now;
+ bool choice;
+
+ /* Estimate weight */
+
+ gettimeofday(&now, NULL);
+ c->estimated_weight = (now.tv_sec - c->start.tv_sec) * 1000 + (now.tv_usec - c->start.tv_usec) / 1000;
+
+ /* 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;
+
+ get_config_int(lookup_config(c->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));
}
-void send_everything(connection_t *c)
-{
- avl_node_t *node, *node2;
- node_t *n;
- subnet_t *s;
- edge_t *e;
-
- /* Send all known subnets and edges */
-
- for(node = node_tree->head; node; node = node->next)
- {
- n = (node_t *)node->data;
-
- for(node2 = n->subnet_tree->head; node2; node2 = node2->next)
- {
- s = (subnet_t *)node2->data;
- send_add_subnet(c, s);
- }
-
- for(node2 = n->edge_tree->head; node2; node2 = node2->next)
- {
- e = (edge_t *)node2->data;
- send_add_edge(c, e);
- }
- }
+static void send_everything(connection_t *c) {
+ splay_node_t *node, *node2;
+ node_t *n;
+ subnet_t *s;
+ edge_t *e;
+
+ /* Send all known subnets and edges */
+
+ if(tunnelserver) {
+ for(node = myself->subnet_tree->head; node; node = node->next) {
+ s = node->data;
+ send_add_subnet(c, s);
+ }
+
+ return;
+ }
+
+ for(node = node_tree->head; node; node = node->next) {
+ n = node->data;
+
+ for(node2 = n->subnet_tree->head; node2; node2 = node2->next) {
+ s = node2->data;
+ send_add_subnet(c, s);
+ }
+
+ for(node2 = n->edge_tree->head; node2; node2 = node2->next) {
+ e = node2->data;
+ send_add_edge(c, e);
+ }
+ }
+}
+
+static bool upgrade_h(connection_t *c, const char *request) {
+ char pubkey[MAX_STRING_SIZE];
+
+ if(sscanf(request, "%*d " MAX_STRING, pubkey) != 1) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "ACK", c->name, c->hostname);
+ return false;
+ }
+
+ if(ecdsa_active(&c->ecdsa) || read_ecdsa_public_key(c)) {
+ logger(DEBUG_ALWAYS, LOG_INFO, "Already have ECDSA public key from %s (%s), not upgrading.", c->name, c->hostname);
+ return false;
+ }
+
+ logger(DEBUG_ALWAYS, LOG_INFO, "Got ECDSA public key from %s (%s), upgrading!", c->name, c->hostname);
+ append_config_file(c->name, "ECDSAPublicKey", pubkey);
+ c->allow_request = TERMREQ;
+ return send_termreq(c);
}
-int ack_h(connection_t *c)
-{
- char hisport[MAX_STRING_SIZE];
- char *hisaddress, *dummy;
- int weight;
- long int options;
- node_t *n;
- cp();
- if(sscanf(c->buffer, "%*d "MAX_STRING" %d %lx", hisport, &weight, &options) != 3)
- {
- syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ACK", c->name, c->hostname);
- return -1;
- }
-
- /* Check if we already have a node_t for him */
-
- n = lookup_node(c->name);
-
- if(!n)
- {
- n = new_node();
- n->name = xstrdup(c->name);
- node_add(n);
- }
- else
- {
- if(n->connection)
- {
- /* Oh dear, we already have a connection to this node. */
- if(debug_lvl >= DEBUG_CONNECTIONS)
- syslog(LOG_DEBUG, _("Established a second connection with %s (%s), closing old connection"), n->name, n->hostname);
- terminate_connection(n->connection, 0);
- }
- }
-
- n->connection = c;
- c->node = n;
- c->options |= options;
-
- /* Activate this connection */
-
- c->allow_request = ALL;
- c->status.active = 1;
-
- if(debug_lvl >= DEBUG_CONNECTIONS)
- syslog(LOG_NOTICE, _("Connection with %s (%s) activated"), c->name, c->hostname);
-
- /* Send him everything we know */
-
- send_everything(c);
-
- /* Create an edge_t for this connection */
-
- c->edge = new_edge();
- cp();
- c->edge->from = myself;
- c->edge->to = n;
- sockaddr2str(&c->address, &hisaddress, &dummy);
- c->edge->address = str2sockaddr(hisaddress, hisport);
- free(hisaddress);
- free(dummy);
- c->edge->weight = (weight + c->estimated_weight) / 2;
- c->edge->connection = c;
- c->edge->options = c->options;
- cp();
- edge_add(c->edge);
-
- cp();
- /* Notify everyone of the new edge */
-
- send_add_edge(broadcast, c->edge);
-
- /* Run MST and SSSP algorithms */
-
- graph();
- cp();
- return 0;
+bool ack_h(connection_t *c, const char *request) {
+ if(c->protocol_minor == 1)
+ return upgrade_h(c, request);
+
+ char hisport[MAX_STRING_SIZE];
+ char *hisaddress;
+ int weight, mtu;
+ uint32_t options;
+ node_t *n;
+ bool choice;
+
+ if(sscanf(request, "%*d " MAX_STRING " %d %x", hisport, &weight, &options) != 3) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "ACK", c->name,
+ c->hostname);
+ return false;
+ }
+
+ /* Check if we already have a node_t for him */
+
+ n = lookup_node(c->name);
+
+ if(!n) {
+ n = new_node();
+ n->name = xstrdup(c->name);
+ node_add(n);
+ } else {
+ if(n->connection) {
+ /* Oh dear, we already have a connection to this node. */
+ logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Established a second connection with %s (%s), closing old connection", n->connection->name, n->connection->hostname);
+
+ if(n->connection->outgoing) {
+ if(c->outgoing)
+ logger(DEBUG_ALWAYS, LOG_WARNING, "Two outgoing connections to the same node!");
+ else
+ c->outgoing = n->connection->outgoing;
+
+ n->connection->outgoing = NULL;
+ }
+
+ terminate_connection(n->connection, false);
+ /* Run graph algorithm to purge key and make sure up/down scripts are rerun with new IP addresses and stuff */
+ graph();
+ }
+ }
+
+ n->connection = c;
+ c->node = n;
+ if(!(c->options & options & OPTION_PMTU_DISCOVERY)) {
+ c->options &= ~OPTION_PMTU_DISCOVERY;
+ options &= ~OPTION_PMTU_DISCOVERY;
+ }
+ 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;
+ c->status.active = true;
+
+ logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Connection with %s (%s) activated", c->name,
+ c->hostname);
+
+ /* Send him everything we know */
+
+ send_everything(c);
+
+ /* Create an edge_t for this connection */
+
+ c->edge = new_edge();
+ c->edge->from = myself;
+ c->edge->to = n;
+ sockaddr2str(&c->address, &hisaddress, NULL);
+ c->edge->address = str2sockaddr(hisaddress, hisport);
+ free(hisaddress);
+ c->edge->weight = (weight + c->estimated_weight) / 2;
+ c->edge->connection = c;
+ c->edge->options = c->options;
+
+ edge_add(c->edge);
+
+ /* Notify everyone of the new edge */
+
+ if(tunnelserver)
+ send_add_edge(c, c->edge);
+ else
+ send_add_edge(everyone, c->edge);
+
+ /* Run MST and SSSP algorithms */
+
+ graph();
+
+ return true;
}