make-secnet-sites: Do not use `copy' in pubkey forsites

[secnet.git] / make-secnet-sites

diff --git a/make-secnet-sites b/make-secnet-sites
index b7720d2f1ece0a14b0f119fc5a3be73803095b4a..2e07cf81d769734a6bd4babaadea470f86a0f3de 100755 (executable)
--- a/make-secnet-sites
+++ b/make-secnet-sites
@@ -76,7 +76,7 @@ from argparseactionnoyes import ActionNoYes
 
 VERSION="0.1.18"
 
-max_version = 1
+max_version = 2
 
 from sys import version_info
 if version_info.major == 2:  # for python2
@@ -86,7 +86,7 @@ if version_info.major == 2:  # for python2
     import io
     open=lambda f,m='r': io.open(f,m,encoding='utf-8')
 
-max={'rsa_bits':8200,'name':33,'dh_bits':8200}
+max={'rsa_bits':8200,'name':33,'dh_bits':8200,'algname':127}
 
 def debugrepr(*args):
        if debug_level > 0:
@@ -415,6 +415,14 @@ class address (basetype):
 
 class pubkey (basetype):
        "Some kind of publie key"
+       def __init__(self,w):
+               self.a=w[1].name('algname')
+               self.d=w[2].base91();
+       def __str__(self):
+               return 'make-public("%s","%s")'%(self.a,self.d)
+       def forsites(self,version,xcopy,fs):
+               if version < 2: return []
+               return ['pub', self.a, self.d]
 
 class rsakey (pubkey):
        "An RSA public key"
@@ -425,10 +433,16 @@ class rsakey (pubkey):
                if len(w) >= 5: w[4].email()
        def __str__(self):
                return 'rsa-public("%s","%s")'%(self.e,self.n)
+               # this specialisation means we can generate files
+               # compatible with old secnet executables
+       def forsites(self,version,xcopy,fs):
+               return ['pubkey', str(self.l), self.e, self.n]
 
 def somepubkey(w):
        if w[0]=='pubkey':
                return rsakey(w)
+       elif w[0]=='pub':
+               return pubkey(w)
        else:
                assert(False)
 
@@ -444,7 +458,8 @@ keywords={
  'renegotiate-time':(num,"Time after key setup to begin renegotiation (ms)"),
  'restrict-nets':(networks,"Allowable networks"),
  'networks':(networks,"Claimed networks"),
- '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"),
@@ -564,6 +579,7 @@ class sitelevel(level):
         'address':sp,
         'networks':None,
         'peer':None,
+        'pub':None,
         'pubkey':None,
         'mobile':sp,
        })
@@ -573,7 +589,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)
@@ -585,7 +601,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");