chiark
/
gitweb
/
~mdw
/
tripe
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
init/Makefile.am: Install `tripe.conf' as data, not executable.
[tripe]
/
keys
/
tripe-keys.in
diff --git
a/keys/tripe-keys.in
b/keys/tripe-keys.in
index 7ed3aae76b5c6a9c7220d4851f95b7a71fe51968..2be5e2dde3a6c869828f31baf37341378ae2236b 100644
(file)
--- a/
keys/tripe-keys.in
+++ b/
keys/tripe-keys.in
@@
-363,8
+363,8
@@
def cmd_setup(args):
OS.mkdir('repos')
run('''key -krepos/param add
-a${kx}-param !${kx-param}
OS.mkdir('repos')
run('''key -krepos/param add
-a${kx}-param !${kx-param}
- -eforever -tparam tripe-
${kx}-
param
- cipher=${cipher} hash=${hash} mac=${mac} mgf=${mgf}''')
+ -eforever -tparam tripe-param
+
kx-group=${kx}
cipher=${cipher} hash=${hash} mac=${mac} mgf=${mgf}''')
cmd_newmaster(args)
###--------------------------------------------------------------------------
cmd_newmaster(args)
###--------------------------------------------------------------------------
@@
-476,7
+476,7
@@
def cmd_generate(args):
keyring_pub = 'peer-%s.pub' % tag
zap('keyring'); zap(keyring_pub)
run('key -kkeyring merge repos/param')
keyring_pub = 'peer-%s.pub' % tag
zap('keyring'); zap(keyring_pub)
run('key -kkeyring merge repos/param')
- run('key -kkeyring add -a${kx} -pparam -e${kx-expire} -t%s tripe
-${kx}
' %
+ run('key -kkeyring add -a${kx} -pparam -e${kx-expire} -t%s tripe' %
tag)
run('key -kkeyring extract -f-secret %s %s' % (keyring_pub, tag))
tag)
run('key -kkeyring extract -f-secret %s %s' % (keyring_pub, tag))