From 3a9dbc44ec05a2d3b2990302d3b6ba5f59f89917 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 1 Dec 2019 17:55:32 +0000 Subject: [PATCH] make-secnet-sites: In v1 output, ignore keys for non-0 groups This helps makes us conform to the spec in NOTES. Signed-off-by: Ian Jackson --- make-secnet-sites | 3 +++ 1 file changed, 3 insertions(+) diff --git a/make-secnet-sites b/make-secnet-sites index 4899dcf..cd04868 100755 --- a/make-secnet-sites +++ b/make-secnet-sites @@ -459,6 +459,7 @@ class rsakey (pubkey): # compatible with old secnet executables def forsites(self,version,xcopy,fs): if version < 2: + if fs.pkg != '00000000': return [] return ['pubkey', str(self.l), self.e, self.n] return pubkey.forsites(self,version,xcopy,fs) @@ -696,6 +697,8 @@ class sitelevel(level): break if use is None: use = k + elif isinstance(k,pubkey_group): + indefault = k.i == '00000000' else: raise RuntimeError('bad '+repr(k)) if use is None: -- 2.30.2