X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/51113adb98c4d82ab799ab38ea463427d0780daa..26936c8341691d67655a055956656f2506d53a63:/keys/tripe-keys.in

diff --git a/keys/tripe-keys.in b/keys/tripe-keys.in
index 901e09b9..cfa740bd 100644
--- a/keys/tripe-keys.in
+++ b/keys/tripe-keys.in
@@ -238,29 +238,55 @@ def conf_defaults():
                ('conf-file', '${base-dir}tripe-keys.conf'),
                ('upload-hook', ': run upload hook'),
                ('kx', 'dh'),
+               ('kx-genalg', lambda: {'dh': 'dh',
+                                      'ec': 'ec',
+                                      'x25519': 'x25519',
+                                      'x448': 'x448'}[conf['kx']]),
+               ('kx-param-genalg', lambda: {'dh': 'dh-param',
+                                            'ec': 'ec-param',
+                                            'x25519': 'empty',
+                                            'x448': 'empty'}[conf['kx']]),
                ('kx-param', lambda: {'dh': '-LS -b3072 -B256',
-                                     'ec': '-Cnist-p256'}[conf['kx']]),
+                                     'ec': '-Cnist-p256',
+                                     'x25519': '',
+                                     'x448': ''}[conf['kx']]),
+               ('kx-attrs', lambda: {'dh': 'serialization=constlen',
+                                     'ec': 'serialization=constlen',
+                                     'x25519': '',
+                                     'x448': ''}[conf['kx']]),
                ('kx-expire', 'now + 1 year'),
                ('kx-warn-days', '28'),
-               ('cipher', 'rijndael-cbc'),
+               ('bulk', 'iiv'),
+               ('cipher', lambda: conf['bulk'] == 'naclbox'
+                                    and 'salsa20' or 'rijndael-cbc'),
                ('hash', 'sha256'),
                ('master-keygen-flags', '-l'),
+               ('master-attrs', ''),
                ('mgf', '${hash}-mgf'),
-               ('mac', lambda: '%s-hmac/%d' %
-                         (conf['hash'],
-                          C.gchashes[conf['hash']].hashsz * 4)),
-               ('sig', lambda: {'dh': 'dsa', 'ec': 'ecdsa'}[conf['kx']]),
+               ('mac', lambda: conf['bulk'] == 'naclbox'
+                                 and 'poly1305/128'
+                                 or '%s-hmac/%d' %
+                                      (conf['hash'],
+                                       C.gchashes[conf['hash']].hashsz * 4)),
+               ('sig', lambda: {'dh': 'dsa',
+                                'ec': 'ecdsa',
+                                'x25519': 'ed25519',
+                                'x448': 'ed448'}[conf['kx']]),
                ('sig-fresh', 'always'),
                ('sig-genalg', lambda: {'kcdsa': 'dh',
                                        'dsa': 'dsa',
                                        'rsapkcs1': 'rsa',
                                        'rsapss': 'rsa',
                                        'ecdsa': 'ec',
-                                       'eckcdsa': 'ec'}[conf['sig']]),
+                                       'eckcdsa': 'ec',
+                                       'ed25519': 'ed25519',
+                                       'ed448': 'ed448'}[conf['sig']]),
                ('sig-param', lambda: {'dh': '-LS -b3072 -B256',
                                       'dsa': '-b3072 -B256',
                                       'ec': '-Cnist-p256',
-                                      'rsa': '-b3072'}[conf['sig-genalg']]),
+                                      'rsa': '-b3072',
+                                      'ed25519': '',
+                                      'ed448': ''}[conf['sig-genalg']]),
                ('sig-hash', '${hash}'),
                ('sig-expire', 'forever'),
                ('fingerprint-hash', '${hash}')]:
@@ -356,7 +382,7 @@ def cmd_newmaster(args):
   run('''key -kmaster add
     -a${sig-genalg} !${sig-param}
     -e${sig-expire} !${master-keygen-flags} -tmaster-%d tripe-keys-master
-    sig=${sig} hash=${sig-hash}''' % seq)
+    sig=${sig} hash=${sig-hash} !${master-attrs}''' % seq)
   run('key -kmaster extract -f-secret repos/master.pub')
 
 ###--------------------------------------------------------------------------
@@ -365,9 +391,10 @@ def cmd_newmaster(args):
 def cmd_setup(args):
   OS.mkdir('repos')
   run('''key -krepos/param add
