From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 1 Dec 2019 18:45:44 +0000 (+0000)
Subject: make-secnet-sites: Write rsa1 keys as `pub rsa1 ...' in >=v2
X-Git-Tag: v0.6.0~97
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=commitdiff_plain;h=094cfe643780f3269e83e513cafd395bc51ec5ad

make-secnet-sites: Write rsa1 keys as `pub rsa1 ...' in >=v2

This effectively deprecates the `pubkey' keyword, relegating it to a
compatibility feature.

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

diff --git a/make-secnet-sites b/make-secnet-sites
index 2e07cf8..81d3679 100755
--- a/make-secnet-sites
+++ b/make-secnet-sites
@@ -431,12 +431,21 @@ class rsakey (pubkey):
 		self.e=w[2].bignum_10('rsa','rsa e')
 		self.n=w[3].bignum_10('rsa','rsa n')
 		if len(w) >= 5: w[4].email()
+		self.a='rsa1'
+		self.d=base91s_encode(b'%d %s %s' %
+				      (self.l,
+				       self.e.encode('ascii'),
+				       self.n.encode('ascii')))
+		# ^ this allows us to use the pubkey.forsites()
+		# method for output in versions>=2
 	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]
+		if version < 2:
+			return ['pubkey', str(self.l), self.e, self.n]
+		return pubkey.forsites(self,version,xcopy,fs)
 
 def somepubkey(w):
 	if w[0]=='pubkey':