X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fencr.c;h=8aae04b465e7a85f35cf08e27ff367a79e49a85f;hp=fe7b2e8f1c4aa32c9f4e2965cc5dd55976a1d13a;hb=04d33be4bd102de67bb6dba5c449e12fea0db4d2;hpb=a9247e6f2c57bda9dc62ed050f41048847109e83

diff --git a/src/encr.c b/src/encr.c
index fe7b2e8f..8aae04b4 100644
--- a/src/encr.c
+++ b/src/encr.c
@@ -1,6 +1,7 @@
 /*
     encr.c -- everything that deals with encryption
-    Copyright (C) 1998,99 Ivo Timmermans <zarq@iname.com>
+    Copyright (C) 1998,1999,2000 Ivo Timmermans <itimmermans@bigfoot.com>
+                            2000 Guus Sliepen <guus@sliepen.warande.net>
 
     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
@@ -15,10 +16,14 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+    $Id: encr.c,v 1.13 2000/10/18 20:12:08 zarq Exp $
 */
 
 #include "config.h"
 
+#include <sys/types.h>
+
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -45,6 +50,8 @@
 #include "net.h"
 #include "protocol.h"
 
+#include "system.h"
+
 #define ENCR_GENERATOR "0xd"
 #define ENCR_PRIME "0x7fffffffffffffffffffffffffffffff" /* Mersenne :) */
 
@@ -54,8 +61,8 @@ int key_inited = 0, encryption_keylen;
 mpz_t my_private_key, my_public_key, generator, shared_prime;
 int my_key_expiry = (time_t)(-1);
 
-static char* mypassphrase;
-static int mypassphraselen;
+char* mypassphrase;
+int mypassphraselen;
 
 int char_hex_to_bin(int c)
 {
@@ -91,33 +98,34 @@ int read_passphrase(char *which, char **out)
 cp
   if((cfg = get_config_val(passphrasesdir)) == NULL)
     {
-      filename = xmalloc(strlen(confbase)+13+strlen(which));
-      sprintf(filename, "%spassphrases/%s", confbase, which);
+      asprintf(&filename, "%spassphrases/%s", confbase, which);
     }
   else
     {
-      filename = xmalloc(strlen(cfg->data.ptr)+2+strlen(which));
-      sprintf(filename, "%s/%s", (char*)cfg->data.ptr, which);
+      asprintf(&filename, "%s/%s", (char*)cfg->data.ptr, which);
     }
 
   if((f = fopen(filename, "rb")) == NULL)
     {
-      syslog(LOG_ERR, "Could not open %s: %m", filename);
+      if(debug_lvl > 1)
+        syslog(LOG_ERR, _("Could not open %s: %m"), filename);
       return -1;
     }
 
   fscanf(f, "%d ", &size);
   if(size < 1 || size > (1<<15))
     {
-      syslog(LOG_ERR, "Illegal passphrase in %s; size would be %d", filename, size);
+      syslog(LOG_ERR, _("Illegal passphrase in %s; size would be %d"), filename, size);
       return -1;
     }
-  size >>= 2; /* bits->nibbles */
-  pp = xmalloc(size+2);
-  fgets(pp, size+1, f);
+
+  /* Hmz... hackish... strange +1 and +2 stuff... I really like more comments on those alignment thingies! */
+
+  pp = xmalloc(size/4 + 1);	/* Allocate enough for fgets */
+  fgets(pp, size/4 + 1, f);	/* Read passhrase and reserve one byte for end-of-string */
   fclose(f);
 
-  *out = xmalloc(size);
+  *out = xmalloc(size/8 + 2);	/* Allocate enough bytes, +1 for rounding if bits%8 != 0, +1 for 2-byte alignment */
 cp
   return str_hex_to_bin(*out, pp);
 }
@@ -143,11 +151,12 @@ cp
   else
     my_key_expiry = (time_t)(time(NULL) + cfg->data.val);
 
-  syslog(LOG_NOTICE, "Generating %d bits keys.", PRIVATE_KEY_BITS);
+  if(debug_lvl > 1)
+    syslog(LOG_NOTICE, _("Generating %d bits keys"), PRIVATE_KEY_BITS);
 
   if((f = fopen("/dev/urandom", "r")) == NULL)
     {
-      syslog(LOG_ERR, "Opening /dev/urandom failed: %m");
+      syslog(LOG_ERR, _("Opening /dev/urandom failed: %m"));
       return -1;
     }
 
@@ -212,7 +221,7 @@ cp
   encryption_keylen = len;
 
   if(debug_lvl > 2)
-    syslog(LOG_INFO, "Encryption key set to %s", tmp);
+    syslog(LOG_INFO, _("Encryption key set to %s"), tmp);
 
   free(tmp);
   mpz_clear(ak);
@@ -259,7 +268,7 @@ int verify_passphrase(conn_list_t *cl, unsigned char *his_pubkey)
   mpz_t pk;
   unsigned char *out;
   BF_KEY bf_key;
-  char which[sizeof("123.123.123.123")+1];
+  char *which;
   char *meuk;
 cp
   mpz_init_set_str(pk, his_pubkey, 36);
@@ -273,7 +282,7 @@ cp
   if(key_inited)
     cipher_set_key(&encryption_key, encryption_keylen, text_key);
 
-  sprintf(which, IP_ADDR_S, IP_ADDR_V(cl->vpn_ip));
+  asprintf(&which, IP_ADDR_S, IP_ADDR_V(cl->vpn_ip));
   if((pplen = read_passphrase(which, &meuk)) < 0)
     return -1;
 
@@ -328,12 +337,12 @@ cp
 	/* We haven't received a key from this host (yet). */
 	continue;
       ek = make_shared_key(p->public_key->key);
-      free_key(p->key);
-      p->key = xmalloc(sizeof(*p->key));
-      p->key->length = strlen(ek);
-      p->key->expiry = p->public_key->expiry;
-      p->key->key = xmalloc(strlen(ek) + 1);
-      strcpy(p->key->key, ek);
+      free_key(p->datakey);
+      p->datakey = xmalloc(sizeof(*p->datakey));
+      p->datakey->length = strlen(ek);
+      p->datakey->expiry = p->public_key->expiry;
+      p->datakey->key = xmalloc(strlen(ek) + 1);
+      strcpy(p->datakey->key, ek);
     }
 cp
 }
@@ -343,7 +352,7 @@ void regenerate_keys(void)
 cp
   generate_private_key();
   calculate_public_key();
-  send_key_changed2();
+  send_key_changed_all();
   recalculate_encryption_keys();
 cp
 }