From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 7 Dec 2019 18:15:42 +0000 (+0000)
Subject: site: generate_msg: Introduce `privkey' variable
X-Git-Tag: v0.6.0~142
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=commitdiff_plain;h=8cfbee0801e9af50be31656a42c30060aadee1a0

site: generate_msg: Introduce `privkey' variable

No functional change, but this will make a forthcoming commit easier
to read.

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

diff --git a/site.c b/site.c
index 03d1e06..ce185d4 100644
--- a/site.c
+++ b/site.c
@@ -650,6 +650,7 @@ static bool_t generate_msg(struct site *st, uint32_t type, cstring_t what,
     if (type_is_msg34(type)) {
 	buf_append_uint16(&st->buffer,st->mtu_target);
     }
+    struct sigprivkey_if *privkey=st->privkey;
     append_string_xinfo_done(&st->buffer,&xia);
 
     buf_append_string(&st->buffer,st->remotename);
@@ -670,10 +671,10 @@ static bool_t generate_msg(struct site *st, uint32_t type, cstring_t what,
     buf_append_string(&st->buffer,dhpub);
     free(dhpub);
 
-    bool_t ok=st->privkey->sign(st->privkey->st,
-				st->buffer.start,
-				st->buffer.size,
-				&st->buffer);
+    bool_t ok=privkey->sign(privkey->st,
+			    st->buffer.start,
+			    st->buffer.size,
+			    &st->buffer);
     if (!ok) goto fail;
     return True;