/*
invitation.c -- Create and accept invitations
- Copyright (C) 2013-2014 Guus Sliepen <guus@meshlink.io>
+ Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
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
#include "ecdsagen.h"
#include "invitation.h"
#include "netutl.h"
-#include "rsagen.h"
#include "sptps.h"
#include "tincctl.h"
#include "utils.h"
char *port = NULL;
char *hostport = NULL;
char *name = get_my_name(false);
- char *filename = NULL;
+ char filename[PATH_MAX];
// Use first Address statement in own host config file
if(check_id(name)) {
- xasprintf(&filename, "%s" SLASH "hosts" SLASH "%s", confbase, name);
+ snprintf(filename,PATH_MAX, "%s" SLASH "hosts" SLASH "%s", confbase, name);
scan_for_hostname(filename, &hostname, &port);
scan_for_hostname(tinc_conf, &hostname, &port);
}
free(hostname);
free(port);
- free(filename);
return hostport;
}
return 1;
// Ensure no host configuration file with that name exists
- char *filename = NULL;
- xasprintf(&filename, "%s" SLASH "hosts" SLASH "%s", confbase, argv[1]);
+ char filename [PATH_MAX];
+ snprintf(filename,PATH_MAX, "%s" SLASH "hosts" SLASH "%s", confbase, argv[1]);
if(!access(filename, F_OK)) {
- free(filename);
fprintf(stderr, "A host config file for %s already exists!\n", argv[1]);
return 1;
}
- free(filename);
// If a daemon is running, ensure no other nodes now about this name
bool found = false;
}
}
- char hash[25];
+ char hash[64];
- xasprintf(&filename, "%s" SLASH "invitations", confbase);
+ snprintf(filename,PATH_MAX, "%s" SLASH "invitations", confbase);
if(mkdir(filename, 0700) && errno != EEXIST) {
fprintf(stderr, "Could not create directory %s: %s\n", filename, strerror(errno));
- free(filename);
return 1;
}
DIR *dir = opendir(filename);
if(!dir) {
fprintf(stderr, "Could not read directory %s: %s\n", filename, strerror(errno));
- free(filename);
return 1;
}
while((ent = readdir(dir))) {
if(strlen(ent->d_name) != 24)
continue;
- char *invname;
+ char invname[PATH_MAX];
struct stat st;
- xasprintf(&invname, "%s" SLASH "%s", filename, ent->d_name);
+ snprintf(invname,PATH_MAX, "%s" SLASH "%s", filename, ent->d_name);
if(!stat(invname, &st)) {
if(deadline < st.st_mtime)
count++;
fprintf(stderr, "Could not stat %s: %s\n", invname, strerror(errno));
errno = 0;
}
- free(invname);
}
if(errno) {
fprintf(stderr, "Error while reading directory %s: %s\n", filename, strerror(errno));
closedir(dir);
- free(filename);
return 1;
}
closedir(dir);
- free(filename);
ecdsa_t *key;
- xasprintf(&filename, "%s" SLASH "invitations" SLASH "ecdsa_key.priv", confbase);
+ snprintf(filename,PATH_MAX, "%s" SLASH "invitations" SLASH "ecdsa_key.priv", confbase);
// Remove the key if there are no outstanding invitations.
if(!count)
if(!f) {
if(errno != ENOENT) {
fprintf(stderr, "Could not read %s: %s\n", filename, strerror(errno));
- free(filename);
return 1;
}
key = ecdsa_generate();
if(!key) {
- free(filename);
return 1;
}
f = fopen(filename, "w");
if(!f) {
fprintf(stderr, "Could not write %s: %s\n", filename, strerror(errno));
- free(filename);
return 1;
}
chmod(filename, 0600);
fprintf(stderr, "Could not read private key from %s\n", filename);
}
- free(filename);
if(!key)
return 1;
// Create a hash of the key.
char *fingerprint = ecdsa_get_base64_public_key(key);
- digest_t *digest = digest_open_by_name("sha256", 18);
- if(!digest)
- abort();
- digest_create(digest, fingerprint, strlen(fingerprint), hash);
+ sha512(fingerprint, strlen(fingerprint), hash);
b64encode_urlsafe(hash, hash, 18);
// Create a random cookie for this invitation.
// Create a filename that doesn't reveal the cookie itself
char buf[18 + strlen(fingerprint)];
- char cookiehash[25];
+ char cookiehash[64];
memcpy(buf, cookie, 18);
memcpy(buf + 18, fingerprint, sizeof buf - 18);
- digest_create(digest, buf, sizeof buf, cookiehash);
+ sha512(buf, sizeof buf, cookiehash);
b64encode_urlsafe(cookiehash, cookiehash, 18);
b64encode_urlsafe(cookie, cookie, 18);
// Create a file containing the details of the invitation.
- xasprintf(&filename, "%s" SLASH "invitations" SLASH "%s", confbase, cookiehash);
+ snprintf(filename,PATH_MAX, "%s" SLASH "invitations" SLASH "%s", confbase, cookiehash);
int ifd = open(filename, O_RDWR | O_CREAT | O_EXCL, 0600);
if(!ifd) {
fprintf(stderr, "Could not create invitation file %s: %s\n", filename, strerror(errno));
- free(filename);
return 1;
}
f = fdopen(ifd, "w");
fprintf(f, "#---------------------------------------------------------------#\n");
fprintf(f, "Name = %s\n", myname);
- char *filename2;
- xasprintf(&filename2, "%s" SLASH "hosts" SLASH "%s", confbase, myname);
+ char filename2[PATH_MAX];
+ snsprintf(filename2,PATH_MAX, "%s" SLASH "hosts" SLASH "%s", confbase, myname);
fcopy(f, filename2);
fclose(f);
- free(filename2);
// Create an URL from the local address, key hash and cookie
char *url;
sptps_send_record(&sptps, 1, b64key, strlen(b64key));
free(b64key);
-
- rsa_t *rsa = rsa_generate(2048, 0x1001);
- xasprintf(&filename, "%s" SLASH "rsa_key.priv", confbase);
- f = fopenmask(filename, "w", 0600);
-
- rsa_write_pem_private_key(rsa, f);
- fclose(f);
-
- rsa_write_pem_public_key(rsa, fh);
- fclose(fh);
-
ecdsa_free(key);
- rsa_free(rsa);
check_port(name);
// Check if the hash of the key he gave us matches the hash in the URL.
char *fingerprint = line + 2;
- digest_t *digest = digest_open_by_name("sha256", 18);
- if(!digest)
- abort();
- char hishash[18];
- if(!digest_create(digest, fingerprint, strlen(fingerprint), hishash)) {
- fprintf(stderr, "Could not create digest\n%s\n", line + 2);
+ char hishash[64];
+ if(!sha512(fingerprint, strlen(fingerprint), hishash)) {
+ fprintf(stderr, "Could not create hash\n%s\n", line + 2);
return 1;
}
if(memcmp(hishash, hash, 18)) {
projects / meshlink / blobdiff