Rename ECDSA to Ed25519.

[tinc] / src / invitation.c

diff --git a/src/invitation.c b/src/invitation.c
index 110e395..7fb96da 100644 (file)
--- a/src/invitation.c
+++ b/src/invitation.c
@@ -1,6 +1,6 @@
 /*
     invitation.c -- Create and accept invitations
-    Copyright (C) 2013 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2013-2014 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
@@ -197,8 +197,10 @@ done:
                else
                        xasprintf(&hostport, "%s:%s", hostname, port);
        } else {
-               hostport = hostname;
-               hostname = NULL;
+               if(strchr(hostname, ':'))
+                       xasprintf(&hostport, "[%s]", hostname);
+               else
+                       hostport = xstrdup(hostname);
        }
 
        free(hostname);
@@ -248,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);
@@ -319,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)
@@ -720,7 +722,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)) {
@@ -732,7 +734,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);