X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;ds=sidebyside;f=src%2Fencr.c;h=31e0b9449ec0a67926c3ce135f2a61cc3ba17d36;hb=a92604fa5dffef589fc3042c5ae09ae8878e8cff;hp=bcde3c05a673e3985889de276740f150ff038f86;hpb=8efe4874dabdfdf03a747ea98cf38b11cb591ef5;p=tinc

diff --git a/src/encr.c b/src/encr.c
index bcde3c05..31e0b944 100644
--- a/src/encr.c
+++ b/src/encr.c
@@ -252,13 +252,13 @@ int verify_passphrase(conn_list_t *cl, unsigned char *his_pubkey)
   char which[sizeof("123.123.123.123")+1];
   char *meuk;
 cp
-  mpz_init_set_str(pk, his_pubkey, 36);
+  mpz_init_set_str(pk, his_pubkey, 16);
   mpz_get_str(tmp, 16, pk);
   len = str_hex_to_bin(key, tmp);
-  out = xmalloc(cl->pp->len+3);
+  out = xmalloc(strlen(cl->pp) + 3);
 
   cipher_set_key(&bf_key, len, key);
-  low_crypt_key(cl->pp->phrase, out, &bf_key, cl->pp->len, BF_DECRYPT);
+  low_crypt_key(cl->pp, out, &bf_key, strlen(cl->pp), BF_DECRYPT);
   if(key_inited)
     cipher_set_key(&encryption_key, encryption_keylen, text_key);
 
@@ -318,7 +318,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);