~mdw
/
secnet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change our view of the Diffie--Hellman closure protocol.
[secnet]
/
site.c
diff --git
a/site.c
b/site.c
index
4ac0bab
..
2ca333b
100644
(file)
--- a/
site.c
+++ b/
site.c
@@
-551,7
+551,7
@@
static _Bool set_new_transform(struct site *st, char *pk)
_Bool ok;
/* Make room for the shared key */
_Bool ok;
/* Make room for the shared key */
- st->sharedsecretlen=st->chosen_transform->keylen?:st->dh->
ceil
_len;
+ st->sharedsecretlen=st->chosen_transform->keylen?:st->dh->
shared
_len;
assert(st->sharedsecretlen);
if (st->sharedsecretlen > st->sharedsecretallocd) {
st->sharedsecretallocd=st->sharedsecretlen;
assert(st->sharedsecretlen);
if (st->sharedsecretlen > st->sharedsecretallocd) {
st->sharedsecretallocd=st->sharedsecretlen;
@@
-561,8
+561,8
@@
static _Bool set_new_transform(struct site *st, char *pk)
}
/* Generate the shared key */
}
/* Generate the shared key */
- if (!st->dh->makeshared(st->dh->st,st->dhsecret,st->dh->
len,pk
,
- st->sharedsecret,st->sharedsecretlen))
+ if (!st->dh->makeshared(st->dh->st,st->dhsecret,st->dh->
secret_len
,
+
pk,
st->sharedsecret,st->sharedsecretlen))
return False;
/* Set up the transform */
return False;
/* Set up the transform */
@@
-648,7
+648,7
@@
static bool_t generate_msg(struct site *st, uint32_t type, cstring_t what)
if (type==LABEL_MSG3BIS)
buf_append_uint8(&st->buffer,st->chosen_transform->capab_bit);
if (type==LABEL_MSG3BIS)
buf_append_uint8(&st->buffer,st->chosen_transform->capab_bit);
- dhpub=st->dh->makepublic(st->dh->st,st->dhsecret,st->dh->len);
+ dhpub=st->dh->makepublic(st->dh->st,st->dhsecret,st->dh->
secret_
len);
buf_append_string(&st->buffer,dhpub);
free(dhpub);
hash=safe_malloc(st->hash->len, "generate_msg");
buf_append_string(&st->buffer,dhpub);
free(dhpub);
hash=safe_malloc(st->hash->len, "generate_msg");
@@
-862,7
+862,7
@@
static bool_t generate_msg3(struct site *st)
{
/* Now we have our nonce and their nonce. Think of a secret key,
and create message number 3. */
{
/* Now we have our nonce and their nonce. Think of a secret key,
and create message number 3. */
- st->random->generate(st->random->st,st->dh->len,st->dhsecret);
+ st->random->generate(st->random->st,st->dh->
secret_
len,st->dhsecret);
return generate_msg(st,
(st->remote_capabilities & CAPAB_TRANSFORM_MASK
? LABEL_MSG3BIS : LABEL_MSG3),
return generate_msg(st,
(st->remote_capabilities & CAPAB_TRANSFORM_MASK
? LABEL_MSG3BIS : LABEL_MSG3),
@@
-941,7
+941,7
@@
kind##_found: \
/* Terminate their DH public key with a '0' */
m.pk[m.pklen]=0;
/* Invent our DH secret key */
/* Terminate their DH public key with a '0' */
m.pk[m.pklen]=0;
/* Invent our DH secret key */
- st->random->generate(st->random->st,st->dh->len,st->dhsecret);
+ st->random->generate(st->random->st,st->dh->
secret_
len,st->dhsecret);
/* Generate the shared key and set up the transform */
if (!set_new_transform(st,m.pk)) return False;
/* Generate the shared key and set up the transform */
if (!set_new_transform(st,m.pk)) return False;
@@
-1502,7
+1502,7
@@
static void enter_state_run(struct site *st)
FILLZERO(st->localN);
FILLZERO(st->remoteN);
dispose_transform(&st->new_transform);
FILLZERO(st->localN);
FILLZERO(st->remoteN);
dispose_transform(&st->new_transform);
- memset(st->dhsecret,0,st->dh->len);
+ memset(st->dhsecret,0,st->dh->
secret_
len);
if (st->sharedsecret) memset(st->sharedsecret,0,st->sharedsecretlen);
set_link_quality(st);
if (st->sharedsecret) memset(st->sharedsecret,0,st->sharedsecretlen);
set_link_quality(st);
@@
-2241,7
+2241,7
@@
static list_t *site_apply(closure_t *self, struct cloc loc, dict_t *context,
transport_peers_clear(st,&st->peers);
transport_peers_clear(st,&st->setup_peers);
/* XXX mlock these */
transport_peers_clear(st,&st->peers);
transport_peers_clear(st,&st->setup_peers);
/* XXX mlock these */
- st->dhsecret=safe_malloc(st->dh->len,"site:dhsecret");
+ st->dhsecret=safe_malloc(st->dh->
secret_
len,"site:dhsecret");
st->sharedsecretlen=st->sharedsecretallocd=0;
st->sharedsecret=0;
st->sharedsecretlen=st->sharedsecretallocd=0;
st->sharedsecret=0;