Stop using OpenSSL for hashes.

[meshlink] / src / invitation.c

diff --git a/src/invitation.c b/src/invitation.c
index 3e05d8c7d7c95cbee46ceb1fc0247a6cdb3b49be..d027e0d980f16c2f9a885cf3b1ba813cca98a34f 100644 (file)
--- a/src/invitation.c
+++ b/src/invitation.c
@@ -1,6 +1,6 @@
 /*
     invitation.c -- Create and accept invitations
-    Copyright (C) 2013-2014 Guus Sliepen <guus@tinc-vpn.org>
+    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
@@ -24,9 +24,7 @@
 #include "ecdsa.h"
 #include "ecdsagen.h"
 #include "invitation.h"
-#include "names.h"
 #include "netutl.h"
-#include "rsagen.h"
 #include "sptps.h"
 #include "tincctl.h"
 #include "utils.h"
@@ -267,7 +265,7 @@ int cmd_invite(int argc, char *argv[]) {
                }
        }
 
-       char hash[25];
+       char hash[64];
 
        xasprintf(&filename, "%s" SLASH "invitations", confbase);
        if(mkdir(filename, 0700) && errno != EEXIST) {
@@ -363,10 +361,7 @@ int cmd_invite(int argc, char *argv[]) {
 
        // 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.
@@ -375,10 +370,10 @@ int cmd_invite(int argc, char *argv[]) {
 
        // 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);
@@ -546,13 +541,6 @@ static bool finalize_join(void) {
        char temp_netname[32];
 
 make_names:
-       if(!confbasegiven) {
-               free(confbase);
-               confbase = NULL;
-       }
-
-       make_names();
-
        free(tinc_conf);
        free(hosts_dir);
 
@@ -720,19 +708,7 @@ make_names:
        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);
 
@@ -758,7 +734,6 @@ ask_netname:
 
                free(newbase);
                netname = line;
-               make_names();
        }
 
        fprintf(stderr, "Configuration stored in: %s\n", confbase);
@@ -819,11 +794,6 @@ int cmd_join(int argc, char *argv[]) {
        }
 
        // Make sure confbase exists and is accessible.
-       if(!confbase_given && mkdir(confdir, 0755) && errno != EEXIST) {
-               fprintf(stderr, "Could not create directory %s: %s\n", confdir, strerror(errno));
-               return 1;
-       }
-
        if(mkdir(confbase, 0777) && errno != EEXIST) {
                fprintf(stderr, "Could not create directory %s: %s\n", confbase, strerror(errno));
                return 1;
@@ -938,12 +908,9 @@ int cmd_join(int argc, char *argv[]) {
 
        // 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)) {