projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Meta protocol overhaul. Tinc is now incompatible with previous versions,
[tinc]
/
src
/
encr.c
diff --git
a/src/encr.c
b/src/encr.c
index
d170485
..
31e0b94
100644
(file)
--- a/
src/encr.c
+++ b/
src/encr.c
@@
-207,7
+207,7
@@
cp
tmp = mpz_get_str(NULL, 16, our_shared_key);
len = str_hex_to_bin(text_key, tmp);
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;
key_inited = 1;
encryption_keylen = len;
@@
-228,16
+228,16
@@
void encrypt_passphrase(passphrase_t *pp)
int len;
BF_KEY bf_key;
cp
int len;
BF_KEY bf_key;
cp
- mpz_get_str(
&tmp[0]
, 16, my_public_key);
+ mpz_get_str(
tmp
, 16, my_public_key);
len = str_hex_to_bin(key, tmp);
len = str_hex_to_bin(key, tmp);
- cipher_set_key(&bf_key, len,
&key[0]
);
+ cipher_set_key(&bf_key, len,
key
);
low_crypt_key(mypassphrase, pp->phrase, &bf_key, mypassphraselen, BF_ENCRYPT);
pp->len = ((mypassphraselen - 1) | 7) + 5;
if(key_inited)
low_crypt_key(mypassphrase, pp->phrase, &bf_key, mypassphraselen, BF_ENCRYPT);
pp->len = ((mypassphraselen - 1) | 7) + 5;
if(key_inited)
- cipher_set_key(&encryption_key, encryption_keylen,
&text_key[0]
);
+ cipher_set_key(&encryption_key, encryption_keylen,
text_key
);
cp
}
cp
}
@@
-252,17
+252,17
@@
int verify_passphrase(conn_list_t *cl, unsigned char *his_pubkey)
char which[sizeof("123.123.123.123")+1];
char *meuk;
cp
char which[sizeof("123.123.123.123")+1];
char *meuk;
cp
- mpz_init_set_str(pk, his_pubkey,
3
6);
- mpz_get_str(
&tmp[0]
, 16, pk);
+ mpz_init_set_str(pk, his_pubkey,
1
6);
+ mpz_get_str(
tmp
, 16, pk);
len = str_hex_to_bin(key, tmp);
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[0]
);
- low_crypt_key(cl->pp
->phrase, out, &bf_key, cl->pp->len
, BF_DECRYPT);
+ cipher_set_key(&bf_key, len,
key
);
+ low_crypt_key(cl->pp
, out, &bf_key, strlen(cl->pp)
, BF_DECRYPT);
if(key_inited)
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));
+ sprintf(
which
, IP_ADDR_S, IP_ADDR_V(cl->vpn_ip));
if((len = read_passphrase(which, &meuk)) < 0)
return -1;
if((len = read_passphrase(which, &meuk)) < 0)
return -1;
@@
-318,7
+318,7
@@
cp
continue;
ek = make_shared_key(p->public_key->key);
free_key(p->key);
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);
p->key->length = strlen(ek);
p->key->expiry = p->public_key->expiry;
p->key->key = xmalloc(strlen(ek) + 1);