Have tincctl generate ECDSA keys.

The generate-keys command now generates both an RSA and an ECDSA keypair,
but one can generate-rsa-keys or generate-ecdsa-keys to just generate one type.

diff --git a/src/Makefile.am b/src/Makefile.am
index 33033744b489ea415e8c7ce8365b790243810192..0a5134f9f201636f402ae853f3c0a795edf99afe 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,14 +11,14 @@ tincd_SOURCES = \
        protocol_key.c protocol_subnet.c route.c subnet.c tincd.c
 
 nodist_tincd_SOURCES = \
-       device.c cipher.c crypto.c ecdh.c ecdsagen.c digest.c prf.c rsa.c
+       device.c cipher.c crypto.c ecdh.c digest.c prf.c rsa.c
 
 tincctl_SOURCES = \
        utils.c getopt.c getopt1.c dropin.c \
        list.c tincctl.c top.c
 
 nodist_tincctl_SOURCES = \
-       rsagen.c
+       ecdsagen.c rsagen.c
 
 if TUNEMU
 tincd_SOURCES += bsd/tunemu.c

diff --git a/src/openssl/ecdsagen.c b/src/openssl/ecdsagen.c
index 93b0df61950b9db428cadc2d91de5d0d0e88f14f..8761f26a31c3ace1007450f1f584b7a9edb17d60 100644 (file)
--- a/src/openssl/ecdsagen.c
+++ b/src/openssl/ecdsagen.c
@@ -23,7 +23,6 @@
 #include <openssl/err.h>
 #include <openssl/obj_mac.h>
 
-#include "logger.h"
 #include "ecdsagen.h"
 #include "utils.h"
 
@@ -33,8 +32,8 @@ bool ecdsa_generate(ecdsa_t *ecdsa) {
        *ecdsa = EC_KEY_new_by_curve_name(NID_secp521r1);
 
        if(!EC_KEY_generate_key(*ecdsa)) {
-               logger(LOG_ERR, "Generating EC key failed: %s", ERR_error_string(ERR_get_error(), NULL));
-               abort();
+               fprintf(stderr, "Generating EC key failed: %s", ERR_error_string(ERR_get_error(), NULL));
+               return false;
        }
 
        EC_KEY_set_asn1_flag(*ecdsa, OPENSSL_EC_NAMED_CURVE);

diff --git a/src/tincctl.c b/src/tincctl.c
index 98f4a1b9093b2d792b3cbbda8160b9244b80d528..00a296dc73a1184fd8b915ecefae01253b075d42 100644 (file)
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -24,6 +24,7 @@
 #include "xalloc.h"
 #include "protocol.h"
 #include "control_common.h"
+#include "ecdsagen.h"
 #include "rsagen.h"
 #include "utils.h"
 #include "tincctl.h"
@@ -77,7 +78,9 @@ static void usage(bool status) {
                                "  restart                    Restart tincd.\n"
                                "  reload                     Reload configuration of running tincd.\n"
                                "  pid                        Show PID of currently running tincd.\n"
-                               "  generate-keys [bits]       Generate a new public/private keypair.\n"
+                               "  generate-keys [bits]       Generate new RSA and ECDSA public/private keypairs.\n"
+                               "  generate-rsa-keys [bits]   Generate a new RSA public/private keypair.\n"
+                               "  generate-ecdsa-keys        Generate a new ECDSA public/private keypair.\n"
                                "  dump                       Dump a list of one of the following things:\n"
                                "    nodes                    - all known nodes in the VPN\n"
                                "    edges                    - all known connections in the VPN\n"
@@ -191,11 +194,70 @@ FILE *ask_and_open(const char *filename, const char *what, const char *mode) {
        return r;
 }
 
+/*
+  Generate a public/private ECDSA keypair, and ask for a file to store
+  them in.
+*/
+static bool ecdsa_keygen() {
+       ecdsa_t key;
+       FILE *f;
+       char *filename;
+
+       fprintf(stderr, "Generating ECDSA keypair:\n");
+
+       if(!ecdsa_generate(&key)) {
+               fprintf(stderr, "Error during key generation!\n");
+               return false;
+       } else
+               fprintf(stderr, "Done.\n");
+
+       xasprintf(&filename, "%s/ecdsa_key.priv", confbase);
+       f = ask_and_open(filename, "private ECDSA key", "a");
+
+       if(!f)
+               return false;
+  
+#ifdef HAVE_FCHMOD
+       /* Make it unreadable for others. */
+       fchmod(fileno(f), 0600);
+#endif
+               
+       if(ftell(f))
+               fprintf(stderr, "Appending key to existing contents.\nMake sure only one key is stored in the file.\n");
+
+       ecdsa_write_pem_private_key(&key, f);
+
+       fclose(f);
+       free(filename);
+
+       if(name)
+               xasprintf(&filename, "%s/hosts/%s", confbase, name);
+       else
+               xasprintf(&filename, "%s/ecdsa_key.pub", confbase);
+
+       f = ask_and_open(filename, "public ECDSA key", "a");
+
+       if(!f)
+               return false;
+
+       if(ftell(f))
+               fprintf(stderr, "Appending key to existing contents.\nMake sure only one key is stored in the file.\n");
+
+       char *pubkey = ecdsa_get_base64_public_key(&key);
+       fprintf(f, "ECDSAPublicKey = %s\n", pubkey);
+       free(pubkey);
+
+       fclose(f);
+       free(filename);
+
+       return true;
+}
+
 /*
   Generate a public/private RSA keypair, and ask for a file to store
   them in.
 */
-static bool keygen(int bits) {
+static bool rsa_keygen(int bits) {
        rsa_t key;
        FILE *f;
        char *filename;
@@ -459,8 +521,16 @@ int main(int argc, char *argv[], char *envp[]) {
 
        // First handle commands that don't involve connecting to a running tinc daemon.
 
+       if(!strcasecmp(argv[optind], "generate-rsa-keys")) {
+               return !rsa_keygen(optind > argc ? atoi(argv[optind + 1]) : 2048);
+       }
+
+       if(!strcasecmp(argv[optind], "generate-ecdsa-keys")) {
+               return !ecdsa_keygen();
+       }
+
        if(!strcasecmp(argv[optind], "generate-keys")) {
-               return !keygen(optind > argc ? atoi(argv[optind + 1]) : 2048);
+               return !(rsa_keygen(optind > argc ? atoi(argv[optind + 1]) : 2048) && ecdsa_keygen());
        }
 
        if(!strcasecmp(argv[optind], "start")) {