-    -a${kx}-param !${kx-param}
+    -a${kx-param-genalg} !${kx-param}
     -eforever -tparam tripe-param
-    kx-group=${kx} cipher=${cipher} hash=${hash} mac=${mac} mgf=${mgf}''')
+    kx-group=${kx} mgf=${mgf} mac=${mac}
+    bulk=${bulk} cipher=${cipher} hash=${hash} ${kx-attrs}''')
   cmd_newmaster(args)
 
 ###--------------------------------------------------------------------------
@@ -420,6 +447,16 @@ def cmd_upload(args):
     for base in commit:
       new = '%s.new' % base
       OS.rename(new, base)
+
+    ## Remove files in the base-dir which don't correspond to ones we just
+    ## committed
+    allow = {}
+    basedir = conf['base-dir']
+    bdl = len(basedir)
+    for base in commit:
+      if base.startswith(basedir): allow[base[bdl:]] = 1
+    for found in OS.listdir(basedir):
+      if found not in allow: OS.remove(OS.path.join(basedir, found))
   finally:
     OS.chdir(cwd)
     rmtree('tmp')
@@ -461,7 +498,7 @@ def cmd_update(args):
     OS.chdir(cwd)
     if OS.path.exists('repos'): OS.rename('repos', 'repos.old')
     OS.rename('tmp/repos', 'repos')
-    if not FC.cmp('tmp/tripe-keys.conf', 'tripe-keys.conf'):
+    if not FC.cmp('tmp/tripe-keys.conf', 'tripe-keys.conf', False):
       moan('configuration file changed: recommend running another update')
       OS.rename('tmp/tripe-keys.conf', 'tripe-keys.conf')
     rmtree('repos.old')
@@ -479,7 +516,7 @@ def cmd_generate(args):
   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' %
+  run('key -kkeyring add -a${kx-genalg} -pparam -e${kx-expire} -t%s tripe' %
       tag)
   run('key -kkeyring extract -f-secret %s %s' % (keyring_pub, tag))
 
@@ -531,24 +568,39 @@ def cmd_check(args):
 ###--------------------------------------------------------------------------
 ### Commands: mtu
 
+def mac_tagsz():
+  macname = conf['mac']
+  index = macname.rindex('/')
+  if index == -1: tagsz = C.gcmacs[macname].tagsz
+  else: tagsz = int(macname[index + 1:])/8
+  return tagsz
+
 def cmd_mtu(args):
   mtu, = (lambda mtu = '1500': (mtu,))(*args)
   mtu = int(mtu)
 
-  blksz = C.gcciphers[conf['cipher']].blksz
-
-  index = conf['mac'].find('/')
-  if index == -1:
-    tagsz = C.gcmacs[conf['mac']].tagsz
-  else:
-    tagsz = int(conf['mac'][index + 1:])/8
-
   mtu -= 20                             # Minimum IP header
   mtu -= 8                              # UDP header
   mtu -= 1                              # TrIPE packet type octet
-  mtu -= tagsz                          # MAC tag
-  mtu -= 4                              # Sequence number
-  mtu -= blksz                          # Initialization vector
+
+  bulk = conf['bulk']
+
+  if bulk == 'v0':
+    blksz = C.gcciphers[conf['cipher']].blksz
+    mtu -= mac_tagsz()                  # MAC tag
+    mtu -= 4                            # Sequence number
+    mtu -= blksz                        # Initialization vector
+
+  elif bulk == 'iiv':
+    mtu -= mac_tagsz()                  # MAC tag
+    mtu -= 4                            # Sequence number
+
+  elif bulk == 'naclbox':
+    mtu -= 16                           # MAC tag
+    mtu -= 4                            # Sequence number
+
+  else:
+    die("Unknown bulk transform `%s'" % bulk)
 
   print mtu