projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make apt stop asking questions when building deb package.
[tinc]
/
src
/
protocol_auth.c
diff --git
a/src/protocol_auth.c
b/src/protocol_auth.c
index
a270ffc
..
e16fe4f
100644
(file)
--- a/
src/protocol_auth.c
+++ b/
src/protocol_auth.c
@@
-26,7
+26,6
@@
#include "control_common.h"
#include "cipher.h"
#include "crypto.h"
#include "control_common.h"
#include "cipher.h"
#include "crypto.h"
-#include "device.h"
#include "digest.h"
#include "ecdsa.h"
#include "edge.h"
#include "digest.h"
#include "ecdsa.h"
#include "edge.h"
@@
-37,7
+36,6
@@
#include "net.h"
#include "netutl.h"
#include "node.h"
#include "net.h"
#include "netutl.h"
#include "node.h"
-#include "prf.h"
#include "protocol.h"
#include "rsa.h"
#include "script.h"
#include "protocol.h"
#include "rsa.h"
#include "script.h"
@@
-46,6
+44,7
@@
#include "xalloc.h"
#include "ed25519/sha512.h"
#include "xalloc.h"
#include "ed25519/sha512.h"
+#include "keys.h"
int invitation_lifetime;
ecdsa_t *invitation_key = NULL;
int invitation_lifetime;
ecdsa_t *invitation_key = NULL;
@@
-69,7
+68,7
@@
static bool send_proxyrequest(connection_t *c) {
return false;
}
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);
s4req[0] = 4;
s4req[1] = 1;
memcpy(s4req + 2, &c->address.in.sin_port, 2);
@@
-85,15
+84,15
@@
static bool send_proxyrequest(connection_t *c) {
}
case PROXY_SOCKS5: {
}
case PROXY_SOCKS5: {
-
in
t 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);
}
c->tcplen = 2;
if(proxypass) {
len += 3 + strlen(proxyuser) + strlen(proxypass);
}
-
char
s5req[len];
-
in
t i = 0;
+
uint8_t
s5req[len];
+
size_
t i = 0;
s5req[i++] = 5;
s5req[i++] = 1;
s5req[i++] = 5;
s5req[i++] = 1;
@@
-160,7
+159,7
@@
bool send_id(connection_t *c) {
int minor = 0;
if(experimental) {
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;
minor = 1;
} else {
minor = myself->connection->protocol_minor;
@@
-214,6
+213,9
@@
static bool finalize_invitation(connection_t *c, const char *data, uint16_t len)
environment_add(&env, "REMOTEADDRESS=%s", address);
environment_add(&env, "NAME=%s", myself->name);
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);
execute_script("invitation-accepted", &env);
environment_exit(&env);
@@
-450,7
+452,7
@@
bool id_h(connection_t *c, const char *request) {
}
if(experimental) {
}
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 */
}
/* Ignore failures if no key known yet */
@@
-497,7
+499,7
@@
bool send_metakey(connection_t *c) {
return false;
}
return false;
}
- if(!read_rsa_public_key(
c
)) {
+ if(!read_rsa_public_key(
&c->rsa, c->config_tree, c->name
)) {
return false;
}
return false;
}
@@
-506,7
+508,7
@@
bool send_metakey(connection_t *c) {
by Cipher.
*/
by Cipher.
*/
-
in
t keylen = cipher_keylength(myself->incipher);
+
size_
t keylen = cipher_keylength(myself->incipher);
if(keylen <= 16) {
c->outcipher = cipher_open_by_name("aes-128-cfb");
if(keylen <= 16) {
c->outcipher = cipher_open_by_name("aes-128-cfb");
@@
-516,13
+518,9
@@
bool send_metakey(connection_t *c) {
c->outcipher = cipher_open_by_name("aes-256-cfb");
}
c->outcipher = cipher_open_by_name("aes-256-cfb");
}
- if(!c) {
- return false;
- }
-
c->outbudget = cipher_budget(c->outcipher);
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;
}
return false;
}
@@
-637,7
+635,7
@@
bool metakey_h(connection_t *c, const char *request) {
c->inbudget = cipher_budget(c->incipher);
if(digest) {
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;
}
logger(DEBUG_ALWAYS, LOG_ERR, "Error during initialisation of digest from %s (%s)", c->name, c->hostname);
return false;
}
@@
-843,7
+841,7
@@
bool send_ack(connection_t *c) {
/* Estimate weight */
gettimeofday(&now, NULL);
/* 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 */
/* Check some options */
@@
-914,7
+912,7
@@
static bool upgrade_h(connection_t *c, const char *request) {
return false;
}
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);
char *knownkey = ecdsa_get_base64_public_key(c->ecdsa);
bool different = strcmp(knownkey, pubkey);
free(knownkey);