#include "control_common.h"
#include "cipher.h"
#include "crypto.h"
-#include "device.h"
#include "digest.h"
#include "ecdsa.h"
#include "edge.h"
#include "net.h"
#include "netutl.h"
#include "node.h"
-#include "prf.h"
#include "protocol.h"
#include "rsa.h"
#include "script.h"
#include "xalloc.h"
#include "ed25519/sha512.h"
+#include "keys.h"
int invitation_lifetime;
ecdsa_t *invitation_key = NULL;
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);
}
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;
int minor = 0;
if(experimental) {
- if(c->outgoing && !read_ecdsa_public_key(c)) {
+ if(c->outgoing && !read_ecdsa_public_key(&c->ecdsa, &c->config_tree, c->name)) {
minor = 1;
} else {
minor = myself->connection->protocol_minor;
environment_add(&env, "REMOTEADDRESS=%s", address);
environment_add(&env, "NAME=%s", myself->name);
+ free(address);
+ free(port);
+
execute_script("invitation-accepted", &env);
environment_exit(&env);
}
if(experimental) {
- read_ecdsa_public_key(c);
+ read_ecdsa_public_key(&c->ecdsa, &c->config_tree, c->name);
}
/* Ignore failures if no key known yet */
return false;
}
- if(!read_rsa_public_key(c)) {
+ if(!read_rsa_public_key(&c->rsa, c->config_tree, c->name)) {
return false;
}
by Cipher.
*/
- int keylen = cipher_keylength(myself->incipher);
+ size_t keylen = cipher_keylength(myself->incipher);
if(keylen <= 16) {
c->outcipher = cipher_open_by_name("aes-128-cfb");
c->outcipher = cipher_open_by_name("aes-256-cfb");
}
- if(!c) {
- return false;
- }
-
c->outbudget = cipher_budget(c->outcipher);
- if(!(c->outdigest = digest_open_by_name("sha256", -1))) {
+ if(!(c->outdigest = digest_open_by_name("sha256", DIGEST_ALGO_SIZE))) {
return false;
}
c->inbudget = cipher_budget(c->incipher);
if(digest) {
- if(!(c->indigest = digest_open_by_nid(digest, -1))) {
+ if(!(c->indigest = digest_open_by_nid(digest, DIGEST_ALGO_SIZE))) {
logger(DEBUG_ALWAYS, LOG_ERR, "Error during initialisation of digest from %s (%s)", c->name, c->hostname);
return false;
}
/* 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 */
return false;
}
- if(ecdsa_active(c->ecdsa) || read_ecdsa_public_key(c)) {
+ if(ecdsa_active(c->ecdsa) || read_ecdsa_public_key(&c->ecdsa, &c->config_tree, c->name)) {
char *knownkey = ecdsa_get_base64_public_key(c->ecdsa);
bool different = strcmp(knownkey, pubkey);
free(knownkey);