Change our view of the Diffie--Hellman closure protocol.

[secnet] / site.c

diff --git a/site.c b/site.c
index 9e877c7..2ca333b 100644 (file)
--- a/site.c
+++ b/site.c
@@ -318,6 +318,7 @@ struct site {
     struct hash_if *hash;
 
     uint32_t index; /* Index of this site */
+    uint32_t early_capabilities;
     uint32_t local_capabilities;
     int32_t setup_retries; /* How many times to send setup packets */
     int32_t setup_retry_interval; /* Initial timeout for setup packets */
@@ -550,7 +551,7 @@ 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;
+    st->sharedsecretlen=st->chosen_transform->keylen?:st->dh->shared_len;
     assert(st->sharedsecretlen);
     if (st->sharedsecretlen > st->sharedsecretallocd) {
        st->sharedsecretallocd=st->sharedsecretlen;
@@ -560,8 +561,9 @@ static _Bool set_new_transform(struct site *st, char *pk)
     }
 
     /* 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->sharedsecretlen))
+       return False;
 
     /* Set up the transform */
     struct transform_if *generator=st->chosen_transform;
@@ -626,7 +628,8 @@ static bool_t generate_msg(struct site *st, uint32_t type, cstring_t what)
 
     struct xinfoadd xia;
     append_string_xinfo_start(&st->buffer,&xia,st->localname);
-    if ((st->local_capabilities & CAPAB_EARLY) || (type != LABEL_MSG1)) {
+    if ((st->local_capabilities & st->early_capabilities) ||
+       (type != LABEL_MSG1)) {
        buf_append_uint32(&st->buffer,st->local_capabilities);
     }
     if (type_is_msg34(type)) {
@@ -645,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);
 
-    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");
@@ -859,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. */
-    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),
@@ -904,7 +907,7 @@ static bool_t process_msg3(struct site *st, struct buffer_if *msg3,
        return False;
     }
     uint32_t capab_adv_late = m.remote_capabilities
-       & ~st->remote_capabilities & CAPAB_EARLY;
+       & ~st->remote_capabilities & st->early_capabilities;
     if (capab_adv_late) {
        slog(st,LOG_SEC,"msg3 impermissibly adds early capability flag(s)"
             " %#"PRIx32" (was %#"PRIx32", now %#"PRIx32")",
@@ -938,7 +941,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;
@@ -1499,7 +1502,7 @@ 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);
+    memset(st->dhsecret,0,st->dh->secret_len);
     if (st->sharedsecret) memset(st->sharedsecret,0,st->sharedsecretlen);
     set_link_quality(st);
 
@@ -2125,6 +2128,7 @@ static list_t *site_apply(closure_t *self, struct cloc loc, dict_t *context,
     assert(index_sequence < 0xffffffffUL);
     st->index = ++index_sequence;
     st->local_capabilities = 0;
+    st->early_capabilities = CAPAB_PRIORITY_MOBILE;
     st->netlink=find_cl_if(dict,"link",CL_NETLINK,True,"site",loc);
 
 #define GET_CLOSURE_LIST(dictkey,things,nthings,CL_TYPE) do{           \
@@ -2237,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 */
-    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;