From: Ian Jackson Date: Sun, 1 Dec 2019 17:54:03 +0000 (+0000) Subject: make-secnet-sites: Support `serial' X-Git-Tag: v0.6.0~92 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=commitdiff_plain;h=0a50d8f5d5bdd0b345749091054ce3838054773c make-secnet-sites: Support `serial' Signed-off-by: Ian Jackson --- diff --git a/README.make-secnet-sites b/README.make-secnet-sites index c5b8360..9d69b11 100644 --- a/README.make-secnet-sites +++ b/README.make-secnet-sites @@ -238,7 +238,6 @@ INPUT SYNTAX Specifies the key set id (8 hex digits representing 4 bytes: each pair is the value of the next byte). May appear at most once. If not present, 00000000. - Not yet suported in make-secnet-sites. pkg GROUPIDHEX pkgf GROUPIDHEX diff --git a/make-secnet-sites b/make-secnet-sites index 4d8aacd..3b25e2b 100755 --- a/make-secnet-sites +++ b/make-secnet-sites @@ -501,6 +501,7 @@ keywords={ 'renegotiate-time':(num,"Time after key setup to begin renegotiation (ms)"), 'restrict-nets':(networks,"Allowable networks"), 'networks':(networks,"Claimed networks"), + 'serial':(serial,"public key set serial"), 'pub':(listof(somepubkey),"new style public site key"), 'pubkey':(listof(somepubkey),"RSA public site key",'pub'), 'peer':(single_ipaddr,"Tunnel peer IP address"), @@ -622,6 +623,7 @@ class sitelevel(level): 'address':sp, 'networks':None, 'peer':None, + 'serial':None, 'pub':None, 'pubkey':None, 'mobile':sp, @@ -650,6 +652,9 @@ class sitelevel(level): if pubkeys_install: pa=self.pubkeys_path() pw=open(pa+'~tmp','w') + if 'serial' in self.properties: + pw.write('serial %s\n' % + self.properties['serial']) fs=FilterState() for k in self.properties["pub"].list: debugrepr('pubkeys install', k)