From 0184e49dab06fe87022b2dc80a319e5e58bdc41d Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 9 Nov 2019 00:13:52 +0000 Subject: [PATCH] make-secnet-sites: Make the `pub' key name primary No outward functional change. Signed-off-by: Ian Jackson --- make-secnet-sites | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/make-secnet-sites b/make-secnet-sites index 820d272..2162756 100755 --- a/make-secnet-sites +++ b/make-secnet-sites @@ -453,8 +453,8 @@ keywords={ 'renegotiate-time':(num,"Time after key setup to begin renegotiation (ms)"), 'restrict-nets':(networks,"Allowable networks"), 'networks':(networks,"Claimed networks"), - 'pub':(listof(somepubkey),"new style public site key",'pubkey'), - 'pubkey':(listof(somepubkey),"RSA public site key"), + 'pub':(listof(somepubkey),"new style public site key"), + 'pubkey':(listof(somepubkey),"RSA public site key",'pub'), 'peer':(single_ipaddr,"Tunnel peer IP address"), 'address':(address,"External contact address and port"), 'mobile':(boolean,"Site is mobile"), @@ -584,7 +584,7 @@ class sitelevel(level): 'networks':"Networks claimed by the site", 'hash':"hash function", 'peer':"Gateway address of the site", - 'pubkey':"RSA public key of the site", + 'pub':"public key of the site", } def __init__(self,w): level.__init__(self,w) @@ -596,7 +596,7 @@ class sitelevel(level): self.indent(w,ind+2) w.write("name \"%s\";\n"%(np,)) self.indent(w,ind+2) - w.write("key %s;\n"%str(self.properties["pubkey"].list[0])) + w.write("key %s;\n"%str(self.properties["pub"].list[0])) self.output_props(w,ind+2) self.indent(w,ind+2) w.write("link netlink {\n"); -- 2.30.2