make-secnet-sites: Support `serial'

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

diff --git a/README.make-secnet-sites b/README.make-secnet-sites
index c5b8360d0c8a1cdeb6ba962c5c8e704bf71b4a1c..9d69b11a8f801c67e9aaa0c5d24daf2cd0382ca2 100644 (file)
--- 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 4d8aacdb9d2b01da078dc4092bbfa21470cd40ff..3b25e2ba7fc277563b35761046538da8df874237 100755 (executable)
--- 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)