X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Finvitation.c;h=28f9f8ce0755468f8c4abea0f9cc07e016011900;hb=53036a58790168e18f524bd923f9a7d34691ba2d;hp=63a443d449d562b3d69b5f046c4c2f2f108e051e;hpb=18698c4e123d1ed22f3a2fc5529fac62fbabaf19;p=tinc

diff --git a/src/invitation.c b/src/invitation.c
index 63a443d4..28f9f8ce 100644
--- a/src/invitation.c
+++ b/src/invitation.c
@@ -250,7 +250,7 @@ int cmd_invite(int argc, char *argv[]) {
 	}
 	free(filename);
 
-	// If a daemon is running, ensure no other nodes now about this name
+	// If a daemon is running, ensure no other nodes know about this name
 	bool found = false;
 	if(connect_tincd(false)) {
 		sendline(fd, "%d %d", CONTROL, REQ_DUMP_NODES);
@@ -321,7 +321,7 @@ int cmd_invite(int argc, char *argv[]) {
 	free(filename);
 
 	ecdsa_t *key;
-	xasprintf(&filename, "%s" SLASH "invitations" SLASH "ecdsa_key.priv", confbase);
+	xasprintf(&filename, "%s" SLASH "invitations" SLASH "ed25519_key.priv", confbase);
 
 	// Remove the key if there are no outstanding invitations.
 	if(!count)
@@ -613,6 +613,7 @@ make_names:
 	FILE *fh = fopen(filename, "w");
 	if(!fh) {
 		fprintf(stderr, "Could not create file %s: %s\n", filename, strerror(errno));
+		fclose(f);
 		return false;
 	}
 
@@ -722,7 +723,7 @@ make_names:
 	if(!b64key)
 		return false;
 
-	xasprintf(&filename, "%s" SLASH "ecdsa_key.priv", confbase);
+	xasprintf(&filename, "%s" SLASH "ed25519_key.priv", confbase);
 	f = fopenmask(filename, "w", 0600);
 
 	if(!ecdsa_write_pem_private_key(key, f)) {
@@ -734,7 +735,7 @@ make_names:
 
 	fclose(f);
 
-	fprintf(fh, "ECDSAPublicKey = %s\n", b64key);
+	fprintf(fh, "Ed25519PublicKey = %s\n", b64key);
 
 	sptps_send_record(&sptps, 1, b64key, strlen(b64key));
 	free(b64key);
@@ -906,7 +907,7 @@ int cmd_join(int argc, char *argv[]) {
 	if(!port || !*port)
 		port = "655";
 
-	if(!b64decode(slash, hash, 18) || !b64decode(slash + 24, cookie, 18))
+	if(!b64decode(slash, hash, 24) || !b64decode(slash + 24, cookie, 24))
 		goto invalid;
 
 	// Generate a throw-away key for the invitation.