From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 29 Sep 2019 22:24:37 +0000 (+0100)
Subject: site: kex_init: Have it return a boolean
X-Git-Tag: v0.5.0~136
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=commitdiff_plain;h=f3ae571e029ed5da085e42c25679d89983111791

site: kex_init: Have it return a boolean

At some point this will become capable of failing.

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

diff --git a/site.c b/site.c
index 70d92a6..88953de 100644
--- a/site.c
+++ b/site.c
@@ -806,15 +806,17 @@ static bool_t check_msg(struct site *st, uint32_t type, struct msg *m,
     return False;
 }
 
-static void kex_init(struct site *st)
+static bool_t kex_init(struct site *st)
 {
     st->random->generate(st->random->st,NONCELEN,st->localN);
+    return True;
 }
 
 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);
+    return
+	kex_init(st) &&
+	generate_msg(st,LABEL_MSG1,"site:MSG1",prompt_maybe_0);
 }
 
 static bool_t process_msg1(struct site *st, struct buffer_if *msg1,
@@ -834,8 +836,9 @@ 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)
 {
-    kex_init(st);
-    return generate_msg(st,LABEL_MSG2,"site:MSG2",prompt_may_be_null);
+    return
+	kex_init(st) &&
+	generate_msg(st,LABEL_MSG2,"site:MSG2",prompt_may_be_null);
 }
 
 static bool_t process_msg2(struct site *st, struct buffer_if *msg2,