From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 29 Sep 2019 19:47:08 +0000 (+0100)
Subject: site: Break out kex_init
X-Git-Tag: v0.5.0~137
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=e9445775cf52584c0be20cb2ec73e74f728c1752;p=secnet.git

site: Break out kex_init

We are going to want to put some more things here.

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/site.c b/site.c
index 2a89880..70d92a6 100644
--- a/site.c
+++ b/site.c
@@ -806,9 +806,14 @@ static bool_t check_msg(struct site *st, uint32_t type, struct msg *m,
     return False;
 }
 
-static bool_t generate_msg1(struct site *st, const struct msg *prompt_maybe_0)
+static void kex_init(struct site *st)
 {
     st->random->generate(st->random->st,NONCELEN,st->localN);
+}
+
+static bool_t generate_msg1(struct site *st, const struct msg *prompt_maybe_0)
+{
+    kex_init(st);
     return generate_msg(st,LABEL_MSG1,"site:MSG1",prompt_maybe_0);
 }
 
@@ -829,7 +834,7 @@ static bool_t process_msg1(struct site *st, struct buffer_if *msg1,
 static bool_t generate_msg2(struct site *st,
 			    const struct msg *prompt_may_be_null)
 {
-    st->random->generate(st->random->st,NONCELEN,st->localN);
+    kex_init(st);
     return generate_msg(st,LABEL_MSG2,"site:MSG2",prompt_may_be_null);
 }