From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 8 Nov 2019 23:32:31 +0000 (+0000)
Subject: make-secnet-sites: Declare `pubkey' directive old
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=18b2f0f498793d7c44abe3f5899a51645218b567;p=secnet.git

make-secnet-sites: Declare `pubkey' directive old

In help output and error messages.

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

diff --git a/make-secnet-sites b/make-secnet-sites
index 6721156..9e4538b 100755
--- a/make-secnet-sites
+++ b/make-secnet-sites
@@ -497,7 +497,7 @@ class pubkey (inpub):
 		return len(self.forpub(version,fs)) != 0
 
 class rsakey (pubkey):
-	"An RSA public key"
+	"An old-style RSA public key"
 	def __init__(self,w):
 		self.l=w[1].number(0,max['rsa_bits'],'rsa len')
 		self.e=w[2].bignum_10('rsa','rsa e')
@@ -583,7 +583,7 @@ keywords={
  'pkg':(listof(somepubkey),"start of public key group",'pub'),
  'pkgf':(listof(somepubkey),"start of fallback public key group",'pub'),
  'pub':(listof(somepubkey),"new style public site key"),
- 'pubkey':(listof(somepubkey),"RSA public site key",'pub'),
+ 'pubkey':(listof(somepubkey),"Old-style RSA public site key",'pub'),
  'peer':(single_ipaddr,"Tunnel peer IP address"),
  'address':(address,"External contact address and port"),
  'mobile':(boolean,"Site is mobile"),