chiark
/
gitweb
/
~ian
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make-secnet-sites: In v1 output, ignore keys for non-0 groups
[secnet.git]
/
make-secnet-sites
diff --git
a/make-secnet-sites
b/make-secnet-sites
index 4899dcf1820cf0813d3d57e75b34679d478b8392..cd048684581009d0526ed467db59df4f71200627 100755
(executable)
--- 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:
# 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)
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
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:
else:
raise RuntimeError('bad '+repr(k))
if use is None: