site.c: Pass the length of the actual shared secret to the transform.

[secnet] / site.c

diff --git a/site.c b/site.c
index 3b8f34d..0b2e2d0 100644 (file)
--- a/site.c
+++ b/site.c
@@ -369,7 +369,6 @@ struct site {
     uint64_t timeout; /* Timeout for current state */
     uint8_t *dhsecret;
     uint8_t *sharedsecret;
-    uint32_t sharedsecretlen, sharedsecretallocd;
     struct transform_inst_if *new_transform; /* For key setup/verify */
 };
 
@@ -550,25 +549,16 @@ static _Bool set_new_transform(struct site *st, char *pk)
 {
     _Bool ok;
 
-    /* Make room for the shared key */
-    st->sharedsecretlen=st->chosen_transform->keylen?:st->dh->ceil_len;
-    assert(st->sharedsecretlen);
-    if (st->sharedsecretlen > st->sharedsecretallocd) {
-       st->sharedsecretallocd=st->sharedsecretlen;
-       st->sharedsecret=safe_realloc_ary(st->sharedsecret,1,
-                                         st->sharedsecretallocd,
-                                         "site:sharedsecret");
-    }
-
     /* Generate the shared key */
-    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->dh->shared_len))
+       return False;
 
     /* Set up the transform */
     struct transform_if *generator=st->chosen_transform;
     struct transform_inst_if *generated=generator->create(generator->st);
     ok = generated->setkey(generated->st,st->sharedsecret,
-                          st->sharedsecretlen,st->our_name_later);
+                          st->dh->shared_len,st->our_name_later);
 
     dispose_transform(&st->new_transform);
     if (!ok) return False;
@@ -647,7 +637,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);
 
-    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");
@@ -861,7 +851,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. */
-    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),
@@ -940,7 +930,7 @@ kind##_found:                                                               \
     /* 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;
@@ -1501,8 +1491,8 @@ static void enter_state_run(struct site *st)
     FILLZERO(st->localN);
     FILLZERO(st->remoteN);
     dispose_transform(&st->new_transform);
-    memset(st->dhsecret,0,st->dh->len);
-    if (st->sharedsecret) memset(st->sharedsecret,0,st->sharedsecretlen);
+    memset(st->dhsecret,0,st->dh->secret_len);
+    memset(st->sharedsecret,0,st->dh->shared_len);
     set_link_quality(st);
 
     if (st->keepalive && !current_valid(st))
@@ -2240,9 +2230,8 @@ 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 */
-    st->dhsecret=safe_malloc(st->dh->len,"site:dhsecret");
-    st->sharedsecretlen=st->sharedsecretallocd=0;
-    st->sharedsecret=0;
+    st->dhsecret=safe_malloc(st->dh->secret_len,"site:dhsecret");
+    st->sharedsecret=safe_malloc(st->dh->shared_len, "site:sharedsecret");
 
 #define SET_CAPBIT(bit) do {                                           \
     uint32_t capflag = 1UL << (bit);                                   \