X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fencr.c;h=5753de231cc71a82c552618f849fd45fc1d56c0a;hp=d170485ce3ff5fc122feb78dd96507bf37f3e8be;hb=77be52422d8c28735f787b1c233b4cec73d4db56;hpb=3a3356865267ff4c1e4f7d73f6d1486952d641b5

diff --git a/src/encr.c b/src/encr.c
index d170485c..5753de23 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.12 2000/05/31 18:23:06 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 :) */
 
@@ -102,14 +109,14 @@ cp
 
   if((f = fopen(filename, "rb")) == NULL)
     {
-      syslog(LOG_ERR, "Could not open %s: %m", filename);
+      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 */
@@ -143,11 +150,11 @@ cp
   else
     my_key_expiry = (time_t)(time(NULL) + cfg->data.val);
 
-  syslog(LOG_NOTICE, "Generating %d bits keys.", PRIVATE_KEY_BITS);
+  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;
     }
 
@@ -207,12 +214,12 @@ cp
   tmp = mpz_get_str(NULL, 16, our_shared_key);
   len = str_hex_to_bin(text_key, tmp);
 
-  cipher_set_key(&encryption_key, len, &text_key[0]);
+  cipher_set_key(&encryption_key, len, text_key);
   key_inited = 1;
   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);
@@ -225,27 +232,37 @@ void encrypt_passphrase(passphrase_t *pp)
 {
   char key[1000];
   char tmp[1000];
-  int len;
+  unsigned char phrase[1000];
+  int keylen;
+  int i;
   BF_KEY bf_key;
+  
 cp  
-  mpz_get_str(&tmp[0], 16, my_public_key);
-  len = str_hex_to_bin(key, tmp);
+  mpz_get_str(tmp, 16, my_public_key);
+  keylen = str_hex_to_bin(key, tmp);
 
-  cipher_set_key(&bf_key, len, &key[0]);
+  cipher_set_key(&bf_key, keylen, key);
 
-  low_crypt_key(mypassphrase, pp->phrase, &bf_key, mypassphraselen, BF_ENCRYPT);
-  pp->len = ((mypassphraselen - 1) | 7) + 5;
+  low_crypt_key(mypassphrase, phrase, &bf_key, mypassphraselen, BF_ENCRYPT);
+  pp->len = ((mypassphraselen - 1) | 7) + 1;
+  pp->phrase = xmalloc((pp->len << 1) + 1);
+  
+  for(i = 0; i < pp->len; i++)
+    snprintf(&(pp->phrase)[i << 1], 3, "%02x", (int)phrase[i]);
+
+  pp->phrase[(pp->len << 1) + 1] = '\0';
 
   if(key_inited)
-    cipher_set_key(&encryption_key, encryption_keylen, &text_key[0]);
+    cipher_set_key(&encryption_key, encryption_keylen, text_key);
 cp
 }
 
 int verify_passphrase(conn_list_t *cl, unsigned char *his_pubkey)
 {
   char key[1000];
-  char tmp[1000];
-  int len;
+  char *tmp;
+  unsigned char phrase[1000];
+  int keylen, pplen;
   mpz_t pk;
   unsigned char *out;
   BF_KEY bf_key;
@@ -253,20 +270,21 @@ int verify_passphrase(conn_list_t *cl, unsigned char *his_pubkey)
   char *meuk;
 cp
   mpz_init_set_str(pk, his_pubkey, 36);
-  mpz_get_str(&tmp[0], 16, pk);
-  len = str_hex_to_bin(key, tmp);
-  out = xmalloc(cl->pp->len+3);
+  tmp = mpz_get_str(NULL, 16, pk);
+  keylen = str_hex_to_bin(key, tmp);
+  out = xmalloc((cl->pp->len >> 1) + 3);
+  pplen = str_hex_to_bin(phrase, cl->pp->phrase);
 
-  cipher_set_key(&bf_key, len, &key[0]);
-  low_crypt_key(cl->pp->phrase, out, &bf_key, cl->pp->len, BF_DECRYPT);
+  cipher_set_key(&bf_key, keylen, key);
+  low_crypt_key(phrase, out, &bf_key, pplen, BF_DECRYPT);
   if(key_inited)
-    cipher_set_key(&encryption_key, encryption_keylen, &text_key[0]);
+    cipher_set_key(&encryption_key, encryption_keylen, text_key);
 
-  sprintf(&which[0], IP_ADDR_S, IP_ADDR_V(cl->vpn_ip));
-  if((len = read_passphrase(which, &meuk)) < 0)
+  sprintf(which, IP_ADDR_S, IP_ADDR_V(cl->vpn_ip));
+  if((pplen = read_passphrase(which, &meuk)) < 0)
     return -1;
 
-  if(memcmp(meuk, out, len))
+  if(memcmp(meuk, out, pplen))
     return -1;
 cp
   return 0;
@@ -318,7 +336,7 @@ cp
 	continue;
       ek = make_shared_key(p->public_key->key);
       free_key(p->key);
-      p->key = xmalloc(sizeof(enc_key_t));
+      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);
@@ -332,7 +350,7 @@ void regenerate_keys(void)
 cp
   generate_private_key();
   calculate_public_key();
-  send_key_changed2();
+  send_key_changed_all();
   recalculate_encryption_keys();
 cp
 }