X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Finvitation.c;h=d027e0d980f16c2f9a885cf3b1ba813cca98a34f;hb=56ecf5049433a45c865f945915b65bdae307ba4f;hp=b6486c84a158f50ed254259fe99994e8fee7ca71;hpb=1564f52f7643c554ec49a3e014bc9b9a8745c856;p=meshlink

diff --git a/src/invitation.c b/src/invitation.c
index b6486c84..d027e0d9 100644
--- 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
@@ -25,7 +25,6 @@
 #include "ecdsagen.h"
 #include "invitation.h"
 #include "netutl.h"
-#include "rsagen.h"
 #include "sptps.h"
 #include "tincctl.h"
 #include "utils.h"
@@ -266,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) {
@@ -362,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.
@@ -374,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);
@@ -712,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);
 
@@ -924,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)) {