Implement a PEM-like format for Ed25519 keys.

[tinc] / src / tincctl.c

diff --git a/src/tincctl.c b/src/tincctl.c
index 5f2b135..7a3195e 100644 (file)
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -246,7 +246,7 @@ static void disable_old_keys(const char *filename, const char *what) {
 
        while(fgets(buf, sizeof buf, r)) {
                if(!block && !strncmp(buf, "-----BEGIN ", 11)) {
-                       if((strstr(buf, " RSA ") && strstr(what, "RSA"))) {
+                       if((strstr(buf, " ED25519 ") && strstr(what, "Ed25519")) || (strstr(buf, " RSA ") && strstr(what, "RSA"))) {
                                disabled = true;
                                block = true;
                        }