X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fencr.c;h=cde6a991b195650c14be0669776851174bdfd9aa;hp=d170485ce3ff5fc122feb78dd96507bf37f3e8be;hb=74b0cbecce5194dc5c594cc4e2aa3e97c14ea6c1;hpb=3a3356865267ff4c1e4f7d73f6d1486952d641b5;ds=sidebyside

diff --git a/src/encr.c b/src/encr.c
index d170485c..cde6a991 100644
--- a/src/encr.c
+++ b/src/encr.c
@@ -19,6 +19,8 @@
 
 #include "config.h"
 
+#include <sys/types.h>
+
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -207,7 +209,7 @@ 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;
 
@@ -225,27 +227,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, keylen, key);
 
-  cipher_set_key(&bf_key, len, &key[0]);
+  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]);
 
-  low_crypt_key(mypassphrase, pp->phrase, &bf_key, mypassphraselen, BF_ENCRYPT);
-  pp->len = ((mypassphraselen - 1) | 7) + 5;
+  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 +265,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 +331,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);