/*
protocol_auth.c -- handle the meta-protocol, authentication
Copyright (C) 1999-2005 Ivo Timmermans,
- 2000-2017 Guus Sliepen <guus@tinc-vpn.org>
+ 2000-2022 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
memcpy(hashbuf, data, 18);
memcpy(hashbuf + 18, fingerprint, sizeof(hashbuf) - 18);
sha512(hashbuf, sizeof(hashbuf), cookie);
- b64encode_urlsafe(cookie, cookie, 18);
+ b64encode_tinc_urlsafe(cookie, cookie, 18);
free(fingerprint);
char filename[PATH_MAX], usedname[PATH_MAX];
// Read the new node's Name from the file
char buf[1024] = "";
- fgets(buf, sizeof(buf), f);
+
+ if(!fgets(buf, sizeof(buf), f)) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Could not read invitation file %s\n", cookie);
+ return false;
+ }
+
size_t buflen = strlen(buf);
// Strip whitespace at the end
*/
size_t keylen = cipher_keylength(myself->incipher);
+ const char *cipher_name;
if(keylen <= 16) {
- c->outcipher = cipher_open_by_name("aes-128-cfb");
+ cipher_name = "aes-128-cfb";
} else if(keylen <= 24) {
- c->outcipher = cipher_open_by_name("aes-192-cfb");
+ cipher_name = "aes-192-cfb";
} else {
- c->outcipher = cipher_open_by_name("aes-256-cfb");
+ cipher_name = "aes-256-cfb";
+ }
+
+ if(!cipher_open_by_name(&c->outcipher, cipher_name)) {
+ return false;
}
- c->outbudget = cipher_budget(c->outcipher);
+ c->outbudget = cipher_budget(&c->outcipher);
- if(!(c->outdigest = digest_open_by_name("sha256", DIGEST_ALGO_SIZE))) {
+ if(!digest_open_by_name(&c->outdigest, "sha256", DIGEST_ALGO_SIZE)) {
+ cipher_close(&c->outcipher);
return false;
}
key[0] &= 0x7F;
- if(!cipher_set_key_from_rsa(c->outcipher, key, len, true)) {
+ if(!cipher_set_key_from_rsa(&c->outcipher, key, len, true)) {
return false;
}
/* 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,
+ cipher_get_nid(&c->outcipher),
+ digest_get_nid(&c->outdigest), c->outmaclength,
c->outcompression, hexkey);
c->status.encryptout = true;
/* Check and lookup cipher and digest algorithms */
if(cipher) {
- if(!(c->incipher = cipher_open_by_nid(cipher)) || !cipher_set_key_from_rsa(c->incipher, key, len, false)) {
+ 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;
}
return false;
}
- c->inbudget = cipher_budget(c->incipher);
+ c->inbudget = cipher_budget(&c->incipher);
if(digest) {
- if(!(c->indigest = digest_open_by_nid(digest, DIGEST_ALGO_SIZE))) {
+ if(!digest_open_by_nid(&c->indigest, digest, DIGEST_ALGO_SIZE)) {
logger(DEBUG_ALWAYS, LOG_ERR, "Error during initialisation of digest from %s (%s)", c->name, c->hostname);
return false;
}
bool send_chal_reply(connection_t *c) {
const size_t len = rsa_size(myself->connection->rsa);
- size_t digestlen = digest_length(c->indigest);
+ size_t digestlen = digest_length(&c->indigest);
char digest[digestlen * 2 + 1];
/* Calculate the hash from the challenge we received */
- if(!digest_create(c->indigest, c->mychallenge, len, digest)) {
+ if(!digest_create(&c->indigest, c->mychallenge, len, digest)) {
return false;
}
/* Check if the length of the hash is all right */
- if(inlen != digest_length(c->outdigest)) {
+ 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)) {
+ 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;
}