X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=site.c;h=eb146e1baabd1c3e031c86b4960f2d7fd27d35b8;hb=03d4c598998e9373fd538ce1fb920c62dbde1cdd;hp=9c320a5b31013077cfddaca9842726e3d79dc39e;hpb=03c9b2ca595aaf5b6ff312f84d9a13c26f4e4fba;p=secnet.git

diff --git a/site.c b/site.c
index 9c320a5..eb146e1 100644
--- a/site.c
+++ b/site.c
@@ -109,6 +109,8 @@
 
 #define CASES_MSG3_KNOWN LABEL_MSG3: case LABEL_MSG3BIS
 
+struct msg;
+
 int32_t site_max_start_pad = 4*4;
 
 static cstring_t state_name(uint32_t state)
@@ -394,15 +396,23 @@ static uint32_t event_log_priority(struct site *st, uint32_t event)
     }
 }
 
+static uint32_t slog_start(struct site *st, uint32_t event)
+{
+    uint32_t class=event_log_priority(st, event);
+    if (class) {
+	slilog_part(st->log,class,"%s: ",st->tunname);
+    }
+    return class;
+}
+
 static void vslog(struct site *st, uint32_t event, cstring_t msg, va_list ap)
 FORMAT(printf,3,0);
 static void vslog(struct site *st, uint32_t event, cstring_t msg, va_list ap)
 {
     uint32_t class;
 
-    class=event_log_priority(st, event);
+    class=slog_start(st,event);
     if (class) {
-	slilog_part(st->log,class,"%s: ",st->tunname);
 	vslilog_part(st->log,class,msg,ap);
 	slilog_part(st->log,class,"\n");
     }
@@ -457,7 +467,9 @@ static bool_t initiate_key_setup(struct site *st, cstring_t reason,
 static void enter_state_run(struct site *st);
 static bool_t enter_state_resolve(struct site *st);
 static void decrement_resolving_count(struct site *st, int by);
-static bool_t enter_new_state(struct site *st,uint32_t next);
+static bool_t enter_new_state(struct site *st,uint32_t next,
+			      const struct msg *prompt
+			      /* may be 0 for SENTMSG1 */);
 static void enter_state_wait(struct site *st);
 static void activate_new_key(struct site *st);
 
@@ -611,7 +623,9 @@ static void append_string_xinfo_done(struct buffer_if *buf,
 
 /* Build any of msg1 to msg4. msg5 and msg6 are built from the inside
    out using a transform of config data supplied by netlink */
-static bool_t generate_msg(struct site *st, uint32_t type, cstring_t what)
+static bool_t generate_msg(struct site *st, uint32_t type, cstring_t what,
+			   const struct msg *prompt
+			   /* may be 0 for MSG1 */)
 {
     string_t dhpub;
     unsigned minor;
@@ -792,14 +806,21 @@ static bool_t check_msg(struct site *st, uint32_t type, struct msg *m,
     return False;
 }
 
-static bool_t generate_msg1(struct site *st)
+static bool_t kex_init(struct site *st)
 {
     st->random->generate(st->random->st,NONCELEN,st->localN);
-    return generate_msg(st,LABEL_MSG1,"site:MSG1");
+    return True;
+}
+
+static bool_t generate_msg1(struct site *st, const struct msg *prompt_maybe_0)
+{
+    return
+	generate_msg(st,LABEL_MSG1,"site:MSG1",prompt_maybe_0);
 }
 
 static bool_t process_msg1(struct site *st, struct buffer_if *msg1,
-			   const struct comm_addr *src, struct msg *m)
+			   const struct comm_addr *src,
+			   const struct msg *m)
 {
     /* We've already determined we're in an appropriate state to
        process an incoming MSG1, and that the MSG1 has correct values
@@ -811,10 +832,11 @@ static bool_t process_msg1(struct site *st, struct buffer_if *msg1,
     return True;
 }
 
-static bool_t generate_msg2(struct site *st)
+static bool_t generate_msg2(struct site *st,
+			    const struct msg *prompt_may_be_null)
 {
-    st->random->generate(st->random->st,NONCELEN,st->localN);
-    return generate_msg(st,LABEL_MSG2,"site:MSG2");
+    return
+	generate_msg(st,LABEL_MSG2,"site:MSG2",prompt_may_be_null);
 }
 
 static bool_t process_msg2(struct site *st, struct buffer_if *msg2,
@@ -864,7 +886,7 @@ kind##_found:								\
     return True;
 }
 
-static bool_t generate_msg3(struct site *st)
+static bool_t generate_msg3(struct site *st, const struct msg *prompt)
 {
     /* Now we have our nonce and their nonce. Think of a secret key,
        and create message number 3. */
@@ -873,7 +895,7 @@ static bool_t generate_msg3(struct site *st)
 			(st->remote_capabilities & CAPAB_TRANSFORM_MASK)
 			? LABEL_MSG3BIS
 			: LABEL_MSG3,
-			"site:MSG3");
+			"site:MSG3",prompt);
 }
 
 static bool_t process_msg3_msg4(struct site *st, struct msg *m)
@@ -959,11 +981,11 @@ kind##_found:								\
     return True;
 }
 
