From: Mark Wooding <mdw@distorted.org.uk>
Date: Wed, 6 Sep 2017 20:03:18 +0000 (+0100)
Subject: mon/tripemon.in: Split out crypto-specific pieces of `statslayout'.
X-Git-Tag: 1.5.0~133
X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/commitdiff_plain/cc1bff4e61c615fdd155a8d82ea9c737f994c4d4

mon/tripemon.in: Split out crypto-specific pieces of `statslayout'.

One notices that these are suspiciously similar to (though less good)
than the things displayed by CryptoInfo.  It would be nice if we could
share them somehow...

No functional change yet.
---

diff --git a/mon/tripemon.in b/mon/tripemon.in
index b65d8e1d..1e62f03e 100644
--- a/mon/tripemon.in
+++ b/mon/tripemon.in
@@ -1259,18 +1259,21 @@ statsxlate = \
 ## How to lay out the stats dialog.  Format is (LABEL, FORMAT): LABEL is
 ## the label to give the entry box; FORMAT is the format string to write into
 ## the entry.
-statslayout = \
-  [('Start time', '%(start-time)s'),
-   ('Private key', '%(current-key)s'),
-   ('Diffie-Hellman group',
+cryptolayout = \
+  [('Diffie-Hellman group',
     '%(kx-group)s '
     '(%(kx-group-order-bits)s-bit order, '
     '%(kx-group-elt-bits)s-bit elements)'),
    ('Cipher',
     '%(cipher)s (%(cipher-keysz)s-bit key, %(cipher-blksz)s-bit block)'),
    ('Mac', '%(mac)s (%(mac-keysz)s-bit key, %(mac-tagsz)s-bit tag)'),
-   ('Hash', '%(hash)s (%(hash-sz)s-bit output)'),
-   ('Last key-exchange', '%(last-keyexch-time)s'),
+   ('Hash', '%(hash)s (%(hash-sz)s-bit output)')]
+
+statslayout = \
+  [('Start time', '%(start-time)s'),
+   ('Private key', '%(current-key)s')] + \
+  cryptolayout + \
+  [('Last key-exchange', '%(last-keyexch-time)s'),
    ('Last packet', '%(last-packet-time)s'),
    ('Packets in/out',
     '%(packets-in)s (%(bytes-in)s) / %(packets-out)s (%(bytes-out)s)'),