_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;
}
/* 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 */
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");
{
/* 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),
/* 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;
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);
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;