-static bool_t generate_msg4(struct site *st)
+static bool_t generate_msg4(struct site *st, const struct msg *prompt)
 {
     /* We have both nonces, their public key and our private key. Generate
        our public key, sign it and send it to them. */
-    return generate_msg(st,LABEL_MSG4,"site:MSG4");
+    return generate_msg(st,LABEL_MSG4,"site:MSG4",prompt);
 }
 
 static bool_t process_msg4(struct site *st, struct buffer_if *msg4,
@@ -1009,7 +1031,7 @@ static bool_t unpick_msg0(struct site *st, struct buffer_if *msg0,
     /* Leaves transformed part of buffer untouched */
 }
 
-static bool_t generate_msg5(struct site *st)
+static bool_t generate_msg5(struct site *st, const struct msg *prompt)
 {
     cstring_t transform_err;
 
@@ -1075,7 +1097,7 @@ static void create_msg6(struct site *st, struct transform_inst_if *transform,
     buf_prepend_uint32(&st->buffer,session_id);
 }
 
-static bool_t generate_msg6(struct site *st)
+static bool_t generate_msg6(struct site *st, const struct msg *prompt)
 {
     if (!is_transform_valid(st->new_transform))
 	return False;
@@ -1352,7 +1374,7 @@ static void decrement_resolving_count(struct site *st, int by)
     switch (st->state) {
     case SITE_RESOLVE:
         if (transport_compute_setupinit_peers(st,addrs,naddrs,0)) {
-	    enter_new_state(st,SITE_SENTMSG1);
+	    enter_new_state(st,SITE_SENTMSG1,0);
 	} else {
 	    /* Can't figure out who to try to to talk to */
 	    slog(st,LOG_SETUP_INIT,
@@ -1412,7 +1434,7 @@ static bool_t initiate_key_setup(struct site *st, cstring_t reason,
 	slog(st,LOG_SETUP_INIT,"resolving peer address(es)");
 	return enter_state_resolve(st);
     } else if (transport_compute_setupinit_peers(st,0,0,prod_hint)) {
-	return enter_new_state(st,SITE_SENTMSG1);
+	return enter_new_state(st,SITE_SENTMSG1,0);
     }
     slog(st,LOG_SETUP_INIT,"key exchange failed: no address for peer");
     return False;
@@ -1566,21 +1588,25 @@ static bool_t enter_state_resolve(struct site *st)
     return ensure_resolving(st);
 }
 
-static bool_t enter_new_state(struct site *st, uint32_t next)
+static bool_t enter_new_state(struct site *st, uint32_t next,
+			      const struct msg *prompt
+			      /* may be 0 for SENTMSG1 */)
 {
-    bool_t (*gen)(struct site *st);
+    bool_t (*gen)(struct site *st, const struct msg *prompt);
     int r;
 
     slog(st,LOG_STATE,"entering state %s",state_name(next));
     switch(next) {
     case SITE_SENTMSG1:
 	state_assert(st,st->state==SITE_RUN || st->state==SITE_RESOLVE);
+	if (!kex_init(st)) return False;
 	gen=generate_msg1;
 	st->msg1_crossed_logged = False;
 	break;
     case SITE_SENTMSG2:
 	state_assert(st,st->state==SITE_RUN || st->state==SITE_RESOLVE ||
 		     st->state==SITE_SENTMSG1 || st->state==SITE_WAIT);
+	if (!kex_init(st)) return False;
 	gen=generate_msg2;
 	break;
     case SITE_SENTMSG3:
@@ -1611,7 +1637,7 @@ static bool_t enter_new_state(struct site *st, uint32_t next)
 
     if (hacky_par_start_failnow()) return False;
 
-    r= gen(st) && send_msg(st);
+    r= gen(st,prompt) && send_msg(st);
 
     hacky_par_end(&r,
 		  st->setup_retries, st->setup_retry_interval,
@@ -1850,6 +1876,7 @@ static bool_t site_incoming(void *sst, struct buffer_if *buf,
     uint32_t dest=get_uint32(buf->start);
     uint32_t msgtype=get_uint32(buf->start+8);
     struct msg msg;
+      /* initialised by named_for_us, or process_msgN for N!=1 */
 
     if (msgtype==LABEL_MSG1) {
 	if (!named_for_us(st,buf,msgtype,&msg))
@@ -1862,7 +1889,7 @@ static bool_t site_incoming(void *sst, struct buffer_if *buf,
 	    transport_compute_setupinit_peers(st,0,0,source);
 	    if (process_msg1(st,buf,source,&msg)) {
 		slog(st,LOG_SETUP_INIT,"key setup initiated by peer");
-		bool_t entered=enter_new_state(st,SITE_SENTMSG2);
+		bool_t entered=enter_new_state(st,SITE_SENTMSG2,&msg);
 		if (entered && st->addresses && st->local_mobile)
 		    /* We must do this as the very last thing, because
 		       the resolver callback might reenter us. */
@@ -1888,7 +1915,7 @@ static bool_t site_incoming(void *sst, struct buffer_if *buf,
 		if (process_msg1(st,buf,source,&msg)) {
 		    BUF_FREE(&st->buffer); /* Free our old message 1 */
 		    transport_setup_msgok(st,source);
-		    enter_new_state(st,SITE_SENTMSG2);
+		    enter_new_state(st,SITE_SENTMSG2,&msg);
 		} else {
 		    slog(st,LOG_ERROR,"failed to process an incoming "
 			 "crossed msg1 (we have low priority)");
@@ -1962,7 +1989,7 @@ static bool_t site_incoming(void *sst, struct buffer_if *buf,
 		slog(st,LOG_UNEXPECTED,"unexpected MSG2");
 	    } else if (process_msg2(st,buf,source,&msg)) {
 		transport_setup_msgok(st,source);
-		enter_new_state(st,SITE_SENTMSG3);
+		enter_new_state(st,SITE_SENTMSG3,&msg);
 	    } else {
 		slog(st,LOG_SEC,"invalid MSG2");
 	    }
@@ -1976,7 +2003,7 @@ static bool_t site_incoming(void *sst, struct buffer_if *buf,
 		slog(st,LOG_UNEXPECTED,"unexpected MSG3");
 	    } else if (process_msg3(st,buf,source,msgtype,&msg)) {
 		transport_setup_msgok(st,source);
-		enter_new_state(st,SITE_SENTMSG4);
+		enter_new_state(st,SITE_SENTMSG4,&msg);
 	    } else {
 		slog(st,LOG_SEC,"invalid MSG3");
 	    }
@@ -1990,7 +2017,7 @@ static bool_t site_incoming(void *sst, struct buffer_if *buf,
 		slog(st,LOG_UNEXPECTED,"unexpected MSG4");
 	    } else if (process_msg4(st,buf,source,&msg)) {
 		transport_setup_msgok(st,source);
-		enter_new_state(st,SITE_SENTMSG5);
+		enter_new_state(st,SITE_SENTMSG5,&msg);
 	    } else {
 		slog(st,LOG_SEC,"invalid MSG4");
 	    }
@@ -2005,7 +2032,7 @@ static bool_t site_incoming(void *sst, struct buffer_if *buf,
 	    if (st->state==SITE_SENTMSG4) {
 		if (process_msg5(st,buf,source,st->new_transform)) {
 		    transport_setup_msgok(st,source);
-		    enter_new_state(st,SITE_RUN);
+		    enter_new_state(st,SITE_RUN,&msg);
 		} else {
 		    slog(st,LOG_SEC,"invalid MSG5");
 		}