X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=site.c;h=03d1e06758492c0e18585226bf07f0522d788521;hb=16339fe17a2a565da0628be523f6ef8ca907f3f5;hp=67a3dbcc3815e27a2fc3c7bbdd70fcdafd4e9df5;hpb=4fc53c62216fe129df57b7bc546d0b37ab164727;p=secnet.git

diff --git a/site.c b/site.c
index 67a3dbc..03d1e06 100644
--- a/site.c
+++ b/site.c
@@ -2129,6 +2129,17 @@ static void site_childpersist_clearkeys(void *sst, uint32_t newphase)
        crypto operations, but that's a task for another day. */
 }
 
+static void setup_sethash(struct site *st, dict_t *dict,
+			  struct hash_if **hash, struct cloc loc,
+			  sig_sethash_fn *sethash, void *sigkey_st) {
+    if (!*hash) *hash=find_cl_if(dict,"hash",CL_HASH,True,"site",loc);
+    sethash(sigkey_st,*hash);
+}
+#define SETUP_SETHASH(k) do{						\
+    if ((k)->sethash)							\
+        setup_sethash(st,dict, &hash,loc, (k)->sethash,(k)->st);	\
+}while(0)
+
 static list_t *site_apply(closure_t *self, struct cloc loc, dict_t *context,
 			  list_t *args)
 {
@@ -2221,6 +2232,7 @@ static list_t *site_apply(closure_t *self, struct cloc loc, dict_t *context,
     st->log=find_cl_if(dict,"log",CL_LOG,True,"site",loc);
     st->random=find_cl_if(dict,"random",CL_RANDOMSRC,True,"site",loc);
 
+    struct hash_if *hash=0;
     st->privkey=find_cl_if(dict,"local-key",CL_SIGPRIVKEY,True,"site",loc);
     st->addresses=dict_read_string_array(dict,"address",False,"site",loc,0);
     if (st->addresses)
@@ -2232,11 +2244,8 @@ static list_t *site_apply(closure_t *self, struct cloc loc, dict_t *context,
 
     st->dh=find_cl_if(dict,"dh",CL_DH,True,"site",loc);
 
-    if (st->privkey->sethash || st->pubkey->sethash) {
-	struct hash_if *hash=find_cl_if(dict,"hash",CL_HASH,True,"site",loc);
-	if (st->privkey->sethash) st->privkey->sethash(st->privkey->st,hash);
-	if (st->pubkey->sethash) st->pubkey->sethash(st->pubkey->st,hash);
-    }
+    SETUP_SETHASH(st->privkey);
+    SETUP_SETHASH(st->pubkey);
 
 #define DEFAULT(D) (st->peer_mobile || st->local_mobile	\
                     ? DEFAULT_MOBILE_##D : DEFAULT_##D)