Disable old RSA keys when generating new ones.

[tinc] / src / conf.c

diff --git a/src/conf.c b/src/conf.c
index 369a5fb..803c96c 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -1,9 +1,9 @@
 /*
     conf.c -- configuration code
     Copyright (C) 1998 Robert van der Meulen
-                  1998-2003 Ivo Timmermans <ivo@o2w.nl>
-                  2000-2003 Guus Sliepen <guus@sliepen.eu.org>
-                 2000 Cris van Pelt <tribbel@arise.dhs.org>
+                  1998-2005 Ivo Timmermans
+                  2000-2008 Guus Sliepen <guus@tinc-vpn.org>
+                 2000 Cris van Pelt
 
     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
@@ -19,7 +19,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: conf.c,v 1.9.4.77 2003/12/12 19:52:24 guus Exp $
+    $Id$
 */
 
 #include "system.h"
@@ -33,7 +33,8 @@
 
 avl_tree_t *config_tree;
 
-int pingtimeout = 0;                   /* seconds before timeout */
+int pinginterval = 0;                  /* seconds between pings */
+int pingtimeout = 0;                   /* seconds to wait for response */
 char *confbase = NULL;                 /* directory in which all config files are */
 char *netname = NULL;                  /* name of the vpn network */
 
@@ -99,7 +100,7 @@ void config_add(avl_tree_t *config_tree, config_t *cfg)
        avl_insert(config_tree, cfg);
 }
 
-config_t *lookup_config(const avl_tree_t *config_tree, char *variable)
+config_t *lookup_config(avl_tree_t *config_tree, char *variable)
 {
        config_t cfg, *found;
 
@@ -120,7 +121,7 @@ config_t *lookup_config(const avl_tree_t *config_tree, char *variable)
        return found;
 }
 
-config_t *lookup_config_next(const avl_tree_t *config_tree, const config_t *cfg)
+config_t *lookup_config_next(avl_tree_t *config_tree, const config_t *cfg)
 {
        avl_node_t *node;
        config_t *found;
@@ -300,6 +301,8 @@ static char *readline(FILE * fp, char **buf, size_t *buflen)
                        size = newsize;
                } else {
                        *newline = '\0';        /* kill newline */
+                       if(newline > p && newline[-1] == '\r')  /* and carriage return if necessary */
+                               newline[-1] = '\0';
                        break;                          /* yay */
                }
        }
@@ -342,6 +345,11 @@ int read_config_file(avl_tree_t *config_tree, const char *fname)
        buffer = xmalloc(bufsize);
 
        for(;;) {
+               if(feof(fp)) {
+                       err = 0;
+                       break;
+               }
+
                line = readline(fp, &buffer, &bufsize);
 
                if(!line) {
@@ -349,11 +357,6 @@ int read_config_file(avl_tree_t *config_tree, const char *fname)
                        break;
                }
 
-               if(feof(fp)) {
-                       err = 0;
-                       break;
-               }
-
                lineno++;
 
                if(!*line || *line == '#')
@@ -426,7 +429,7 @@ bool read_server_config()
        return x == 0;
 }
 
-FILE *ask_and_open(const char *filename, const char *what, const char *mode)
+FILE *ask_and_open(const char *filename, const char *what)
 {
        FILE *r;
        char *directory;
@@ -476,7 +479,7 @@ FILE *ask_and_open(const char *filename, const char *what, const char *mode)
 
        /* Open it first to keep the inode busy */
 
-       r = fopen(fn, mode);
+       r = fopen(fn, "r+") ?: fopen(fn, "w+");
 
        if(!r) {
                fprintf(stderr, _("Error opening file `%s': %s\n"),
@@ -489,3 +492,34 @@ FILE *ask_and_open(const char *filename, const char *what, const char *mode)
 
        return r;
 }
+
+bool disable_old_keys(FILE *f) {
+       char buf[100];
+       long pos;
+       bool disabled = false;
+
+       rewind(f);
+       pos = ftell(f);
+
+       while(fgets(buf, sizeof buf, f)) {
+               if(!strncmp(buf, "-----BEGIN RSA", 14)) {       
+                       buf[11] = 'O';
+                       buf[12] = 'L';
+                       buf[13] = 'D';
+                       fseek(f, pos, SEEK_SET);
+                       fputs(buf, f);
+                       disabled = true;
+               }
+               else if(!strncmp(buf, "-----END RSA", 12)) {    
+                       buf[ 9] = 'O';
+                       buf[10] = 'L';
+                       buf[11] = 'D';
+                       fseek(f, pos, SEEK_SET);
+                       fputs(buf, f);
+                       disabled = true;
+               }
+               pos = ftell(f);
+       }
+
+       return disabled;
+}